Merge branch 'osmandapp:master' into hardy_Afa

sonora · Nov 28, 2024 · 38f6cd1 · 38f6cd1
2 parents 56fe5e0 + 0431835
commit 38f6cd1
Show file tree

Hide file tree

Showing 49 changed files with 792 additions and 501 deletions.
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/TrackFolderLoaderTask.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/TrackFolderLoaderTask.kt
@@ -51,7 +51,7 @@ class TrackFolderLoaderTask(
 		if (!shouldLoadFolder(cachedRootFolder)) return cachedRootFolder!!
 
 		val start = currentTimeMillis()
-		log.info("Start loading tracks in ${folder.getDirName()}")
+		log.info("Start loading tracks in ${folder.getDirName(true)}")
 
 		folder.clearData()
 		loadingTime = currentTimeMillis()

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/ComparableTracksGroup.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/ComparableTracksGroup.kt
@@ -4,6 +4,7 @@ import net.osmand.shared.gpx.filters.TrackFolderAnalysis
 
 interface ComparableTracksGroup {
 	fun getFolderAnalysis(): TrackFolderAnalysis
-	fun getDirName(): String
+	fun getDirName(includingSubdirs: Boolean): String
 	fun lastModified(): Long
+	fun getDefaultOrder(): Int = -1
 }
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/SmartFolder.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/SmartFolder.kt
@@ -10,6 +10,9 @@ import net.osmand.shared.util.KCollectionUtils
 
 @Serializable
 class SmartFolder(@Serializable var folderName: String) : TracksGroup, ComparableTracksGroup {
+	companion object {
+		const val ID_PREFIX = "SMART_FOLDER___"
+	}
 
 	@Transient
 	private var trackItems: List<TrackItem>? = null
@@ -25,6 +28,10 @@ class SmartFolder(@Serializable var folderName: String) : TracksGroup, Comparabl
 	@Transient
 	private var folderAnalysis: TrackFolderAnalysis? = null
 
+	override fun getId(): String {
+		return ID_PREFIX + folderName
+	}
+
 	override fun getName() = folderName
 
 	override fun getTrackItems(): List<TrackItem> {
@@ -52,7 +59,7 @@ class SmartFolder(@Serializable var folderName: String) : TracksGroup, Comparabl
 		return analysis
 	}
 
-	override fun getDirName() = folderName
+	override fun getDirName(includingSubdirs: Boolean) = folderName
 
 	override fun lastModified() = creationTime
 

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/TrackFolder.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/TrackFolder.kt
@@ -5,7 +5,6 @@ import net.osmand.shared.gpx.TrackItem
 import net.osmand.shared.gpx.filters.TrackFolderAnalysis
 import net.osmand.shared.io.KFile
 import net.osmand.shared.util.KAlgorithms
-import net.osmand.shared.util.KCollectionUtils
 import kotlin.math.max
 
 class TrackFolder(dirFile: KFile, parentFolder: TrackFolder?) :
@@ -37,6 +36,8 @@ class TrackFolder(dirFile: KFile, parentFolder: TrackFolder?) :
 		lastModified = folder.lastModified
 	}
 
+	override fun getId() = relativePath
+
 	override fun getName(): String {
 		return GpxHelper.getFolderName(dirFile, false)
 	}
@@ -50,15 +51,21 @@ class TrackFolder(dirFile: KFile, parentFolder: TrackFolder?) :
 	}
 
 	val relativePath: String
-		get() {
-			val dirName = getDirName()
-			val parentFolder = getParentFolder()
-			return if (parentFolder != null && !parentFolder.isRootFolder) parentFolder.relativePath + "/" + dirName else dirName
-		}
+		get() =
+			if (!isRootFolder) {
+				val dirName = dirFile.name()
+				val parent = getParentFolder()
+				if (parent?.isRootFolder == false) parent.relativePath + "/" + dirName else dirName
+			} else {
+				""
+			}
+
 
 	val isRootFolder: Boolean
 		get() = getParentFolder() == null
 
+	fun getRootFolder(): TrackFolder = getParentFolder()?.getRootFolder() ?: this
+
 	fun getParentFolder(): TrackFolder? {
 		return parentFolder
 	}
@@ -144,8 +151,8 @@ class TrackFolder(dirFile: KFile, parentFolder: TrackFolder?) :
 		return analysis
 	}
 
