Merge branch 'osmandapp:master' into hardy_Afa

sonora · Jan 14, 2025 · c7ac627 · c7ac627
2 parents eaefeed + 6c6489e
commit c7ac627
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 8 deletions.
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDataItem.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDataItem.kt
@@ -96,7 +96,7 @@ class GpxDataItem(
 
 	fun readGpxAppearanceParameter(gpxFile: GpxFile, parameter: GpxParameter) {
 		when (parameter) {
-			GpxParameter.COLOR -> setParameter(GpxParameter.COLOR, gpxFile.getColor(0))
+			GpxParameter.COLOR -> setParameter(GpxParameter.COLOR, gpxFile.getColor(null))
 			GpxParameter.WIDTH -> setParameter(GpxParameter.WIDTH, gpxFile.getWidth(null))
 			GpxParameter.SHOW_ARROWS ->
 				setParameter(

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
@@ -476,7 +476,7 @@ class GpxFile : GpxExtensions {
 		val tpoints = mutableListOf<TrkSegment>()
 		if (routes.isNotEmpty()) {
 			for (route in routes) {
-				val routeColor = route.getColor(getColor(0))
+				val routeColor = route.getColor(getColor(null))
 				if (route.points.isNotEmpty()) {
 					val ts = TrkSegment()
 					tpoints.add(ts)
@@ -491,7 +491,7 @@ class GpxFile : GpxExtensions {
 	fun processPoints(): List<TrkSegment> {
 		val tpoints = mutableListOf<TrkSegment>()
 		for (track in tracks) {
-			val trackColor = track.getColor(getColor(0))
+			val trackColor = track.getColor(getColor(null))
 			for (segment in track.segments) {
 				val segmentColor = segment.getColor(trackColor)
 				if (!segment.generalSegment && segment.points.isNotEmpty()) {

diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml
@@ -5660,4 +5660,6 @@
     <string name="calculating_indication_message">Preračunavanje…</string>
     <string name="rendering_attr_showClimbingRoutes_name">Staze za penjanje</string>
     <string name="rendering_attr_showClimbingRoutes_description">Prikazati staze za penjanje</string>
+    <string name="display_distance_to_first_intermediate_summary">Prvo prikazuje vreme i razdaljinu do sledećeg zaustavljanja. Isključite da biste uvek prikazivali detalje za odredište.</string>
+    <string name="display_distance_to_first_intermediate">Prikaz detalja rute za sledeće zaustavljanje</string>
 </resources>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
@@ -5071,4 +5071,23 @@
 \n
 \n Выберыце «%1$s» для дакладных лічбаў або «%2$s» для больш зручнай чытальнасці.</string>
     <string name="display_distance_to_first_intermediate">Паказаць дэталі маршрута да наступнага прыпынку</string>
+    <string name="display_distance_to_first_intermediate_summary">Спачатку паказаць час і адлегласць да наступнага прыпынку. Выключыць, каб заўсёды паказваць дэталі для пункта прызначэння.</string>
+    <string name="av_audio_sample_rate_descr">Абраць частату дыскрэтызацыі аўдыё.</string>
+    <string name="auto_zoom_3d_angle">Аўтаматычны зум 3D-вугал</string>
+    <string name="default_buttons_size_original_description">Кожная кнопка будзе захоўваць свой памер.</string>
+    <string name="default_buttons_opacity_original_description">Кожная кнопка будзе захоўваць сваю празрыстасць фону.</string>
+    <string name="default_buttons_corners_original_description">Кожная кнопка будзе захоўваць свой радыус закруглення кутоў.</string>
+    <string name="connect_new_scanner">Падключыць новы сканер</string>
+    <string name="preview_next_turn">Папярэдні прагляд наступнага павароту</string>
+    <string name="location_interpolation_percent_desc">Усталюйце працэнт інтэрпаляцыі месцазнаходжання падчас навігацыі па маршруце. Гэты параметр памяншае затрымку вашай пазіцыі на карце падчас анімацыі.</string>
+    <string name="av_audio_sample_rate">Частата дыскрэтызацыі аўдыё</string>
+    <string name="shared_string_engine">Рухавік</string>
+    <string name="vehicle_metrics_recording_description">Абраць параметры для запісу ў файл GPX.</string>
+    <string name="rendering_attr_showClimbingRoutes_name">Маршруты для ўздыму</string>
+    <string name="rendering_attr_showClimbingRoutes_description">Паказаць маршруты для ўздыму</string>
+    <string name="calculating_indication_message">Вылічэнне…</string>
+    <string name="calculate_size">Вылічыць памер</string>
+    <string name="location_interpolation_percent">Працэнт інтэрпаляцыі месцазнаходжання</string>
+    <string name="selected_delayed_profile">Абраны профіль \"%s\"</string>
+    <string name="shared_string_interpolation">Інтэрпаляцыя</string>
 </resources>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
@@ -5665,4 +5665,6 @@
     <string name="calculating_indication_message">Vypočítávám…</string>
     <string name="rendering_attr_showClimbingRoutes_description">Zobrazit lezecké trasy</string>
     <string name="rendering_attr_showClimbingRoutes_name">Lezecké trasy</string>
+    <string name="display_distance_to_first_intermediate">Zobrazit podrobnosti trasy k nejbližší zastávce</string>
+    <string name="display_distance_to_first_intermediate_summary">Zobrazit čas a vzdálenost k nejbližšímu mezicíli. Vypněte, pokud chcete vždy vidět podrobnosti trasy k cíli.</string>
 </resources>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
@@ -1622,7 +1622,7 @@
     <string name="poi_resource_water">Vand</string>
     <string name="poi_resource_zinc">Zink</string>
     <string name="poi_resource_zircon">Zirkon</string>
-    <string name="poi_wetland_wet_meadow">Vådområde</string>
+    <string name="poi_wetland_wet_meadow">Våd eng</string>
     <string name="poi_wetland_bog">Mose</string>
     <string name="poi_wetland_marsh">Marsk</string>
     <string name="poi_wetland_reedbed">Rørskov</string>

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
@@ -5681,4 +5681,6 @@
     <string name="default_buttons_opacity_original_description">Jede Schaltfläche würde ihre eigene Transparenz behalten.</string>
     <string name="rendering_attr_showClimbingRoutes_name">Kletterrouten</string>
     <string name="rendering_attr_showClimbingRoutes_description">Kletterrouten anzeigen</string>
+    <string name="display_distance_to_first_intermediate_summary">Zeigt zuerst die Zeit und Entfernung für den nächsten Halt an. Schalte um, um immer Details zum Ziel anzuzeigen.</string>
+    <string name="display_distance_to_first_intermediate">Zeige Routendetails zum nächsten Halt</string>
 </resources>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
@@ -5668,4 +5668,6 @@
     <string name="rendering_attr_showClimbingRoutes_name">Grimpadaj kursoj</string>
     <string name="rendering_attr_showClimbingRoutes_description">Montri grimpadajn kursojn</string>
     <string name="calculating_indication_message">Kalkulado…</string>
+    <string name="display_distance_to_first_intermediate_summary">Unue montri tempon kaj distancon al la unua intercelo. Malaktivigu por ĉiam montri detalojn pri la fina celo.</string>
+    <string name="display_distance_to_first_intermediate">Montri detalojn pri kurso al la sekva intercelo</string>
 </resources>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
@@ -5538,4 +5538,5 @@
     <string name="rendering_attr_showClimbingRoutes_name">Rutas de escalada</string>
     <string name="rendering_attr_showClimbingRoutes_description">Mostrar rutas de escalada</string>
     <string name="display_distance_to_first_intermediate">Mostrar detalles de la ruta para la siguiente parada</string>
+    <string name="display_distance_to_first_intermediate_summary">Muestra primero el tiempo y la distancia a la siguiente parada. Desactivarla mostrará siempre los detalles del destino.</string>
 </resources>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
@@ -5663,4 +5663,6 @@
     <string name="rendering_attr_showClimbingRoutes_name">Voies d\'escalade</string>
     <string name="rendering_attr_showClimbingRoutes_description">Afficher les voies d\'escalade</string>
     <string name="obd_fuel_consumption_rate_sensor_type">Utiliser les unités sélectionnées dans le nom.</string>
+    <string name="display_distance_to_first_intermediate_summary">Affiche le temps et la distance jusqu\'au prochain arrêt. Désactiver pour toujours afficher les détails concernant la destination.</string>
+    <string name="display_distance_to_first_intermediate">Affiche les détails de l\'itinéraire jusqu\'au prochain arrêt</string>
 </resources>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
@@ -5622,4 +5622,6 @@
     <string name="calculating_indication_message">Számítás…</string>
     <string name="rendering_attr_showClimbingRoutes_description">Hegymászó utak megjeleítése</string>
     <string name="rendering_attr_showClimbingRoutes_name">Hegymászó utak</string>
+    <string name="display_distance_to_first_intermediate_summary">Először a következő megállásig tartó időt és távolságot mutatja. Kapcsolja ki, hogy mindig az úticél részleteit mutassa.</string>
+    <string name="display_distance_to_first_intermediate">A következő megállásig tartó útvonal részleteinek mutatása</string>
 </resources>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
@@ -5639,4 +5639,5 @@
     <string name="connect_new_scanner">Tengja nýjan skynjara</string>
     <string name="shared_string_engine">Vél</string>
     <string name="preview_next_turn">Forskoða næstu beygju</string>
+    <string name="rendering_attr_showClimbingRoutes_name">Klifurleiðir</string>
 </resources>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
@@ -6063,4 +6063,6 @@
     <string name="obd_fuel_consumption_rate">Rata consumului de combustibil</string>
     <string name="obd_fuel_consumption_rate_desc">Afișează rata consumului de combustibil al vehiculului pe baza OBD și a locației</string>
     <string name="obd_fuel_left_liters">Combustibil rămas (litri)</string>
+    <string name="display_distance_to_first_intermediate_summary">Afișează mai întâi ora și distanța pentru următoarea oprire. Dezactivați pentru a afișa întotdeauna detaliile pentru destinație.</string>
+    <string name="display_distance_to_first_intermediate">Afișați detaliile traseului pentru următoarea oprire</string>
 </resources>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
@@ -5685,7 +5685,6 @@
     <string name="default_buttons_opacity_original_description">Každé tlačidlo si zachová vlastnú priehľadnosť pozadia.</string>
     <string name="default_buttons_corners_original_description">Každé tlačidlo si zachová vlastné zaoblenie rohov.</string>
     <string name="rendering_attr_showClimbingRoutes_name">Lezecké trasy</string>
-    <string name="display_distance_to_first_intermediate">Zobraziť čas a vzdialenosť k prvému prechodnému cieľu, ak je nastavený</string>
     <string name="calculating_indication_message">Vypočítavam…</string>
     <string name="calculate_size">Vypočítať veľkosť</string>
     <string name="rendering_attr_showClimbingRoutes_description">Zobraziť lezecké trasy</string>

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
@@ -5678,5 +5678,5 @@
     <string name="calculate_size">Розрахувати розмір</string>
     <string name="rendering_attr_showClimbingRoutes_description">Показати маршрути сходження</string>
     <string name="rendering_attr_showClimbingRoutes_name">Скелелазні маршрути</string>
-    <string name="display_distance_to_first_intermediate">Відображати час і відстань до першого проміжного пункту, якщо він встановлений</string>
+    <string name="display_distance_to_first_intermediate">Показати деталі маршруту для наступної зупинки</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/MapSelectionHelper.java b/OsmAnd/src/net/osmand/plus/views/layers/MapSelectionHelper.java
@@ -21,7 +21,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import net.osmand.IndexConstants;
 import net.osmand.NativeLibrary.RenderedObject;
 import net.osmand.PlatformUtil;
 import net.osmand.RenderingContext;
@@ -80,7 +79,6 @@
 
 import org.apache.commons.logging.Log;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;