Merge branch 'osmandapp:master' into hardy_Afa

sonora · Aug 23, 2024 · bfc7d3d · bfc7d3d
2 parents 367ee41 + 4735dd5
commit bfc7d3d
Show file tree

Hide file tree

Showing 77 changed files with 683 additions and 178 deletions.
diff --git a/OsmAnd-shared/build.gradle.kts b/OsmAnd-shared/build.gradle.kts
@@ -10,7 +10,6 @@ plugins {
 }
 
 group = "net.osmand.shared"
-version = "master-snapshot"
 
 kotlin {
 	jvm {
@@ -85,4 +84,32 @@ android {
 	defaultConfig {
 		minSdk = 24
 	}
+}
+
+version = System.getenv("OSMAND_SHARED_ANDROID_BINARIES_IVY_REVISION") ?: "master-snapshot"
+publishing {
+	repositories {
+		ivy {
+			url = uri(System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./")
+		}
+	}
+	publications {
+		create<IvyPublication>("ivyOsmAndSharedAndroid") {
+			organisation = "net.osmand.shared"
+			module = "OsmAnd-shared-android"
+			revision = "$version"
+			artifact(file("build/outputs/aar/OsmAnd-shared-debug.aar")) {
+				type = "aar"
+				classifier = "debug"
+			}
+			artifact(file("build/outputs/aar/OsmAnd-shared-release.aar")) {
+				type = "aar"
+				classifier = "release"
+			}
+		}
+	}
+}
+
+tasks.named("publishIvyOsmAndSharedAndroidPublicationToIvyRepository") {
+	dependsOn("bundleDebugAar", "bundleReleaseAar")
 }
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxFile.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxFile.kt
@@ -881,6 +881,6 @@ class GpxFile : GpxExtensions {
 	}
 
 	companion object {
-		const val DEFAULT_WPT_GROUP_NAME = "default"
+		const val DEFAULT_WPT_GROUP_NAME = ""
 	}
 }
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/primitives/WptPt.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/primitives/WptPt.kt
@@ -99,9 +99,9 @@ class WptPt : GpxExtensions {
 	constructor(
 		lat: Double,
 		lon: Double,
-		desc: String,
-		name: String,
-		category: String,
+		desc: String?,
+		name: String?,
+		category: String?,
 		color: String,
 		icon: String,
 		background: String
@@ -132,8 +132,13 @@ class WptPt : GpxExtensions {
 		return iconName
 	}
 
-	fun setIconName(iconName: String) {
-		getExtensionsToWrite()[GpxUtilities.ICON_NAME_EXTENSION] = iconName
+	fun setIconName(iconName: String?) {
+		val extensionsToWrite = getExtensionsToWrite()
+		if (iconName == null) {
+			extensionsToWrite.remove(GpxUtilities.ICON_NAME_EXTENSION)
+		} else {
+			extensionsToWrite[GpxUtilities.ICON_NAME_EXTENSION] = iconName
+		}
 	}
 
 	fun getAmenityOriginName(): String? {
@@ -171,8 +176,13 @@ class WptPt : GpxExtensions {
 		return getExtensionsToRead()[GpxUtilities.BACKGROUND_TYPE_EXTENSION]
 	}
 
-	fun setBackgroundType(backType: String) {
-		getExtensionsToWrite()[GpxUtilities.BACKGROUND_TYPE_EXTENSION] = backType
+	fun setBackgroundType(backType: String?) {
+		val extensionsToWrite = getExtensionsToWrite()
+		if (backType == null) {
+			extensionsToWrite.remove(GpxUtilities.BACKGROUND_TYPE_EXTENSION)
+		} else {
+			extensionsToWrite[GpxUtilities.BACKGROUND_TYPE_EXTENSION] = backType
+		}
 	}
 
 	fun getProfileType(): String? {
@@ -250,9 +260,9 @@ class WptPt : GpxExtensions {
 		fun createAdjustedPoint(
 			lat: Double,
 			lon: Double,
-			description: String,
-			name: String,
-			category: String,
+			description: String?,
+			name: String?,
+			category: String?,
 			color: Int,
 			iconName: String?,
 			backgroundType: String?,

diff --git a/OsmAnd/res/drawable/ic_action_previous_screen.xml b/OsmAnd/res/drawable/ic_action_previous_screen.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,18V6H11V5C11,4.4477 10.5523,4 10,4H3C2.4477,4 2,4.4477 2,5V19C2,19.5523 2.4477,20 3,20H10C10.5523,20 11,19.5523 11,19V18H4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M15,8V6H20V18H15V16H13V19C13,19.5523 13.4477,20 14,20H21C21.5523,20 22,19.5523 22,19V5C22,4.4477 21.5523,4 21,4H14C13.4477,4 13,4.4477 13,5V8H15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11.7071,15.2929L9.4142,13H15V11H9.4142L11.7071,8.7071L10.2929,7.2929L5.5858,12L10.2929,16.7071L11.7071,15.2929Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
@@ -5372,7 +5372,6 @@
     <string name="routing_attr_hazmat_category_usa_3_name">سوائل قابلة للإشتعال</string>
     <string name="routing_attr_hazmat_category_usa_2_name">غازات</string>
     <string name="dangerous_goods_description">في بعض الطرق والأنفاق يحظر نقل المواد الخطرة.</string>
-    <string name="rendering_attr_alpineHiking_name">تصنيف الصعوبات</string>
     <string name="write_heading">كتابة العنوان</string>
     <string name="rendering_value_caiScale_description">نادي ألبينو الإيطالي (نادي ألبين الإيطالي)</string>
     <string name="rendering_value_sacScale_description">نادي الألب السويسري</string>
@@ -5904,7 +5903,6 @@
     <string name="add_widget_above">إضافة ويدجت أعلى</string>
     <string name="add_widget_to_the_right">إضافة ويدجت إلى اليمين</string>
     <string name="add_widget_to_the_left">إضافة ويدجت إلى اليسار</string>
-    <string name="height_cache">ذاكرة التخزين مرتفعة</string>
     <string name="route_roundabout_exit">خذ %1$d للخروج</string>
     <string name="help_article_map_tracks_name">المسارات</string>
     <string name="help_article_map_routes_name">المسارات الرياضية</string>

diff --git a/OsmAnd/res/values-ars/strings.xml b/OsmAnd/res/values-ars/strings.xml
@@ -3558,7 +3558,6 @@
     <string name="remove_from_map_markers">إزالة من \"التوجيه المباشر\"</string>
     <string name="route_line_use_gradient_coloring">خط المسار ملون حسب ارتفاع المنحدر .</string>
     <string name="int_days">أيام</string>
-    <string name="rendering_attr_alpineHiking_name">تصنيف الصعوبات</string>
     <string name="shared_string_actions">إجراءات</string>
     <string name="shared_string_purchased_on">تم الشراء في</string>
     <string name="quick_action_cloud_layer">مفتاح تبديل لإظهار أو إخفاء طبقة الرياح على الخريطة.</string>

diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml
@@ -4829,7 +4829,6 @@
     <string name="open_issue_on_github_descr">Postavi pitanje, predloži nove mogućnosti</string>
     <string name="routing_attr_hazmat_category_usa_1_name">Eksplozivi</string>
     <string name="rendering_value_caiScale_name">CAI</string>
-    <string name="rendering_attr_alpineHiking_name">Klasifikacija po težini</string>
     <string name="rssi_widget_desc">Prikazuj stepen RSSI tvog spoljnjeg uređaja.</string>
     <string name="ant_plus_pair_bluetooth_prompt">Možeš upariti senzore Bluetooth LE i ANT+ sa OsmAndom.</string>
     <string name="camera_app">Kamera</string>
@@ -5862,12 +5861,26 @@
     <string name="help_article_map_tracks_name">Trase</string>
     <string name="help_article_map_routes_name">Rute</string>
     <string name="route_roundabout_exit">Izađi na %1$d izlaz</string>
-    <string name="height_cache">Keš visine</string>
     <string name="add_widget_above">Dodaj widžet iznad</string>
     <string name="add_widget_below">Dodaj widžet ispod</string>
     <string name="add_widget_to_the_right">Dodaj widžet desno</string>
     <string name="add_widget_to_the_left">Dodaj widžet levo</string>
     <string name="delete_widget">Brišeš vidžet?</string>
     <string name="delete_widget_description">Ovaj widžet će biti izbrisan. Možeš ga vratiti kasnije u podešavanjima ekrana.</string>
     <string name="battery_saving_mode">Režim uštede baterije</string>
+    <string name="app_mode_suv">SUV</string>
+    <string name="graph_axis">Grafička osa</string>
+    <string name="y_axis_description">Izaberi do dve opcije za Y osu.</string>
+    <string name="rendering_attr_alpineHiking_name">Stepen težine pešačkih staza</string>
+    <string name="shared_string_interface">Interfejs</string>
+    <string name="quick_action_previous_screen_desc">Prekidač za navigaciju na prethodni ekran.</string>
+    <string name="quick_action_previous_screen_title">Prethodni ekran</string>
+    <string name="quick_action_verb_navigate">Navigacija</string>
+    <string name="quick_action_drawer_desc">Prekidač za prikaz ili sakrivanje bočnog menija.</string>
+    <string name="quick_action_drawer_title">Bočni meni</string>
+    <string name="quick_action_search_view_desc">Prekidač za otvaranje ili zatvaranje prikaza pretrage.</string>
+    <string name="quick_action_search_view_title">Prikaz pretrage</string>
+    <string name="quick_action_navigation_view_desc">Prekidač za otvaranje ili zatvaranje prikaza navigacije.</string>
+    <string name="quick_action_navigation_view_title">Prikaz navigacije</string>
+    <string name="quick_action_switch_compass_desc">Prekidač za promenu orijentacije mape.</string>
 </resources>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
@@ -3860,7 +3860,6 @@
     <string name="date_of_creation">Дата на създаване</string>
     <string name="shared_string_included">Включено</string>
     <string name="routing_engine_vehicle_type_hiking">Пешеходен туризъм</string>
-    <string name="rendering_attr_alpineHiking_name">Класификация на сложност</string>
     <string name="free_settings_backup">Резервно копие на настройките</string>
     <string name="app_mode_personal_transporter">Личен транспортьор</string>
     <string name="slope_legend_description">При склоновете се използва цвят за изобразяване на стръмността на терена. Повече за склоновете в %1$s.</string>

diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
@@ -4478,7 +4478,6 @@
     <string name="maps_and_resources">Mapes i Descàrregues</string>
     <string name="rendering_attr_alpineHiking_description">Tipus de classificació de la dificultat de les rutes.</string>
     <string name="street_level_imagery">Imatges a nivell de carrer</string>
-    <string name="rendering_attr_alpineHiking_name">Classificació de la dificultat</string>
     <string name="relief_3d">Relleu en 3D</string>
     <string name="rendering_attr_showRunningRoutes_description">Mostrar rutes per a córrer</string>
     <string name="rendering_attr_showRunningRoutes_name">Rutes per a córrer</string>

diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
@@ -4741,4 +4741,8 @@
     <string name="poi_padus_category_proclamation">Kategorie: prohlášení</string>
     <string name="poi_padus_category_fee">Kategorie: poplatek</string>
     <string name="poi_padus_area">Chráněná oblast PAD-US</string>
+    <string name="poi_padus_category_easement">Kategorie: věcné břemeno</string>
+    <string name="poi_padus_local_designation">Místní označení</string>
+    <string name="poi_padus_local_manager">Místní manažer</string>
+    <string name="poi_padus_owner_fullname">Majitel</string>
 </resources>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
@@ -5303,7 +5303,6 @@
     <string name="rendering_attr_alpineHiking_description">Typy klasifikace tras podle obtížnosti.</string>
     <string name="rendering_value_sacScale_description">Švýcarský alpinistický klub</string>
     <string name="rendering_value_caiScale_description">Club Alpino Italiano (italský alpinistický klub)</string>
-    <string name="rendering_attr_alpineHiking_name">Klasifikace podle obížnosti</string>
     <string name="rendering_value_sacScale_name">SAC</string>
     <string name="rendering_value_caiScale_name">CAI</string>
     <string name="write_bearing_description">Ukládat azimut každého bodu stopy během záznamu</string>
@@ -5775,7 +5774,6 @@
     <string name="add_widget_above">Přidat widget nad</string>
     <string name="add_widget_to_the_right">Přidat widget vpravo</string>
     <string name="add_widget_to_the_left">Přidat widget vlevo</string>
-    <string name="height_cache">výšková mezipaměť</string>
     <string name="daynight_mode_sensor_summary">Použije světelný senzor zařízení pro přepínání mezi světlým a tmavým režimem podle úrovně okolního světla.</string>
     <string name="daynight_mode_sunrise_sunset_summary">Automaticky přepíná mezi denním a nočním režimem podle místního času východu a západu slunce.</string>
     <string name="daynight_mode_night_summary">Vždy zobrazí mapu ve tmavém režimu, vhodné v noci a v podmínkách se slabým osvětlením.</string>

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
@@ -5314,7 +5314,6 @@
     <string name="rendering_value_sacScale_name">SAC</string>
     <string name="rendering_value_caiScale_name">CAI</string>
     <string name="rendering_attr_alpineHiking_description">Klassificeringstyper for sværhedsgrad af ruterne.</string>
-    <string name="rendering_attr_alpineHiking_name">Sværhedsklassificering</string>
     <string name="write_bearing">Skriv pejling</string>
     <string name="write_heading_description">Gem retning for hvert sporpunkt under optagelse</string>
     <string name="write_heading">Skriv retning</string>
@@ -5863,10 +5862,24 @@
     <string name="route_roundabout_exit">Tag %1$d afkørsel</string>
     <string name="add_widget_above">Tilføj modul ovenfor</string>
     <string name="add_widget_to_the_left">Tilføj modul til venstre</string>
-    <string name="height_cache">Højde-cache</string>
     <string name="add_widget_below">Tilføj modul nedenfor</string>
     <string name="add_widget_to_the_right">Tilføj modul til højre</string>
     <string name="delete_widget">Slet modul?</string>
     <string name="delete_widget_description">Dette modul bliver slettet. Du kan gendanne det senere i Konfigurer skærm.</string>
     <string name="battery_saving_mode">Batterisparetilstand</string>
+    <string name="graph_axis">Graf-akse</string>
+    <string name="y_axis_description">Vælg op til to muligheder for Y-aksen.</string>
+    <string name="app_mode_suv">SUV</string>
+    <string name="rendering_attr_alpineHiking_name">Vandrestiers sværhedsgrad</string>
+    <string name="quick_action_previous_screen_desc">En skifter til at navigere til den forrige skærm.</string>
+    <string name="quick_action_previous_screen_title">Forrige skærm</string>
+    <string name="quick_action_verb_navigate">Naviger</string>
+    <string name="quick_action_drawer_desc">En skifter til at vise eller skjule sidemenuen.</string>
+    <string name="quick_action_drawer_title">Sidemenu</string>
+    <string name="quick_action_search_view_desc">En skifter til at åbne eller lukke søgevisning.</string>
+    <string name="quick_action_switch_compass_desc">En skifter til at skifte kortorientering.</string>
+    <string name="shared_string_interface">Brugerflade</string>
+    <string name="quick_action_navigation_view_desc">En skifter til at åbne eller lukke navigationsvisning.</string>
+    <string name="quick_action_search_view_title">Søgevisning</string>
+    <string name="quick_action_navigation_view_title">Navigationsvisning</string>
 </resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
@@ -5313,7 +5313,6 @@
     <string name="rendering_value_sacScale_description">Schweizer Alpen-Club</string>
     <string name="shared_string_not_checked">Nicht geprüft</string>
     <string name="rendering_attr_alpineHiking_description">Schwierigkeitsgrade der Wanderwege.</string>
-    <string name="rendering_attr_alpineHiking_name">Schwierigkeitsgrad</string>
     <string name="rendering_value_sacScale_name">SAC-Wanderskala</string>
     <string name="write_bearing">Peilung schreiben</string>
     <string name="write_heading">Richtung schreiben</string>
@@ -5860,12 +5859,26 @@
     <string name="help_article_map_tracks_name">Strecken</string>
     <string name="help_article_map_routes_name">Routen</string>
     <string name="route_roundabout_exit">%1$d. Ausfahrt nehmen</string>
-    <string name="height_cache">Höhen-Cache</string>
     <string name="add_widget_below">Widget unten hinzufügen</string>
     <string name="add_widget_above">Widget oben hinzufügen</string>
     <string name="add_widget_to_the_right">Widget rechts hinzufügen</string>
     <string name="add_widget_to_the_left">Widget links hinzufügen</string>
     <string name="delete_widget">Widget löschen?</string>
     <string name="delete_widget_description">Dieses Widget wird gelöscht. Du kannst es später im Bildschirm Konfigurieren wiederherstellen.</string>
     <string name="battery_saving_mode">Batteriesparmodus</string>
+    <string name="graph_axis">Grafik-Achse</string>
+    <string name="y_axis_description">Wähle bis zu zwei Optionen für die Y-Achse.</string>
+    <string name="app_mode_suv">SUV</string>
+    <string name="rendering_attr_alpineHiking_name">Schwierigkeitsgrad der Wanderwege</string>
+    <string name="shared_string_interface">Benutzeroberfläche</string>
+    <string name="quick_action_previous_screen_desc">Ein Schalter, um zum vorherigen Bildschirm zu navigieren.</string>
+    <string name="quick_action_previous_screen_title">Vorheriger Bildschirm</string>
+    <string name="quick_action_search_view_desc">Ein Schalter, um die Suchansicht zu öffnen oder zu schließen.</string>
+    <string name="quick_action_search_view_title">Suchansicht</string>
+    <string name="quick_action_navigation_view_desc">Ein Schalter, um die Navigationsansicht zu öffnen oder zu schließen.</string>
+    <string name="quick_action_verb_navigate">Navigieren</string>
+    <string name="quick_action_drawer_desc">Ein Schalter, um das Seitenmenü ein- oder auszublenden.</string>
+    <string name="quick_action_navigation_view_title">Navigationsansicht</string>
+    <string name="quick_action_switch_compass_desc">Ein Schalter, um die Kartenausrichtung zu wechseln.</string>
+    <string name="quick_action_drawer_title">Seitenmenü</string>
 </resources>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
@@ -4361,7 +4361,6 @@
     <string name="walking_route_osmc_description">Χρωματίζονται οι διαδρομές ανάλογα με το δικό του τοπικό χρώμα (αν υπάρχει στο OpenStreetMap) και τον τύπο (διεθνές, περιφερειακό, τοπικό).</string>
     <string name="rendering_attr_showRunningRoutes_name">Διαδρομές τρεξίματος</string>
     <string name="routeInfo_horse_scale_name">Δυσκολία των μονοπάτιών για άλογο</string>
-    <string name="rendering_attr_alpineHiking_name">Κατηγοριοποίηση δυσκολίας</string>
     <string name="rendering_attr_natureReserves_name">Φυσικό καταφύγιο</string>
     <string name="quick_action_parking_place">Θέση στάθμευσης</string>
     <string name="quick_action_video_note">Σημείωση βίντεο</string>