Improve search/display/click for variety of Travel Routes (wikivoyage, gpx, activities, etc)

OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java

@@ -2,6 +2,7 @@
 
 import static net.osmand.IndexConstants.GPX_FILE_EXT;
 import static net.osmand.IndexConstants.GPX_GZ_FILE_EXT;
+import static net.osmand.data.Amenity.ROUTE_ID;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -696,7 +697,7 @@ public List<String> getOriginalNames() {
 
 		public String getRouteID() {
 			for (Map.Entry<String, String> entry : getTags().entrySet()) {
-				if ("route_id".equals(entry.getKey())) {
+				if (ROUTE_ID.equals(entry.getKey())) {
 					return entry.getValue();
 				}
 			}

OsmAnd-java/src/main/java/net/osmand/data/Amenity.java

@@ -2,6 +2,11 @@
 
 import static net.osmand.gpx.GPXUtilities.AMENITY_PREFIX;
 import static net.osmand.gpx.GPXUtilities.OSM_PREFIX;
+import static net.osmand.osm.MapPoiTypes.ROUTES_PREFIX;
+import static net.osmand.osm.MapPoiTypes.ROUTE_ARTICLE;
+import static net.osmand.osm.MapPoiTypes.ROUTE_ARTICLE_POINT;
+import static net.osmand.osm.MapPoiTypes.ROUTE_TRACK;
+import static net.osmand.osm.MapPoiTypes.ROUTE_TRACK_POINT;
 
 import net.osmand.Location;
 import net.osmand.binary.BinaryMapIndexReader.TagValuePair;
@@ -48,6 +53,7 @@ public class Amenity extends MapObject {
 	public static final String IS_AGGR_PART = "is_aggr_part";
 	public static final String CONTENT_JSON = "content_json";
 	public static final String ROUTE_ID = "route_id";
+	public static final String ROUTE_ID_OSM_PREFIX = "OSM";
 	public static final String ROUTE_SOURCE = "route_source";
 	public static final String ROUTE_NAME = "route_name";
 	public static final String COLOR = "color";
@@ -447,6 +453,25 @@ public String getRouteId() {
 		return getAdditionalInfo(ROUTE_ID);
 	}
 
+	public boolean hasOsmRouteId() {
+		String routeId = getRouteId();
+		return routeId != null && routeId.startsWith(ROUTE_ID_OSM_PREFIX);
+	}
+
+	public String getGpxFileName(String lang) {
+		final String gpxFileName = lang != null ? getName(lang) : getEnName(true);
+		if (!Algorithms.isEmpty(gpxFileName)) {
+			return gpxFileName;
+		}
+		if (!Algorithms.isEmpty(getRouteId())) {
+			return getRouteId();
+		}
+		if (!Algorithms.isEmpty(getSubType())) {
+			return getType().getKeyName() + " " + getSubType();
+		}
+		return getType().getKeyName();
+	}
+
 	public String getStrictTagContent(String tag, String lang) {
 		if (lang != null) {
 			String translateName = getAdditionalInfo(tag + ":" + lang);
@@ -549,6 +574,14 @@ public boolean isPrivateAccess() {
 		return PRIVATE_VALUE.equals(getTagContent(ACCESS_PRIVATE_TAG));
 	}
 
+	public boolean isRouteTrack() {
+		return subType != null && (subType.equals(ROUTE_TRACK) || subType.startsWith(ROUTES_PREFIX));
+	}
+
+	public boolean isRoutePoint() {
+		return subType != null && (subType.equals(ROUTE_TRACK_POINT) || subType.equals(ROUTE_ARTICLE_POINT));
+	}
+
 	public JSONObject toJSON() {
 		JSONObject json = super.toJSON();
 		json.put("subType", subType);

OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java

@@ -48,7 +48,8 @@ public class MapPoiTypes {
 	public static final String ROUTE_ARTICLE = "route_article";
 	public static final String ROUTE_ARTICLE_POINT = "route_article_point";
 	public static final String CATEGORY = "category";
-	public static final String ROUTE_TRACK = "route_track";
+	public static final String ROUTE_TRACK = "route_track"; // routes:route_track (no activity)
+	public static final String ROUTES_PREFIX = "routes_"; // routes:routes_xxx (activity type)
 	public static final String ROUTE_TRACK_POINT = "route_track_point";
 
 	private PoiTranslator poiTranslator = null;

OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java

@@ -1,5 +1,9 @@
 package net.osmand.search;
 
+import static net.osmand.data.Amenity.ROUTE_ID;
+import static net.osmand.osm.MapPoiTypes.ROUTES_PREFIX;
+import static net.osmand.osm.MapPoiTypes.ROUTE_TRACK;
+
 import net.osmand.CallbackWithObject;
 import net.osmand.Collator;
 import net.osmand.PlatformUtil;
@@ -289,11 +293,8 @@ public boolean sameSearchResult(SearchResult r1, SearchResult r2) {
 									|| (subType1.startsWith("route_hiking_") && subType1.endsWith("n_poi"))) {
 								similarityRadius = 50000;
 							}
-							final String ROUTE_ID = "route_id";
-							final String ROUTE_TRACK = "route_track";
-							final String ROUTE_TYPE_PREFIX = "activities_";
 							if (Algorithms.stringsEqual(a1.getAdditionalInfo(ROUTE_ID), a2.getAdditionalInfo(ROUTE_ID))
-								&& (subType1.startsWith(ROUTE_TYPE_PREFIX) || subType1.equals(ROUTE_TRACK))) {
+								&& (subType1.startsWith(ROUTES_PREFIX) || subType1.equals(ROUTE_TRACK))) {
 								similarityRadius = 50000;
 							}
 						}

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)
 			}

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

OsmAnd/res/values-b+sr+Latn/phrases.xml

@@ -4884,17 +4884,17 @@
     <string name="poi_route_article_point">Tačke na putovanjima</string>
     <string name="poi_route_track">Druge rute</string>
     <string name="poi_route_track_point">Tačke drugih ruta</string>
-    <string name="poi_activities_bicycle">Bicikl</string>
-    <string name="poi_activities_trekking">Pešačenje</string>
-    <string name="poi_activities_running">Trčanje</string>
-    <string name="poi_activities_pedestrian">Hodanje</string>
-    <string name="poi_activities_kayak">Sportovi na vodi</string>
-    <string name="poi_activities_skiing">Zimski sportovi</string>
-    <string name="poi_activities_inline_skates">Koturaljke</string>
-    <string name="poi_activities_horse">Jahanje konja</string>
-    <string name="poi_activities_snowmobile">Motorne sanke</string>
-    <string name="poi_activities_fitness">Staze za trčanje</string>
-    <string name="poi_activities_mountain_bike">Brdski biciklizam</string>
+    <string name="poi_routes_bicycle">Bicikl</string>
+    <string name="poi_routes_trekking">Pešačenje</string>
+    <string name="poi_routes_running">Trčanje</string>
+    <string name="poi_routes_pedestrian">Hodanje</string>
+    <string name="poi_routes_kayak">Sportovi na vodi</string>
+    <string name="poi_routes_skiing">Zimski sportovi</string>
+    <string name="poi_routes_inline_skates">Koturaljke</string>
+    <string name="poi_routes_horse">Jahanje konja</string>
+    <string name="poi_routes_snowmobile">Motorne sanke</string>
+    <string name="poi_routes_fitness">Staze za trčanje</string>
+    <string name="poi_routes_mountain_bike">Brdski biciklizam</string>
     <string name="poi_name_etymology">Etimologija imena</string>
     <string name="poi_name_left">Naziv leve strane</string>
     <string name="poi_name_right">Naziv desne strane</string>

OsmAnd/res/values-cs/phrases.xml

@@ -4884,17 +4884,17 @@
     <string name="poi_route_article_point">Body na cestách</string>
     <string name="poi_route_track">Další trasy</string>
     <string name="poi_route_track_point">Další body trasy</string>
-    <string name="poi_activities_bicycle">Kolo</string>
-    <string name="poi_activities_trekking">Pěší turistika</string>
-    <string name="poi_activities_running">Běh</string>
-    <string name="poi_activities_pedestrian">Chůze</string>
-    <string name="poi_activities_kayak">Vodní sporty</string>
-    <string name="poi_activities_horse">Jízda na koni</string>
-    <string name="poi_activities_skiing">Zimní sporty</string>
-    <string name="poi_activities_snowmobile">Sněžný skútr</string>
-    <string name="poi_activities_fitness">Fitness stezky</string>
-    <string name="poi_activities_inline_skates">Inline brusle</string>
-    <string name="poi_activities_mountain_bike">Horská cyklistika</string>
+    <string name="poi_routes_bicycle">Kolo</string>
+    <string name="poi_routes_trekking">Pěší turistika</string>
+    <string name="poi_routes_running">Běh</string>
+    <string name="poi_routes_pedestrian">Chůze</string>
+    <string name="poi_routes_kayak">Vodní sporty</string>
+    <string name="poi_routes_horse">Jízda na koni</string>
+    <string name="poi_routes_skiing">Zimní sporty</string>
+    <string name="poi_routes_snowmobile">Sněžný skútr</string>
+    <string name="poi_routes_fitness">Fitness stezky</string>
+    <string name="poi_routes_inline_skates">Inline brusle</string>
+    <string name="poi_routes_mountain_bike">Horská cyklistika</string>
     <string name="poi_name_etymology">Původ názvu</string>
     <string name="poi_name_right">Název pravé strany</string>
     <string name="poi_name_left">Název levé strany</string>
@@ -4904,4 +4904,4 @@
     <string name="poi_camp_site_basic">Základní</string>
     <string name="poi_camp_site_standard">Standardní</string>
     <string name="poi_camp_site_serviced">Se službami</string>
-</resources>
+</resources>

OsmAnd/res/values-de/phrases.xml

@@ -4881,20 +4881,20 @@
     <string name="poi_osmand_foot_prohibited_tunnel">Tunnel für Fußgänger verboten</string>
     <string name="poi_osmand_bicycle_prohibited_tunnel">Tunnel für Radfahrer verboten</string>
     <string name="poi_route_article_point">Reisepunkte</string>
-    <string name="poi_activities_kayak">Wassersport</string>
-    <string name="poi_activities_pedestrian">Gehen</string>
-    <string name="poi_activities_horse">Reiten</string>
+    <string name="poi_routes_kayak">Wassersport</string>
+    <string name="poi_routes_pedestrian">Gehen</string>
+    <string name="poi_routes_horse">Reiten</string>
     <string name="poi_route_article">Reiseartikel</string>
     <string name="poi_route_track">Andere Routen</string>
     <string name="poi_route_track_point">Weitere Routenpunkte</string>
-    <string name="poi_activities_bicycle">Fahrrad</string>
-    <string name="poi_activities_trekking">Wandern</string>
-    <string name="poi_activities_running">Laufen</string>
-    <string name="poi_activities_skiing">Wintersport</string>
-    <string name="poi_activities_snowmobile">Schneemobil</string>
-    <string name="poi_activities_fitness">Fitness-Parcour</string>
-    <string name="poi_activities_inline_skates">Inlineskates</string>
-    <string name="poi_activities_mountain_bike">Mountainbiken</string>
+    <string name="poi_routes_bicycle">Fahrrad</string>
+    <string name="poi_routes_trekking">Wandern</string>
+    <string name="poi_routes_running">Laufen</string>
+    <string name="poi_routes_skiing">Wintersport</string>
+    <string name="poi_routes_snowmobile">Schneemobil</string>
+    <string name="poi_routes_fitness">Fitness-Parcour</string>
+    <string name="poi_routes_inline_skates">Inlineskates</string>
+    <string name="poi_routes_mountain_bike">Mountainbiken</string>
     <string name="poi_name_etymology">Namensetymologie</string>
     <string name="poi_name_left">Name der linken Seite</string>
     <string name="poi_name_right">Name der rechten Seite</string>

OsmAnd/res/values-eo/phrases.xml

@@ -4880,17 +4880,17 @@
     <string name="poi_route_article_point">Vojaĝaj punktoj</string>
     <string name="poi_route_track">Aliaj kursoj</string>
     <string name="poi_route_track_point">Aliaj kursoj: punktoj</string>
-    <string name="poi_activities_bicycle">Biciklado</string>
-    <string name="poi_activities_trekking">Marŝado</string>
-    <string name="poi_activities_running">Kurado</string>
-    <string name="poi_activities_pedestrian">Irado</string>
-    <string name="poi_activities_kayak">Akvaj sportoj</string>
-    <string name="poi_activities_horse">Ĉevalrajdado</string>
-    <string name="poi_activities_skiing">Vintraj sportoj</string>
-    <string name="poi_activities_snowmobile">Motorsledado</string>
-    <string name="poi_activities_fitness">Vojetoj de sportiloj</string>
-    <string name="poi_activities_inline_skates">Rulglitado</string>
-    <string name="poi_activities_mountain_bike">Montbiciklado</string>
+    <string name="poi_routes_bicycle">Biciklado</string>
+    <string name="poi_routes_trekking">Marŝado</string>
+    <string name="poi_routes_running">Kurado</string>
+    <string name="poi_routes_pedestrian">Irado</string>
+    <string name="poi_routes_kayak">Akvaj sportoj</string>
+    <string name="poi_routes_horse">Ĉevalrajdado</string>
+    <string name="poi_routes_skiing">Vintraj sportoj</string>
+    <string name="poi_routes_snowmobile">Motorsledado</string>
+    <string name="poi_routes_fitness">Vojetoj de sportiloj</string>
+    <string name="poi_routes_inline_skates">Rulglitado</string>
+    <string name="poi_routes_mountain_bike">Montbiciklado</string>
     <string name="poi_payment_parco_yes">Parco</string>
     <string name="poi_payment_parco_no">Parco malakceptata</string>
     <string name="poi_payment_parkster_yes">Parkster</string>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -4884,17 +4884,17 @@
     <string name="poi_route_article_point">Puntos turísticos</string>
     <string name="poi_route_track">Otras rutas</string>
     <string name="poi_route_track_point">Otros puntos de ruta</string>
-    <string name="poi_activities_bicycle">Bicicleta</string>
-    <string name="poi_activities_trekking">Senderismo</string>
-    <string name="poi_activities_running">Correr</string>
-    <string name="poi_activities_pedestrian">Peatón</string>
-    <string name="poi_activities_kayak">Deportes acuáticos</string>
-    <string name="poi_activities_horse">Equitación</string>
-    <string name="poi_activities_skiing">Deportes de invierno</string>
-    <string name="poi_activities_snowmobile">Motonieve</string>
-    <string name="poi_activities_fitness">Circuitos aeróbicos</string>
-    <string name="poi_activities_inline_skates">Patines en línea</string>
-    <string name="poi_activities_mountain_bike">Ciclismo de montaña</string>
+    <string name="poi_routes_bicycle">Bicicleta</string>
+    <string name="poi_routes_trekking">Senderismo</string>
+    <string name="poi_routes_running">Correr</string>
+    <string name="poi_routes_pedestrian">Peatón</string>
+    <string name="poi_routes_kayak">Deportes acuáticos</string>
+    <string name="poi_routes_horse">Equitación</string>
+    <string name="poi_routes_skiing">Deportes de invierno</string>
+    <string name="poi_routes_snowmobile">Motonieve</string>
+    <string name="poi_routes_fitness">Circuitos aeróbicos</string>
+    <string name="poi_routes_inline_skates">Patines en línea</string>
+    <string name="poi_routes_mountain_bike">Ciclismo de montaña</string>
     <string name="poi_name_etymology">Nombre etimológico</string>
     <string name="poi_name_left">Nombre del lado izquierdo</string>
     <string name="poi_name_right">Nombre del lado derecho</string>
@@ -4904,4 +4904,4 @@
     <string name="poi_camp_site_serviced">Con servicios</string>
     <string name="poi_camp_site_type">Tipo de campamento</string>
     <string name="poi_camp_site_deluxe">De lujo</string>
-</resources>
+</resources>

OsmAnd/res/values-es-rUS/phrases.xml

@@ -4979,15 +4979,15 @@
     <string name="poi_route_article_point">Puntos turísticos</string>
     <string name="poi_route_track">Otras rutas</string>
     <string name="poi_route_track_point">Otros puntos de ruta</string>
-    <string name="poi_activities_bicycle">Bicicleta</string>
-    <string name="poi_activities_trekking">Senderismo</string>
-    <string name="poi_activities_running">Correr</string>
-    <string name="poi_activities_pedestrian">Peatón</string>
-    <string name="poi_activities_kayak">Deportes acuáticos</string>
-    <string name="poi_activities_horse">Equitación</string>
-    <string name="poi_activities_skiing">Deportes de invierno</string>
-    <string name="poi_activities_snowmobile">Motonieve</string>
-    <string name="poi_activities_fitness">Circuitos aeróbicos</string>
-    <string name="poi_activities_inline_skates">Patines en línea</string>
-    <string name="poi_activities_mountain_bike">Ciclismo de montaña</string>
+    <string name="poi_routes_bicycle">Bicicleta</string>
+    <string name="poi_routes_trekking">Senderismo</string>
+    <string name="poi_routes_running">Correr</string>
+    <string name="poi_routes_pedestrian">Peatón</string>
+    <string name="poi_routes_kayak">Deportes acuáticos</string>
+    <string name="poi_routes_horse">Equitación</string>
+    <string name="poi_routes_skiing">Deportes de invierno</string>
+    <string name="poi_routes_snowmobile">Motonieve</string>
+    <string name="poi_routes_fitness">Circuitos aeróbicos</string>
+    <string name="poi_routes_inline_skates">Patines en línea</string>
+    <string name="poi_routes_mountain_bike">Ciclismo de montaña</string>
 </resources>

OsmAnd/res/values-es/phrases.xml

@@ -4880,21 +4880,21 @@
     <string name="poi_payment_parco_yes">Parco</string>
     <string name="poi_osmand_foot_prohibited_tunnel">Túnel prohibido para peatones</string>
     <string name="poi_osmand_bicycle_prohibited_tunnel">Túnel prohibido para ciclistas</string>
-    <string name="poi_activities_bicycle">Bicicleta</string>
-    <string name="poi_activities_trekking">Senderismo</string>
-    <string name="poi_activities_running">Correr</string>
-    <string name="poi_activities_pedestrian">Peatonal</string>
-    <string name="poi_activities_kayak">Deportes acuáticos</string>
-    <string name="poi_activities_horse">Equitación</string>
-    <string name="poi_activities_snowmobile">Motonieve</string>
-    <string name="poi_activities_fitness">Circuitos aeróbicos</string>
-    <string name="poi_activities_inline_skates">Patines en línea</string>
-    <string name="poi_activities_mountain_bike">Bicicleta de montaña</string>
+    <string name="poi_routes_bicycle">Bicicleta</string>
+    <string name="poi_routes_trekking">Senderismo</string>
+    <string name="poi_routes_running">Correr</string>
+    <string name="poi_routes_pedestrian">Peatonal</string>
+    <string name="poi_routes_kayak">Deportes acuáticos</string>
+    <string name="poi_routes_horse">Equitación</string>
+    <string name="poi_routes_snowmobile">Motonieve</string>
+    <string name="poi_routes_fitness">Circuitos aeróbicos</string>
+    <string name="poi_routes_inline_skates">Patines en línea</string>
+    <string name="poi_routes_mountain_bike">Bicicleta de montaña</string>
     <string name="poi_route_article">Artículos de viajes</string>
     <string name="poi_route_article_point">Puntos del viaje</string>
     <string name="poi_route_track">Otras rutas</string>
     <string name="poi_route_track_point">Otros puntos de la ruta</string>
-    <string name="poi_activities_skiing">Deportes de invierno</string>
+    <string name="poi_routes_skiing">Deportes de invierno</string>
     <string name="poi_name_left">Nombre en el lado izquierdo</string>
     <string name="poi_name_etymology">Etimología del nombre</string>
     <string name="poi_name_right">Nombre en el lado derecho</string>