modernize

1 files changed, 4 insertions, 16 deletions

diff --git a/ride/fit.go b/ride/fit.go
index 7c4ba2e..760cec1 100644
--- a/ride/fit.go
+++ b/ride/fit.go
@@ -157,10 +157,7 @@ func EncodeFIT(ride Ride, w io.Writer) error {
 		rec.PositionLong = fit.NewLongitudeDegrees(coord.Lon)
 		// Altitude: scaled (value+500)*5, invalid 0xFFFF
 		elev := ride.Elevations[i]
-		scaled := int((elev + 500) * 5)
-		if scaled < 0 {
-			scaled = 0
-		}
+		scaled := max(int((elev+500)*5), 0)
 		if scaled > 0xFFFE {
 			scaled = 0xFFFE
 		}
@@ -168,10 +165,7 @@ func EncodeFIT(ride Ride, w io.Writer) error {
 		rec.EnhancedAltitude = 0xFFFFFFFF
 
 		if hasHR {
-			v := int(heartRates[i])
-			if v < 0 {
-				v = 0
-			}
+			v := max(int(heartRates[i]), 0)
 			if v > 254 {
 				v = 254
 			}
@@ -180,10 +174,7 @@ func EncodeFIT(ride Ride, w io.Writer) error {
 			rec.HeartRate = 0xFF
 		}
 		if hasCad {
-			v := int(cadences[i])
-			if v < 0 {
-				v = 0
-			}
+			v := max(int(cadences[i]), 0)
 			if v > 254 {
 				v = 254
 			}
@@ -192,10 +183,7 @@ func EncodeFIT(ride Ride, w io.Writer) error {
 			rec.Cadence = 0xFF
 		}
 		if hasPower {
-			v := int(powers[i])
-			if v < 0 {
-				v = 0
-			}
+			v := max(int(powers[i]), 0)
 			if v > 65534 {
 				v = 65534
 			}