Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ data class WorkoutStructure(
FTP_PERCENTAGE,
LTHR_PERCENTAGE,
PACE_PERCENTAGE,
RELATIVE_PERCEIVED_EFFORT,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class IntervalsWorkoutDocDTO(
"POWER" to WorkoutStructure.TargetUnit.FTP_PERCENTAGE,
"HR" to WorkoutStructure.TargetUnit.LTHR_PERCENTAGE,
"PACE" to WorkoutStructure.TargetUnit.PACE_PERCENTAGE,
"RPE" to WorkoutStructure.TargetUnit.RELATIVE_PERCEIVED_EFFORT,
)

fun mapTarget(): WorkoutStructure.TargetUnit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class ToIntervalsStructureConverter(
WorkoutStructure.TargetUnit.FTP_PERCENTAGE to "%",
WorkoutStructure.TargetUnit.LTHR_PERCENTAGE to "% LTHR",
WorkoutStructure.TargetUnit.PACE_PERCENTAGE to "% Pace",
WorkoutStructure.TargetUnit.RELATIVE_PERCEIVED_EFFORT to "",
)

fun toIntervalsStructureStr(): String {
Expand All @@ -31,14 +32,10 @@ class ToIntervalsStructureConverter(
}

private fun getStepString(workoutStep: SingleStep): String {
val name = workoutStep.name.orEmpty().replace("\\", "/")
val description = getDescription(structure.target, workoutStep)
val length = toStepLength(workoutStep.length)
val targetUnitStr = targetTypeMap[structure.target]!!
val target: String = if (workoutStep.target.isSingleValue()) {
"${workoutStep.target.start}"
} else {
"${workoutStep.target.start}-${workoutStep.target.end}"
}
val target = toTarget(structure.target, workoutStep.target)
val cadence = workoutStep.cadence?.let {
if (it.isSingleValue()) {
"${it.start}rpm"
Expand All @@ -47,11 +44,40 @@ class ToIntervalsStructureConverter(
}
} ?: ""

return "- $name $length $target$targetUnitStr ${structure.modifier.value} $cadence"
return "- $description $length $target$targetUnitStr ${structure.modifier.value} $cadence"
}

private fun toStepLength(length: StepLength) = when (length.unit) {
LengthUnit.SECONDS -> Duration.ofSeconds(length.value).toString().substring(2).lowercase()
LengthUnit.METERS -> (length.value / 1000.0).toString() + "km"
}

private fun toTarget(targetUnit: WorkoutStructure.TargetUnit, target: StepTarget) : String {
val targetVal =
if (targetUnit == WorkoutStructure.TargetUnit.RELATIVE_PERCEIVED_EFFORT) {
""
} else {
if (target.isSingleValue()) {
"${target.start}"
} else {
"${target.start}-${target.end}"
}
}

return targetVal
}

private fun getDescription(targetUnit: WorkoutStructure.TargetUnit, workoutStep: SingleStep) : String {
var description = workoutStep.name.orEmpty().replace("\\", "/")

if (targetUnit == WorkoutStructure.TargetUnit.RELATIVE_PERCEIVED_EFFORT) {
if (workoutStep.target.isSingleValue()) {
description += " RPE ${workoutStep.target.start}"
} else {
description += " RPE ${workoutStep.target.start}-${workoutStep.target.end}"
}
}

return description.trim()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class TPTargetMapper {
WorkoutStructure.TargetUnit.FTP_PERCENTAGE to "percentOfFtp",
WorkoutStructure.TargetUnit.LTHR_PERCENTAGE to "percentOfThresholdHr",
WorkoutStructure.TargetUnit.PACE_PERCENTAGE to "percentOfThresholdPace",
WorkoutStructure.TargetUnit.RELATIVE_PERCEIVED_EFFORT to "rpe",
)

fun getByIntensity(intensity: String): WorkoutStructure.TargetUnit =
Expand Down