Add VirtualRide, correct EBikeRide ids

Author: paulmach

activities.go

@@ -92,6 +92,8 @@ var ActivityTypes = struct {
 	Kitesurf       ActivityType
 	Windsurf       ActivityType
 	Swim           ActivityType
+	VirtualRide    ActivityType
+	EBikeRide      ActivityType
 
 	WaterSport         ActivityType
 	Canoeing           ActivityType
@@ -107,13 +109,11 @@ var ActivityTypes = struct {
 	Yoga               ActivityType
 	WinterSport        ActivityType
 	CrossCountrySkiing ActivityType
-	EBikeRide          ActivityType
 }{"Ride", "AlpineSki", "BackcountrySki", "Hike", "IceSkate", "InlineSkate", "NordicSki", "RollerSki",
-	"Run", "Walk", "Workout", "Snowboard", "Snowshoe", "Kitesurf", "Windsurf", "Swim",
+	"Run", "Walk", "Workout", "Snowboard", "Snowshoe", "Kitesurf", "Windsurf", "Swim", "VirtualRide", "EBikeRide",
 
 	"WaterSport", "Canoeing", "Kayaking", "Rowing", "StandUpPaddling", "Surfing",
 	"Crossfit", "Elliptical", "RockClimbing", "StairStepper", "WeightTraining", "Yoga", "WinterSport", "CrossCountrySkiing",
-	"EBikeRide",
 }
 
 type Location [2]float64
@@ -428,6 +428,10 @@ func (t ActivityType) Id() int {
 		return 15
 	case ActivityTypes.Swim:
 		return 16
+	case ActivityTypes.VirtualRide:
+		return 17
+	case ActivityTypes.EBikeRide:
+		return 18
 	case ActivityTypes.WaterSport:
 		return 20
 	case ActivityTypes.Canoeing:
@@ -456,8 +460,6 @@ func (t ActivityType) Id() int {
 		return 40
 	case ActivityTypes.CrossCountrySkiing:
 		return 41
-	case ActivityTypes.EBikeRide:
-		return 42
 	}
 
 	return 0
@@ -467,8 +469,6 @@ func (t ActivityType) String() string {
 	switch t {
 	case ActivityTypes.Ride:
 		return "Ride"
-	case ActivityTypes.EBikeRide:
-		return "EBikeRide"
 	case ActivityTypes.AlpineSki:
 		return "Alpine Ski"
 	case ActivityTypes.BackcountrySki:
@@ -499,6 +499,10 @@ func (t ActivityType) String() string {
 		return "Windsurf"
 	case ActivityTypes.Swim:
 		return "Swim"
+	case ActivityTypes.VirtualRide:
+		return "VirtualRide"
+	case ActivityTypes.EBikeRide:
+		return "EBikeRide"
 	case ActivityTypes.WaterSport:
 		return "WaterSport"
 	case ActivityTypes.Canoeing:

activities_test.go

@@ -691,6 +691,21 @@ func TestActivityType(t *testing.T) {
 	if s := ActivityTypes.Swim.String(); s != "Swim" {
 		t.Errorf("activity type string incorrect, got %v", s)
 	}
+	if id := ActivityTypes.VirtualRide.Id(); id != 17 {
+		t.Errorf("activity type id incorrect, got %v", id)
+	}
+
+	if s := ActivityTypes.VirtualRide.String(); s != "VirtualRide" {
+		t.Errorf("activity type string incorrect, got %v", s)
+	}
+
+	if id := ActivityTypes.EBikeRide.Id(); id != 18 {
+		t.Errorf("activity type id incorrect, got %v", id)
+	}
+
+	if s := ActivityTypes.EBikeRide.String(); s != "EBikeRide" {
+		t.Errorf("activity type string incorrect, got %v", s)
+	}
 
 	if id := ActivityTypes.WaterSport.Id(); id != 20 {
 		t.Errorf("activity type id incorrect, got %v", id)
@@ -804,14 +819,6 @@ func TestActivityType(t *testing.T) {
 		t.Errorf("activity type string incorrect, got %v", s)
 	}
 
-	if id := ActivityTypes.EBikeRide.Id(); id != 42 {
-		t.Errorf("activity type id incorrect, got %v", id)
-	}
-
-	if s := ActivityTypes.EBikeRide.String(); s != "EBikeRide" {
-		t.Errorf("activity type string incorrect, got %v", s)
-	}
-
 	// other
 	ty := ActivityType(100)
 	if id := ty.Id(); id != 0 {