-	override fun getDirName(): String {
-		return dirFile.name()
+	override fun getDirName(includingSubdirs: Boolean): String {
+		return if (includingSubdirs) relativePath else dirFile.name()
 	}
 
 	fun getLastModified(): Long {

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/TracksGroup.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/data/TracksGroup.kt
@@ -3,6 +3,8 @@ package net.osmand.shared.gpx.data
 import net.osmand.shared.gpx.TrackItem
 
 interface TracksGroup {
+	fun getId(): String
+
 	fun getName(): String
 
 	fun getTrackItems(): List<TrackItem>

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFolderAnalysis.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/filters/TrackFolderAnalysis.kt
@@ -52,7 +52,7 @@ class TrackFolderAnalysis(folder: TracksGroup) {
 		timeSpan = timeSpanSum.toInt()
 		tracksCount = items.size
 
-		log.info(">>>> ${folder.getName()} = (tracks: $tracksCount, totalDistance: ${"%.2f".format(totalDistance)}, " +
+		log.info(">>>> ${folder.getId()} = (tracks: $tracksCount, totalDistance: ${"%.2f".format(totalDistance)}, " +
 				"timeSpan: $timeSpan, fileSize: $fileSize, diffElevationUp: ${"%.2f".format(diffElevationUp)}, diffElevationDown: ${"%.2f".format(diffElevationDown)}")
 	}
 }
diff --git a/OsmAnd/res/values-b+sr+Latn/strings.xml b/OsmAnd/res/values-b+sr+Latn/strings.xml
@@ -5556,7 +5556,7 @@
     <string name="obd_fuel_type">Tip goriva</string>
     <string name="obd_plugin_name">Metrika vozila</string>
     <string name="obd_support">OBD podrška</string>
-    <string name="obd_plugin_description">Pratite ključne metrike vozila koristeći OBD-II protokol. Pristup podacima uključujući: * Brzina motora * Potrošnja goriva * Preostalo gorivo * Razdaljina od pokretanja motora * Usisna temperatura * Temperatura okoline * Temperatura rashladne tečnosti * Brzina vozila * Procenat baterije</string>
+    <string name="obd_plugin_description">Pratite ključne metrike vozila koristeći OBD-II protokol. Pristup podacima uključujući:\n • Brzina motora, vreme rada motora, izračunato opterećenje motora \n • Potrošnja goriva, Pritisak goriva, Preostalo gorivo\n • Usisna temperatura, temperatura okoline, temperatura rashladne tečnosti, temperatura motornog ulja\n • Brzina vozila, položaj gasa, napon baterije\n</string>
     <string name="obd_fuel_left_distance_desc">Pokazuje razdaljinu koju vozilo može da pređe sa preostalim gorivom preko OBD senzora</string>
     <string name="obd_vin">VIN</string>
     <string name="unknown_bt_device">Nepoznat uređaj</string>
@@ -5581,7 +5581,7 @@
     <string name="lock_screen_description">Omogućava ili onemogućava funkciju ekrana osetljivog na dodir da spreči slučajne dodire</string>
     <string name="quick_action_showhide_osm_edits_descr">Dugme za prikaz ili skrivanje lokalnih OSM izmena na mapi.</string>
     <string name="rendering_attr_showDirtbikeTrails_name">Prikaži staze terenskih motocikla</string>
-    <string name="liter_per_hour">l/h</string>
+    <string name="liter_per_hour">L/h</string>
     <string name="release_4_9">• Dodan je preglednik galerije preko celog ekrana za slike Vikimedije\n\n • Uveden je novi dodatak „Metrika vozila“ za praćenje performansi vozila koristeći OBD-II protokol\n\n • Dodata mogućnost dodeljivanja aktivnosti stazama i filtriranja u skladu sa tim\n\n • Implementirane nove brze akcije za snimanje putovanja i zaključavanje ekrana na dodir\n\n • Uveden je prilagodljiv izgled dugmeta mape i precizna mreža\n\n • Dodat je kontekstni meni i akcija „Reset prosečne brzine“ u vidžete\n\n • Dodan je novi sloj rute „Staze terenskih motocikla“\n\n • Ispravljeno „Automatsko snimanje staze tokom navigacije“\n\n • Rešen problem sa preokrenutim koordinatama u RTL-u\n\n • Ispravljeni propušteni podaci senzora za trenutno snimljenu stazu\n\n • Dodate informacije o okolnim područjima za izabranu tačku\n\n • Dodata brza akcija za kontrolu vidljivosti OSM izmena\n\n • Odvojeni parametri vidljivosti za opcije kolorizacije terena\n\n • Dodata ikona koja se može dodirnuti za prikaz pristupa ili drugih atributa puta ili putanje</string>
     <string name="screen_is_locked_by_external_button">Ekran je zaključan. Za otključavanje pritisni dugme %1$s ili dodirni dugme na ekranu.</string>
     <string name="screen_is_unlocked">Ekran osetljiv na dodir je otključan.</string>
@@ -5612,19 +5612,20 @@
     <string name="obd_fuel_level_liter">Nivo goriva (l)</string>
     <string name="obd_fuel_left_km">Preostalo goriva za (km)</string>
     <string name="obd_fuel_consumption_rate_scanner">Potrošnja goriva (OBD)</string>
-    <string name="obd_fuel_consumption_rate_liter_hour">Potrošnja goriva l/h</string>
+    <string name="obd_fuel_consumption_rate_liter_hour">Potrošnja goriva L/h</string>
     <string name="obd_fuel_consumption_rate_percent_hour">Potrošnja goriva %/h</string>
-    <string name="obd_fuel_consumption_rate_l_h">Potrošnja goriva (l/h)</string>
-    <string name="obd_fuel_consumption_rate_sensor_desc">Prikazuje potrošnju goriva na temelju senzora (l/h)</string>
-    <string name="obd_fuel_consumption_rate_l_h_desc">Prikazuje potrošnju goriva na temelju proračuna (l/h)</string>
+    <string name="obd_fuel_consumption_rate_l_h">Potrošnja goriva (L/h)</string>
+    <string name="obd_fuel_consumption_rate_sensor_desc">Prikazuje potrošnju goriva na temelju senzora (L/h)</string>
+    <string name="obd_fuel_consumption_rate_l_h_desc">Prikazuje potrošnju goriva na temelju proračuna (L/h)</string>
+    <string name="obd_fuel_left_percent">Preostalo goriva (%)</string>
     <string name="obd_fuel_level_percent">Nivo goriva (%)</string>
     <string name="liter">l</string>
     <string name="speedometer_maximum">Maksimum</string>
     <string name="percent_hour">%/h</string>
     <string name="obd_fuel_consumption_rate_percent_hour_desc">Prikazuje potrošnju goriva vozila na osnovu proračuna (%/h)</string>
-    <string name="l_100km">l/100km</string>
-    <string name="obd_fuel_consumption_rate_l_km">Potrošnja goriva (l/km)</string>
-    <string name="obd_fuel_consumption_rate_l_km_desc">Prikazuje potrošnju goriva vozila na osnovu proračuna (l/km)</string>
+    <string name="l_100km">L/100km</string>
+    <string name="obd_fuel_consumption_rate_l_km">Potrošnja goriva (L/km)</string>
+    <string name="obd_fuel_consumption_rate_l_km_desc">Prikazuje potrošnju goriva vozila na osnovu proračuna (L/km)</string>
     <string name="simulate_obd">Simulira OBD podatke</string>
     <string name="kpa_unit">kPa</string>
     <string name="obd_fuel_pressure">Pritisak goriva</string>

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
@@ -5617,7 +5617,7 @@
     <string name="obd_fuel_level_percent">Brændstofniveau (%)</string>
     <string name="obd_fuel_left_km">Brændstof tilbage (km)</string>
     <string name="obd_fuel_consumption_rate_scanner">Brændstofforbrug (obd)</string>
-    <string name="obd_fuel_consumption_rate_liter_hour">Brændstofforbrug L/t</string>
+    <string name="obd_fuel_consumption_rate_liter_hour">Brændstofforbrug</string>
     <string name="obd_fuel_consumption_rate_percent_hour">Brændstofforbrug %/t</string>
     <string name="speedometer_maximum">Maksimum</string>
     <string name="percent_hour">%/t</string>

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
@@ -6004,7 +6004,7 @@
     <string name="obd_fuel_level_percent">Nivel de combustible (%)</string>
     <string name="obd_fuel_left_km">Combustible restante (km)</string>
     <string name="obd_fuel_consumption_rate_scanner">Tasa de consumo (obd)</string>
-    <string name="obd_fuel_consumption_rate_liter_hour">Consumo de combustible L/h</string>
+    <string name="obd_fuel_consumption_rate_liter_hour">Consumo de combustible</string>
     <string name="obd_fuel_consumption_rate_percent_hour">Consumo de combustible %/h</string>
     <string name="liter">l</string>
     <string name="percent_hour">%/h</string>

diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
@@ -4198,4 +4198,10 @@
     <string name="poi_agrarian_seed">Sementes</string>
     <string name="poi_agrarian_tools">Ferramentas</string>
     <string name="poi_agrarian_machine_parts">Recambios mecánicos</string>
+    <string name="poi_camp_site_type">Tipo de campamento</string>
+    <string name="poi_camp_site_basic">Básico</string>
+    <string name="poi_camp_site_standard">Estándar</string>
+    <string name="poi_camp_site_serviced">Atendido</string>
+    <string name="poi_camp_site_deluxe">De luxo</string>
+    <string name="poi_us_maps_recreation_area_activity_campground_camping">Acampar nun cámping</string>
 </resources>
diff --git a/OsmAnd/res/values-in/strings.xml b/OsmAnd/res/values-in/strings.xml
@@ -5821,7 +5821,7 @@
     <string name="obd_fuel_type_bifuel_ethanol">Bahan Bakar Ganda menggunakan Etanol</string>
     <string name="quick_action_showhide_osm_edits_descr">Tombol untuk menampilkan atau menyembunyikan penyuntingan OSM lokal pada peta.</string>
     <string name="change_activity">Ubah aktivitas</string>
-    <string name="liter_per_hour">l/j</string>
+    <string name="liter_per_hour">L/j</string>
     <string name="quick_action_verb_start_pause">Mulai / Jeda</string>
     <string name="help_article_personal_color_palette_schemes_name">Skema Warna</string>
     <string name="unknown_bt_device">Perangkat tidak diketahui</string>
@@ -5923,7 +5923,7 @@
     <string name="obd_plugin_name">Metrik kendaraan</string>
     <string name="obd_fuel_consumption_rate">Tingkat konsumsi bahan bakar</string>
     <string name="obd_fuel_type_desc">Menampilkan jenis bahan bakar kendaraan melalui sensor OBD</string>
-    <string name="obd_plugin_description">Pantau metrik kendaraan utama menggunakan protokol OBD-II. Akses data termasuk: * Kecepatan mesin * Konsumsi bahan bakar * Bahan bakar tersisa * Jarak sejak penilaian mesin * Suhu masukan * Suhu sekitar * Suhu pendingin * Kecepatan kendaraan * Persentase baterai</string>
+    <string name="obd_plugin_description">Pantau metrik kendaraan utama menggunakan protokol OBD-II. Akses data termasuk:\n• Kecepatan mesin, Waktu Operasi Mesin, Beban Mesin yang Dihitung\n• Konsumsi bahan bakar, Tekanan bahan bakar, Bahan bakar yang tersisa\n• Suhu masuk, Suhu sekitar, Suhu cairan pendingin, Suhu oli mesin\n• Kecepatan kendaraan, Posisi katup gas, Tegangan baterai\n</string>
     <string name="quick_action_previous_screen_desc">Saklar untuk navigasi ke layar sebelumnya.</string>
     <string name="quick_action_drawer_desc">Saklar untuk menampilkan atau menyembunyikan menu samping.</string>
     <string name="quick_action_drawer_title">Menu samping</string>
@@ -5966,35 +5966,35 @@
     <string name="obd_nothing_found_description">Mohon periksa berikut:\n – Pastikan Bluetooth nyala\n – Mesin kendaraan berjalan\n – Pastikan perangkat Anda dalam jarak pemindai.</string>
     <string name="obd_searching_text_description">Mohon dekatkan perangkat Anda pada pemindai. Pastikan mesin kendaraan sedang berjalan.</string>
     <string name="obd_fuel_consumption_rate_sensor">Tingkat konsumsi bahan bakar (sensor)</string>
-    <string name="obd_fuel_consumption_rate_l_h_desc">Menampilkan tingkat konsumsi bahan bakar kendaraan berdasarkan perhitungan (l/j)</string>
-    <string name="obd_fuel_consumption_rate_sensor_desc">Menampilkan tingkat konsumsi bahan bakar kendaraan berdasarkan sensor (l/j)</string>
+    <string name="obd_fuel_consumption_rate_l_h_desc">Menampilkan tingkat konsumsi bahan bakar kendaraan berdasarkan perhitungan (L/j)</string>
+    <string name="obd_fuel_consumption_rate_sensor_desc">Menampilkan tingkat konsumsi bahan bakar kendaraan berdasarkan sensor (L/j)</string>
     <string name="obd_fuel_level_liter">Tingkat bahan bakar (l)</string>
     <string name="obd_fuel_level_percent">Tingkat bahan bakar (%)</string>
     <string name="obd_fuel_left_km">Bahan bakar tersisa (km)</string>
     <string name="obd_fuel_consumption_rate_scanner">Tingkat konsumsi bahan bakar (obd)</string>
-    <string name="obd_fuel_consumption_rate_liter_hour">Tingkat konsumsi bahan bakar l/j</string>
+    <string name="obd_fuel_consumption_rate_liter_hour">Tingkat konsumsi bahan bakar L/j</string>
     <string name="obd_fuel_consumption_rate_percent_hour">Tingkat konsumsi bahan bakar %/j</string>
     <string name="route_guidance_desc">Menyediakan panduan rute waktu nyata, termasuk jarak belokan berikutnya, nama jalan, nama jalan saat ini, dan informasi jalur. Widget aktif selama navigasi.</string>
     <string name="obd_nothing_found_text">Tidak ada pemindai yang ditemukan</string>
     <string name="obd_bluetooth_off_description">Nyalakan Bluetooth untuk mencari dan menghubungkan pemindai.</string>
     <string name="obd_searching_text">Mencari pemindai</string>
     <string name="obd_device_forget_sensor">Lupakan pemindai</string>
     <string name="obd_device_forget_sensor_description">Pemindai akan dihapus dari daftar. Anda akan dapat menyandingkan pemindai ini lagi kapan pun.</string>
-    <string name="obd_fuel_consumption_rate_l_h">Tingkat konsumsi bahan bakar (l/j)</string>
+    <string name="obd_fuel_consumption_rate_l_h">Tingkat konsumsi bahan bakar (L/j)</string>
     <string name="connect_obd_instructions_step">1. Hubungkan pemindai ke porta OBD-II kendaraan Anda.\n\n 2. Nyalakan mesin kendaraan Anda\n\n 3. Aktifkan Bluetooth di perangkat Anda\n\n 4. Ketuk \'%1$s\' dan pilih pemindai Anda dari daftar.</string>
     <string name="speedometer_maximum">Maksimum</string>
     <string name="liter">l</string>
     <string name="percent_hour">%/j</string>
     <string name="dynamic_icon_type_summary">Ikon berubah berdasarkan keadaan tindakan.</string>
     <string name="bt_start_pair_failed">Tidak dapat memulai penyandingan dengan perangkat</string>
     <string name="obd_fuel_consumption_rate_percent_hour_desc">Menampilkan tingkat konsumsi bahan bakar kendaraan berdasarka perhitungan (%/j)</string>
-    <string name="l_100km">l/100km</string>
-    <string name="obd_fuel_consumption_rate_l_km">Tingkat konsumsi bahan bakar (l/km)</string>
+    <string name="l_100km">L/100km</string>
+    <string name="obd_fuel_consumption_rate_l_km">Tingkat konsumsi bahan bakar (L/km)</string>
     <string name="obd_not_connected_to_device">Terputus dari %s</string>
     <string name="obd_connected_to_device">Terhubung ke %s</string>
     <string name="shared_string_dynamic">Dinamis</string>
     <string name="obd_connecting_to_device">Menghubungkan ke %s</string>
-    <string name="obd_fuel_consumption_rate_l_km_desc">Menampilkan tingkat konsumsi bahan bakar kendaraan berdasarkan perhitungan (l/km)</string>
+    <string name="obd_fuel_consumption_rate_l_km_desc">Menampilkan tingkat konsumsi bahan bakar kendaraan berdasarkan perhitungan (L/km)</string>
     <string name="simulate_obd">Simulasikan data obd</string>
     <string name="kpa_unit">kPa</string>
     <string name="obd_fuel_pressure">Tekanan bahan bakar</string>