Add tags support in Kotlin RouteActivityHelper

osmandapp · Nov 25, 2024 · ea5507d · ea5507d
1 parent 7f5a9c5
commit ea5507d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/RouteActivityHelper.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/RouteActivityHelper.kt
@@ -45,6 +45,15 @@ object RouteActivityHelper {
 		return cachedActivities
 	}
 
+	fun findActivityByTag(tag: String): RouteActivity? {
+		for (activity in getActivities()) {
+			if (activity.tags != null && activity.tags.contains(tag)) {
+				return activity
+			}
+		}
+		return null
+	}
+
 	fun saveRouteActivity(trackItems: Collection<TrackItem>, routeActivity: RouteActivity?) {
 		runAsync {
 			trackItems.forEach { trackItem ->
@@ -121,7 +130,8 @@ object RouteActivityHelper {
 				val activityId = activityJson["id"]!!.jsonPrimitive.content
 				val activityLabel = activityJson["label"]!!.jsonPrimitive.content
 				val iconName = activityJson["icon_name"]!!.jsonPrimitive.content
-				val activity = RouteActivity(activityId, activityLabel, iconName, activitiesGroup)
+				val tags = activityJson["tags"]?.jsonArray?.map { it.jsonPrimitive.content }?.toSet()
+				val activity = RouteActivity(activityId, activityLabel, iconName, activitiesGroup, tags)
 				cachedActivities.add(activity)
 				activities.add(activity)
 			}

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/primitives/RouteActivity.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/primitives/RouteActivity.kt
@@ -4,7 +4,8 @@ data class RouteActivity(
 	val id: String,
 	val label: String,
 	val iconName: String,
-	val group: RouteActivityGroup
+	val group: RouteActivityGroup,
+	val tags: Set<String>? = null
 ) {
 	override fun toString(): String {
 		return id