From afc132becd5d0c259734c64ac4f60787ede9c4bc Mon Sep 17 00:00:00 2001
From: Justin Foell <630830+jrfoell@users.noreply.github.com>
Date: Thu, 24 Dec 2020 11:53:14 -0600
Subject: [PATCH] Fix pace styles and water pace speeds

---
 readme.txt                        |  3 +++
 src/WPStrava/ActivityRenderer.php | 26 ++++++++++++--------------
 src/WPStrava/ActivityType.php     | 20 ++++++--------------
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/readme.txt b/readme.txt
index 944351e..0e48f13 100755
--- a/readme.txt
+++ b/readme.txt
@@ -116,6 +116,9 @@ On the WP-Strava settings page you cannot currently remove and add another athle
 = Unreleased =
 
 Fix latest_map class replacing echo with return https://wordpress.org/support/topic/latest-activity-map-shortcode-wrong-placed-on-page/
+Fix styling on pace activity max speed.
+Fix broken water pace on activity.
+Fix pace types and remove 'other' - making 'speed' default.
 
 = 2.5.0 =
 
diff --git a/src/WPStrava/ActivityRenderer.php b/src/WPStrava/ActivityRenderer.php
index 100b932..59e2656 100644
--- a/src/WPStrava/ActivityRenderer.php
+++ b/src/WPStrava/ActivityRenderer.php
@@ -98,20 +98,11 @@ class WPStrava_ActivityRenderer {
 								<div class="activity-details-table-units">' . $strava_som->get_pace_label() . '</div>
 							</td>';
 				$max_speed = '<td data-label="' . __( 'Max Speed', 'wp-strava' ) . '">
-								<div>' . $strava_som->pace( $activity_details->max_speed ) . '</div>
+								<div class="activity-details-table-info">' . $strava_som->pace( $activity_details->max_speed ) . '</div>
+								<div class="activity-details-table-units">' . $strava_som->get_pace_label() . '</div>
 							</td>';
 				break;
-			case WPStrava_ActivityType::TYPE_GROUP_SPEED:
-				$avg_speed = '<td data-label="' . __( 'Average Speed', 'wp-strava' ) . '">
-								<div class="activity-details-table-info">' . $strava_som->speed( $activity_details->average_speed ) . '</div>
-								<div class="activity-details-table-units">' . $strava_som->get_speed_label() . '</div>
-							</td>';
-				$max_speed = '<td data-label="' . __( 'Max Speed', 'wp-strava' ) . '">
-								<div class="activity-details-table-info">' . $strava_som->speed( $activity_details->max_speed ) . '</div>
-								<div class="activity-details-table-units">' . $strava_som->get_speed_label() . '</div>
-							</td>';
-				break;
-			case WPStrava_ActivityType::TYPE_GROUP_PACE:
+			case WPStrava_ActivityType::TYPE_GROUP_WATER:
 				$avg_speed = '<td data-label="' . __( 'Average Speed', 'wp-strava' ) . '">
 								<div class="activity-details-table-info">' . $strava_som->swimpace( $activity_details->average_speed ) . '</div>
 								<div class="activity-details-table-units">' . $strava_som->get_swimpace_label() . '</div>
@@ -121,9 +112,16 @@ class WPStrava_ActivityRenderer {
 								<div class="activity-details-table-units">' . $strava_som->get_swimpace_label() . '</div>
 							</td>';
 				break;
+			case WPStrava_ActivityType::TYPE_GROUP_SPEED:
 			default:
-				$avg_title = '';
-				$max_title = '';
+				$avg_speed = '<td data-label="' . __( 'Average Speed', 'wp-strava' ) . '">
+								<div class="activity-details-table-info">' . $strava_som->speed( $activity_details->average_speed ) . '</div>
+								<div class="activity-details-table-units">' . $strava_som->get_speed_label() . '</div>
+							</td>';
+				$max_speed = '<td data-label="' . __( 'Max Speed', 'wp-strava' ) . '">
+								<div class="activity-details-table-info">' . $strava_som->speed( $activity_details->max_speed ) . '</div>
+								<div class="activity-details-table-units">' . $strava_som->get_speed_label() . '</div>
+							</td>';
 				break;
 		}
 
diff --git a/src/WPStrava/ActivityType.php b/src/WPStrava/ActivityType.php
index 7ef74e3..825020b 100644
--- a/src/WPStrava/ActivityType.php
+++ b/src/WPStrava/ActivityType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ActivityType  [activitytype].
+ * ActivityType [activitytype].
  * @package WPStrava
  */
 
@@ -45,22 +45,18 @@ class WPStrava_ActivityType {
 	const TYPE_WORKOUT         = 'Workout';
 	const TYPE_YOGA            = 'Yoga';
 
-	const TYPE_DEFAULT = self::TYPE_RIDE;
-
-	private static $water_types = array( self::TYPE_SWIM );
 	private static $pace_types  = array( self::TYPE_CANOEING, self::TYPE_HIKE, self::TYPE_RUN, self::TYPE_SNOWSHOE, self::TYPE_VIRTUALRUN, self::TYPE_WALK );
-	private static $speed_types = array( self::TYPE_ALPINESKI, self::TYPE_BACKCOUNTRYSKI, self::TYPE_EBIKERIDE, self::TYPE_ELLIPTICAL, self::TYPE_HANDCYCLE, self::TYPE_ICESKATE, self::TYPE_INLINESKATE, self::TYPE_KAYAKING, self::TYPE_KITESURF, self::TYPE_NORDICSKI, self::TYPE_RIDE, self::TYPE_ROCKCLIMBING, self::TYPE_ROLLERSKI, self::TYPE_ROWING, self::TYPE_SNOWBOARD, self::TYPE_STAIRSTEPPER, self::TYPE_STANDUPPADDLING, self::TYPE_SURFING, self::TYPE_VIRTUALRIDE, self::TYPE_WHEELCHAIR, self::TYPE_WINDSURF );
+	private static $water_types = array( self::TYPE_SWIM );
 
-	const TYPE_GROUP_WATER = 'water';
 	const TYPE_GROUP_PACE  = 'pace';
+	const TYPE_GROUP_WATER = 'water';
 	const TYPE_GROUP_SPEED = 'speed';
-	const TYPE_GROUP_OTHER = 'other';
 
 	/**
-	 * Get the type of activity.
+	 * Get the type of activity - defaults to 'speed'.
 	 *
 	 * @param string $type Type provided by Strava.
-	 * @return string Type group (water/pace/speed/other).
+	 * @return string Type group (pace/water/speed).
 	 * @author Sebastian Erb <mail@sebastianerb.com>
 	 * @since  1.7.0
 	 */
@@ -70,15 +66,11 @@ class WPStrava_ActivityType {
 			return self::TYPE_GROUP_PACE;
 		}
 
-		if ( in_array( $type, self::$speed_types, true ) ) {
-			return self::TYPE_GROUP_SPEED;
-		}
-
 		if ( in_array( $type, self::$water_types, true ) ) {
 			return self::TYPE_GROUP_WATER;
 		}
 
-		return self::TYPE_GROUP_OTHER;
+		return self::TYPE_GROUP_SPEED;
 	}
 
 }