Merge pull request #10938 from osmandapp/master

update test branch

OsmAnd-java/src/main/java/net/osmand/map/WorldRegion.java

@@ -76,12 +76,12 @@ public class WorldRegion implements Serializable {
 		}
 	}
 
-	
+
-	
+
 	public boolean isRegionMapDownload() {
 		return regionMapDownload;
 	}
-	
+
 	public String getLocaleName() {
 		if(!Algorithms.isEmpty(regionNameLocale)) {
 			return regionNameLocale;
@@ -92,14 +92,14 @@ public class WorldRegion implements Serializable {
 		if(!Algorithms.isEmpty(regionName)) {
 			return regionName;
 		}
-		
+
 		return capitalize(regionFullName.replace('_', ' '));
 	}
-	
+
 	public String getRegionDownloadName() {
 		return regionDownloadName;
 	}
-	
+
 	public String getRegionDownloadNameLC() {
 		return regionDownloadName == null ? null : regionDownloadName.toLowerCase();
 	}
@@ -111,7 +111,7 @@ public class WorldRegion implements Serializable {
 	public LatLon getRegionCenter() {
 		return regionCenter;
 	}
-	
+
 	public String getRegionSearchText() {
 		return regionSearchText;
 	}
@@ -145,7 +145,7 @@ public class WorldRegion implements Serializable {
 		this.regionDownloadName = downloadName;
 		superregion = null;
 		subregions = new LinkedList<WorldRegion>();
-		
+
 	}
 	public WorldRegion(String id) {
 		this(id, null);
@@ -154,7 +154,7 @@ public class WorldRegion implements Serializable {
 	public String getRegionId() {
 		return regionFullName;
 	}
-	
+
 	private String capitalize(String s) {
 		String[] words = s.split(" ");
 		if (words[0].length() > 0) {
@@ -191,4 +191,13 @@ public class WorldRegion implements Serializable {
 		}
 		return false;
 	}
+
+	public boolean isContinent() {
+		if (superregion != null) {
+			String superRegionId = superregion.getRegionId();
+			String thisRegionId = getRegionId();
+			return WORLD.equals(superRegionId) && !RUSSIA_REGION_ID.equals(thisRegionId);
+		}
+		return false;
+	}
 }

OsmAnd/res/values-ar/strings.xml

@@ -2309,7 +2309,7 @@
     <string name="relief_smoothness_factor_descr">التضاريس المفضلة : مسطحة أو تلال.</string>
     <string name="shared_string_slope">الانحدار</string>
     <string name="shared_string_move">نقل</string>
-    <string name="routing_attr_height_obstacles_description">استخدام بيانات ارتفاع التضاريس المقدمة بواسطة SRTM, ASTER, EU-DEM.</string>
+
     <string name="rendering_attr_depthContours_description">إظهار نقاط ومعالم العمق.</string>
     <string name="auto_split_recording_descr">بدء مقطع جديدة بعد فارق 6 دقائق، مسار جديد بعد فارق 2 ساعة، أو ملف جديد بعد فارق أطول إذا تغير التاريخ.</string>
     <string name="shared_string_paused">متوقف مؤقتاً</string>

OsmAnd/res/values-az/strings.xml

@@ -779,7 +779,7 @@
     <string name="altitude_descent">Eniş</string>
     <string name="altitude_ascent">Yoxuş</string>
     <string name="routing_attr_height_obstacles_name">Yüksəklik məlumatlarını istifadə et</string>
-    <string name="routing_attr_height_obstacles_description">SRTM, ASTER və EU-DEM tərəfindən təmin edilən ərazi yüksəklik məlumatlarını istifadə et.</string>
+
     <string name="rendering_attr_depthContours_description">Dərinlik konturlarını və nöqtələrini göstər.</string>
     <string name="rendering_attr_depthContours_name">Dəniz dərinliyi konturları</string>
     <string name="rendering_attr_contourDensity_description">Kontur xəttinin sıxlığı</string>

OsmAnd/res/values-b+ast/strings.xml

@@ -519,7 +519,7 @@
     <string name="shared_string_time">Tiempu</string>
     <string name="total_distance">Distancia total</string>
     <string name="routing_attr_height_obstacles_name">Usar datos d\'elevación</string>
-    <string name="routing_attr_height_obstacles_description">Inclúi la elevación del tarrén (pelos datos de SRTM, ASTER y EU-DEM).</string>
+
     <string name="search_another_country">Esbillar otra rexón</string>
     <string name="shared_string_change">Camudar</string>
     <string name="mapillary_image">Imaxe de Mapillary</string>

OsmAnd/res/values-b+be+Latn/strings.xml

@@ -2189,7 +2189,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="mapillary_image">Vyjava Mapillary</string>
     <string name="mapillary_widget_descr">Dazvaliaje chutki ŭniosak ŭ Mapillary.</string>
     <string name="relief_smoothness_factor_descr">Pieravažny reĺjef: raŭninny ci harysty.</string>
-    <string name="routing_attr_height_obstacles_description">Faktar vyšyni ziamnoj pavierchni (danyja z SRTM, ASTER i EU-DEM).</string>
+
     <string name="rendering_attr_depthContours_description">Pakazvać kontury i punkty hlybini.</string>
     <string name="rendering_attr_contourDensity_description">Ščyĺnasć haryzantaliaŭ</string>
     <string name="rendering_attr_contourWidth_description">Taŭščynia haryzantaliaŭ (izahipsy)</string>

OsmAnd/res/values-be/strings.xml

@@ -2194,7 +2194,7 @@
     <string name="shared_string_time">Час</string>
     <string name="total_distance">Агульная даўжыня</string>
     <string name="routing_attr_height_obstacles_name">Выкарыстоўваць даныя вышыні</string>
-    <string name="routing_attr_height_obstacles_description">Фактар вышыні зямной паверхні (даныя з SRTM, ASTER і EU-DEM).</string>
+
     <string name="auto_split_recording_title">Аўтаматычнае дзяленне запісаў пасля перапынку</string>
     <string name="auto_split_recording_descr">Пачаць новы сегмент пасля 6-хвіліннага перапынку, новы след — пасля 2-гадзіннага перапынку, ці новы файл пасля доўгага перапынку (як змяніляся дата).</string>
     <string name="lang_ber">Берберская</string>

OsmAnd/res/values-ca/strings.xml

@@ -2162,7 +2162,7 @@
     <string name="rendering_attr_depthContours_description">Mostra isòbates i fondàries puntuals.</string>
     <string name="rendering_attr_depthContours_name">Isòbates</string>
     <string name="routing_attr_height_obstacles_name">Utilitza les cotes d\'elevació</string>
-    <string name="routing_attr_height_obstacles_description">Revisa l\'elevació del terreny (mitjançant dades SRTM, ASTER i EU-DEM).</string>
+
     <string name="route_altitude">Alçat de la ruta</string>
     <string name="altitude_descent">Descens</string>
     <string name="altitude_ascent">Ascens</string>

OsmAnd/res/values-cs/strings.xml

@@ -2174,7 +2174,7 @@
     <string name="shared_string_time">Čas</string>
     <string name="total_distance">Celková vzdálenost</string>
     <string name="routing_attr_height_obstacles_name">Použít údaje o nadmořské výšce</string>
-    <string name="routing_attr_height_obstacles_description">Zohlednit převýšení terénu (data od SRTM, ASTER a EU-DEM).</string>
+
     <string name="routing_attr_driving_style_name">Styl jízdy</string>
     <string name="select_gpx_folder">Vyberte složku pro soubor GPX</string>
     <string name="file_can_not_be_moved">Soubor se nepodařilo přesunout.</string>

OsmAnd/res/values-da/strings.xml

@@ -2172,7 +2172,7 @@
     <string name="rendering_attr_depthContours_description">Vis dybdekonturer og -punkter.</string>
     <string name="rendering_attr_depthContours_name">Havdybdekonturer</string>
     <string name="routing_attr_height_obstacles_name">Brug højdedata</string>
-    <string name="routing_attr_height_obstacles_description">Terrænhøjde-faktor (via SRTM, ASTER og EU-DEM data).</string>
+
     <string name="route_altitude">Rutehøjde</string>
     <string name="altitude_descent">Fald</string>
     <string name="altitude_ascent">Stigning</string>

OsmAnd/res/values-de/strings.xml

@@ -2171,7 +2171,7 @@
     <string name="navigate_point_olc">Offener Standortcode (OLC)</string>
     <string name="quick_action_page_list_descr">Eine Schaltfläche, um durch die Liste unten zu blättern.</string>
     <string name="routing_attr_height_obstacles_name">Höhendaten berücksichtigen</string>
-    <string name="routing_attr_height_obstacles_description">Faktor im Geländeprofil (über SRTM, ASTER und EU-DEM-Daten).</string>
+
     <string name="rendering_attr_depthContours_name">Nautische Tiefenlinien</string>
     <string name="rendering_attr_depthContours_description">Tiefenlinien und -punkte einblenden.</string>
     <string name="route_altitude">Routenhöhenprofil</string>

OsmAnd/res/values-el/strings.xml

@@ -1876,7 +1876,7 @@
     <string name="total_distance">Συνολική απόσταση</string>
     <string name="routing_attr_relief_smoothness_factor_name">Επιλέξτε διακύμανση ανύψωσης</string>
     <string name="routing_attr_height_obstacles_name">Χρήση υψομετρικών δεδομένων</string>
-    <string name="routing_attr_height_obstacles_description">Συντελεστής σε ανύψωση εδάφους (μέσω SRTM, ASTER και δεδομένων EU-DEM).</string>
+
     <string name="rendering_attr_depthContours_description">Εμφάνιση ισοβαθών καμπυλών και σημείων.</string>
     <string name="rendering_attr_depthContours_name">Ναυτικές ισοβαθείς καμπύλες</string>
     <string name="auto_split_recording_title">Αυτόματος διαχωρισμός καταγραφών μετά από κενό</string>

OsmAnd/res/values-eo/strings.xml

@@ -2166,7 +2166,7 @@
     <string name="rendering_attr_depthContours_description">Montri punktojn kaj kurbojn de profundo.</string>
     <string name="rendering_attr_depthContours_name">Maraj profundec-kurboj</string>
     <string name="routing_attr_height_obstacles_name">Uzi datumojn pri altitudo</string>
-    <string name="routing_attr_height_obstacles_description">Konsideri nivelon de tereno (laŭ datumoj el SRTM, ASTER kaj EU-DEM).</string>
+
     <string name="route_altitude">Kursa altitudo</string>
     <string name="altitude_descent">Malsupreniro</string>
     <string name="altitude_ascent">Supreniro</string>

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

@@ -2175,7 +2175,7 @@
     <string name="shared_string_time">Tiempo</string>
     <string name="total_distance">Distancia total</string>
     <string name="routing_attr_height_obstacles_name">Usar datos de elevación</string>
-    <string name="routing_attr_height_obstacles_description">Incluye como factor, la elevación del terreno (según datos de SRTM, ASTER y EU-DEM).</string>
+
     <string name="routing_attr_driving_style_name">Estilo de conducción</string>
     <string name="select_gpx_folder">Marcar la carpeta del archivo GPX</string>
     <string name="file_can_not_be_moved">No se pudo mover el archivo.</string>

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

@@ -2175,7 +2175,7 @@
     <string name="shared_string_time">Tiempo</string>
     <string name="total_distance">Distancia total</string>
     <string name="routing_attr_height_obstacles_name">Usar datos de elevación</string>
-    <string name="routing_attr_height_obstacles_description">Incluye como factor, la elevación del terreno (según datos de SRTM, ASTER y EU-DEM).</string>
+
     <string name="routing_attr_driving_style_name">Estilo de conducción</string>
     <string name="select_gpx_folder">Marcar la carpeta del archivo GPX</string>
     <string name="file_can_not_be_moved">No se pudo mover el archivo.</string>

OsmAnd/res/values-es/strings.xml

@@ -2163,7 +2163,7 @@
     <string name="shared_string_time">Tiempo</string>
     <string name="total_distance">Distancia total</string>
     <string name="routing_attr_height_obstacles_name">Usar datos de elevación</string>
-    <string name="routing_attr_height_obstacles_description">Incluye como factor, la elevación del terreno (según datos de SRTM, ASTER y EU-DEM).</string>
+
     <string name="rendering_attr_depthContours_description">Mostrar curvas y puntos de profundidad.</string>
     <string name="rendering_attr_depthContours_name">Curvas de profundidad náuticas</string>
     <string name="auto_split_recording_title">División automática de grabaciones en intervalos</string>

OsmAnd/res/values-et/strings.xml

@@ -2504,7 +2504,7 @@
     <string name="rendering_attr_depthContours_description">Kuva sügavuskontuurid ja -punktid.</string>
     <string name="rendering_attr_depthContours_name">Meresügavuse kontuurid</string>
     <string name="routing_attr_height_obstacles_name">Kasuta kõrgusandmeid</string>
-    <string name="routing_attr_height_obstacles_description">Maastiku kõrguse tegur (SRTM, ASTER ja EU-DEM andmestikust).</string>
+
     <string name="altitude_descent">Laskumine</string>
     <string name="altitude_ascent">Tõus</string>
     <string name="altitude_range">Kõrgusevahe</string>

OsmAnd/res/values-eu/strings.xml

@@ -2197,7 +2197,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="shared_string_time">Denbora</string>
     <string name="total_distance">Distantzia guztira</string>
     <string name="routing_attr_height_obstacles_name">Erabili elebazio kotak</string>
-    <string name="routing_attr_height_obstacles_description">Kontuan izan terrenoaren elebazioa (SRTM, ASTER, eta EU-DEM datuen bidez).</string>
+
     <string name="shared_string_slope">Malda</string>
     <string name="lang_ber">Berberera</string>
     <string name="right_side_navigation">Eskumatik gidatzea</string>

OsmAnd/res/values-fa/strings.xml

@@ -1811,7 +1811,7 @@
     <string name="average_altitude">میانگین ارتفاع</string>
     <string name="total_distance">مسافت کل</string>
     <string name="routing_attr_height_obstacles_name">استفاده از دادهٔ ارتفاعی</string>
-    <string name="routing_attr_height_obstacles_description">فاکتور ارتفاع‌دهی عارضه‌ها (با استفاده از داده‌های SRTM،‏ ASTER و EU-DEM).</string>
+
     <string name="rendering_attr_depthContours_description">نمایش نقاط و منحنی‌های میزان عمقی.</string>
     <string name="rendering_attr_depthContours_name">منحنی‌های میزان عمق دریا</string>
     <string name="rendering_attr_contourDensity_description">تراکم منحنی میزان</string>

OsmAnd/res/values-fi/strings.xml

@@ -1898,7 +1898,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="shared_string_time">Aika</string>
     <string name="total_distance">Kokonaisetäisyys</string>
     <string name="routing_attr_height_obstacles_name">Käytä korkeustietoja</string>
-    <string name="routing_attr_height_obstacles_description">Käytä maaston korkeustietoja jotka saadaan SRTM, ASTER ja EU-DEM lähteistä</string>
+
     <string name="auto_split_recording_title">Jaa automaattisesti nauhoitukset tauon jälkeen</string>
     <string name="rendering_attr_hideWaterPolygons_name">Piilota vesi</string>
     <string name="shared_string_action_name">Toiminnon nimi</string>

OsmAnd/res/values-fr/strings.xml

@@ -2158,7 +2158,7 @@
     <string name="rendering_attr_depthContours_description">Afficher les lignes et points de sonde.</string>
     <string name="rendering_attr_depthContours_name">Lignes de sonde maritimes</string>
     <string name="routing_attr_height_obstacles_name">Utiliser les données d\'altitude</string>
-    <string name="routing_attr_height_obstacles_description">Facteur pour les données d\'altitude fournies par SRTM, ASTER et EU-DEM.</string>
+
     <string name="average_altitude">Altitude moyenne</string>
     <string name="total_distance">Distance totale</string>
     <string name="shared_string_time">Durée</string>

OsmAnd/res/values-gl/strings.xml

@@ -2572,7 +2572,7 @@ Lon %2$s</string>
     <string name="do_not_send_anonymous_app_usage_desc">O OsmAnd recompila información sobre as lapelas que abres na aplicación. Non estamos a recompilar datos da localización, datos inseridos na aplicación ou datos relacionados coas áreas que ollas, procuras ou baixas.</string>
     <string name="do_not_show_startup_messages_desc">Agocha os descontos da aplicación e as mensaxes especiais dos acontecementos locais.</string>
     <string name="routing_attr_relief_smoothness_factor_name">Escoller variación da altitude</string>
-    <string name="routing_attr_height_obstacles_description">Inclúe coma factor, a altitude do terreo (segundo datos do SRTM, ASTER e EU-DEM).</string>
+
     <string name="rendering_attr_depthContours_description">Amosar curvas e puntos do afundimento.</string>
     <string name="rendering_attr_depthContours_name">Curvas do afundimento náuticos</string>
     <string name="auto_split_recording_title">División automática das gravacións en intres</string>

OsmAnd/res/values-hu/strings.xml

@@ -2168,7 +2168,7 @@
     <string name="shared_string_time">Idő</string>
     <string name="total_distance">Teljes táv</string>
     <string name="routing_attr_height_obstacles_name">Magasságadatok használata</string>
-    <string name="routing_attr_height_obstacles_description">Terepmagasság figyelembe vétele (SRTM, ASTER és EU-DEM domborzatmodellekből).</string>
+
     <string name="rendering_attr_depthContours_description">Mélységvonalak és pontok megjelenítése.</string>
     <string name="rendering_attr_depthContours_name">Tengeri mélységvonalak</string>
     <string name="auto_split_recording_title">Felvételek automatikus szétvágása szünet után</string>

OsmAnd/res/values-hy/strings.xml

@@ -341,7 +341,7 @@
     <string name="total_distance">Ընդհանուր հեռավորությունը</string>
     <string name="routing_attr_relief_smoothness_factor_name">Ընտրել բարձունքների տատանումը</string>
     <string name="routing_attr_height_obstacles_name">Օգտագործել բարձրության տվյալները</string>
-    <string name="routing_attr_height_obstacles_description">Օգտագործել բարձրության տվյալներ տրամադրված SRTM, ASTER և EU-DEM։</string>
+
     <string name="rendering_attr_depthContours_description">Ցույց տալ խորության տվյալները։</string>
     <string name="rendering_attr_depthContours_name">Ծովային խորքային ուրվագծեր</string>
     <string name="rendering_attr_contourDensity_description">Եզրագծերի խտությունը</string>

OsmAnd/res/values-id/strings.xml

@@ -333,7 +333,7 @@
     <string name="total_distance">Jarak Total</string>
     <string name="routing_attr_relief_smoothness_factor_name">Pilih fluktuasi ketinggian</string>
     <string name="routing_attr_height_obstacles_name">Gunakan Data Ketinggian</string>
-    <string name="routing_attr_height_obstacles_description">Gunakan data elevasi medan yang disediakan oleh SRTM, ASTER, dan EU-DEM.</string>
+
     <string name="rendering_attr_depthContours_description">Tampilkan kontur dan titik kedalaman.</string>
     <string name="rendering_attr_depthContours_name">Kontur kedalaman bahari</string>
     <string name="auto_split_recording_title">Rekaman split otomatis setelah jeda</string>

OsmAnd/res/values-is/strings.xml

@@ -1994,7 +1994,7 @@
     <string name="fonts_header">Letur fyrir kort</string>
     <string name="right_side_navigation">Ekið á hægri akrein</string>
     <string name="driving_region_automatic">Sjálfvirkt</string>
-    <string name="routing_attr_height_obstacles_description">Nota yfirborðshæðargögn (í gegnum SRTM, ASTER og EU-DEM).</string>
+
     <string name="auto_split_recording_title">Skipta skráningu sjálfvirkt eftir bil</string>
     <string name="incremental_search_city">Stigvaxandi leit í borg</string>
     <string name="rendering_attr_showRoadMaps_description">Veldu þegar birta á kort einungis með vegum:</string>

OsmAnd/res/values-it/strings.xml

@@ -2167,7 +2167,7 @@
     <string name="shared_string_time">Tempo</string>
     <string name="total_distance">Distanza totale</string>
     <string name="routing_attr_height_obstacles_name">Utilizza dati altitudine</string>
-    <string name="routing_attr_height_obstacles_description">Fattore di elevazione del terreno (tramite i dati SRTM, ASTER e EU-DEM).</string>
+
     <string name="shared_string_time_span">Intervallo di tempo</string>
     <string name="shared_string_max">Massimo</string>
     <string name="shared_string_start_time">Ora d\'inizio</string>

OsmAnd/res/values-iw/strings.xml

@@ -2712,7 +2712,7 @@
 \n ניתן לקבל נווט אמין למדינה שלך - בין אם זו ישראל, צרפת, גרמניה, מקסיקו, אנגליה, ספרד, הולנד, ארה״ב, רוסיה, ברזיל או כל מדינה אחרת.</string>
     <string name="nm">מייל ימי</string>
     <string name="rendering_attr_hikingRoutesOSMC_description">עיבוד מסלולים לפי עקבות OSMC.</string>
-    <string name="routing_attr_height_obstacles_description">מקדם נתוני גובה פני קרקע (נתונים של SRTM,‏ ASTER ו־EU-DEM).</string>
+
     <string name="plugin_nautical_descr">תוסף זה מעשיר את המפה ואת הניווט של יישומון OsmAnd ומאפשר לייצר מפות ימיות לחתירה, הפלגה וסוגים נוספים של ספורט ימי. 
 \n
 \nתוסף מפה מיוחד ל־OsmAnd יספק את כל סימוני הניווט הימיים והסימנים הימיים המוסכמים, לניווט במקווי מים פנימיים לרבות ניווט באזורים הקרובים לחוף. התיאור של כל סימון ניווט מספק את הפרטים הנדרשים כדי לזהות אותם ואת המשמעות שלהם (קטגוריה, צורה, צבע, רצף, הפניה וכו׳). 

OsmAnd/res/values-ja/strings.xml

@@ -2084,7 +2084,7 @@ POIの更新は利用できません</string>
     <string name="shared_string_time">時間</string>
     <string name="total_distance">総走行距離</string>
     <string name="routing_attr_height_obstacles_name">標高データを使用</string>
-    <string name="routing_attr_height_obstacles_description">SRTM、ASTER、EU-DEMによる地形標高データを使用します。</string>
+
     <string name="rendering_attr_hideWaterPolygons_description">水域</string>
     <string name="rendering_attr_hideWaterPolygons_name">水域ポリゴン</string>
     <string name="wiki_around">近隣のWikipedia記事</string>

OsmAnd/res/values-lt/strings.xml

@@ -2231,7 +2231,7 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="total_distance">Bendras atstumas</string>
     <string name="routing_attr_relief_smoothness_factor_name">Pasirinkite aukščio kaitos diapazoną</string>
     <string name="routing_attr_height_obstacles_name">Naudoti aukščio informaciją</string>
-    <string name="routing_attr_height_obstacles_description">Vietovės reljefo faktorius (SRTM, ASTER ir EU-DEM duomenimis).</string>
+
     <string name="rendering_attr_depthContours_description">Rodyti gylio kontūrus ir taškus.</string>
     <string name="rendering_attr_depthContours_name">Vandenyno gylio kontūrai</string>
     <string name="auto_split_recording_title">Automatinis įrašo padalinimas po pertraukimo</string>

OsmAnd/res/values-lv/strings.xml

@@ -2166,7 +2166,7 @@ Apraksta laukumu: %1$s x %2$s</string>
     <string name="shared_string_time">Laiks</string>
     <string name="total_distance">Maršruta garums</string>
     <string name="routing_attr_height_obstacles_name">Lietot elevācijas datus</string>
-    <string name="routing_attr_height_obstacles_description">Lietot apgabala elevācijas datus no SRTM, ASTER un EU-DEM.</string>
+
     <string name="relief_smoothness_factor_descr">Ieteicamais reljefs: līdzens vai kalnains.</string>
     <string name="shared_string_slope">Slīpums</string>
     <string name="lang_ber">Berberu</string>

OsmAnd/res/values-nb/strings.xml

@@ -2015,7 +2015,7 @@
     <string name="add_new_folder">Legg til ny mappe</string>
     <string name="shared_string_gpx_track">Spor</string>
     <string name="routing_attr_height_obstacles_name">Bruk høydedata</string>
-    <string name="routing_attr_height_obstacles_description">Ta hensyn til terrenghøyde (data fra SRTM, ASTER og EU-DEM).</string>
+
     <string name="quick_action_bug_message">Melding</string>
     <string name="shared_string_permissions">Tillatelser</string>
     <string name="import_gpx_failed_descr">Kunne ikke importere filen. Kontroller at OsmAnd har tillatelse til å lese den.</string>

OsmAnd/res/values-nl/strings.xml

@@ -2177,7 +2177,7 @@
     <string name="shared_string_time_moving">Tijd in beweging</string>
     <string name="routing_attr_driving_style_name">Rijstijl</string>
     <string name="routing_attr_height_obstacles_name">Hoogtegegevens gebruiken</string>
-    <string name="routing_attr_height_obstacles_description">Gebruik hoogtegegevens (van SRTM, ASTER en EU-DEM data) bij bepalen route.</string>
+
     <string name="shared_string_gpx_track">Track</string>
     <string name="right_side_navigation">Rechts rijdend</string>
     <string name="driving_region_automatic">Automatisch</string>

OsmAnd/res/values-pl/strings.xml

@@ -2169,7 +2169,7 @@
     <string name="rendering_attr_depthContours_description">Wyświetla kontury i punkty głębi.</string>
     <string name="rendering_attr_depthContours_name">Morskie kontury głębokości</string>
     <string name="routing_attr_height_obstacles_name">Używanie danych wysokościowych</string>
-    <string name="routing_attr_height_obstacles_description">Używa danych wysokościowych (dane z SRTM, ASTER i EU-DEM).</string>
+
     <string name="route_altitude">Wysokość trasy</string>
     <string name="altitude_descent">W dół</string>
     <string name="altitude_ascent">W górę</string>

OsmAnd/res/values-pt-rBR/strings.xml

@@ -2207,7 +2207,7 @@
     <string name="route_altitude">Altitude da rota</string>
     <string name="routing_attr_relief_smoothness_factor_name">Selecionar a flutuação de altimetria</string>
     <string name="routing_attr_height_obstacles_name">Usar dados altimétricos</string>
-    <string name="routing_attr_height_obstacles_description">Considerar altimetria do terreno (via dados SRTM, ASTER e EU-DEM).</string>
+
     <string name="rendering_attr_depthContours_description">Mostrar curvas e pontos batimétricos.</string>
     <string name="rendering_attr_depthContours_name">Batimetria náutica</string>
     <string name="rendering_attr_contourDensity_description">Densidade das curvas de nível</string>

OsmAnd/res/values-pt/strings.xml

@@ -2011,7 +2011,7 @@
     <string name="total_distance">Distância total</string>
     <string name="routing_attr_relief_smoothness_factor_name">Selecionar flutuação de elevação</string>
     <string name="routing_attr_height_obstacles_name">Utilizar dados de elevação</string>
-    <string name="routing_attr_height_obstacles_description">Utilizar elevação de terreno (dos dados do SRTM, ASTER e EU-DEM).</string>
+
     <string name="rendering_attr_depthContours_description">Mostrar pontos e contornos de profundidade.</string>
     <string name="rendering_attr_depthContours_name">Contornos de profundidade náuticos</string>
     <string name="show_transparency_seekbar">Mostra a transparência da barra de navegação</string>

OsmAnd/res/values-ru/strings.xml

@@ -142,7 +142,7 @@
     <string name="routing_attr_driving_style_name">Стиль езды</string>
     <string name="routing_attr_relief_smoothness_factor_name">Колебания высоты ландшафта</string>
     <string name="routing_attr_height_obstacles_name">Использовать данные о высотах</string>
-    <string name="routing_attr_height_obstacles_description">Фактор рельефа местности (по данным SRTM, ASTER и EU-DEM).</string>
+
     <string name="quick_action_duplicates">Действие переименовано в %1$s, чтобы избежать дублирования.</string>
     <string name="quick_action_duplicate">Обнаружен дубликат имени</string>
     <string name="quick_action_showhide_favorites_descr">Переключатель, чтобы показать или скрыть избранные точки на карте.</string>

OsmAnd/res/values-sc/strings.xml

@@ -2167,7 +2167,7 @@
     <string name="rendering_attr_depthContours_name">Curvas de profondidade nàuticas</string>
     <string name="rendering_attr_depthContours_description">Ammustra sas lìnias de profondidade.</string>
     <string name="routing_attr_height_obstacles_name">Imprea sos datos de s\'artària</string>
-    <string name="routing_attr_height_obstacles_description">Fatore pro s\'artària de su terrinu (dae datos SRTM, ASTER e EU-DEM).</string>
+
     <string name="routing_attr_driving_style_name">Istile de ghia</string>
     <string name="route_altitude">Artària de su caminu</string>
     <string name="altitude_descent">Falada</string>

OsmAnd/res/values-sk/strings.xml

@@ -2165,7 +2165,7 @@
     <string name="rendering_attr_depthContours_description">Zobraziť hĺbkové úrovne a body.</string>
     <string name="rendering_attr_depthContours_name">Námorné hĺbkové vrstevnice</string>
     <string name="routing_attr_height_obstacles_name">Použiť údaje nadmorskej výšky</string>
-    <string name="routing_attr_height_obstacles_description">Zohľadniť prevýšenie terénu (z údajov SRTM, ASTER a EU-DEM).</string>
+
     <string name="route_altitude">Prevýšenie trasy</string>
     <string name="altitude_descent">Klesanie</string>
     <string name="altitude_ascent">Stúpanie</string>

OsmAnd/res/values-sl/strings.xml

@@ -2169,7 +2169,7 @@
     <string name="shared_string_time">Čas</string>
     <string name="total_distance">Skupna razdalja</string>
     <string name="routing_attr_height_obstacles_name">Uporabi podatke višine</string>
-    <string name="routing_attr_height_obstacles_description">Faktor podatkov spreminjanja višine terena (po podatkih SRTM, ASTER in EU-DEM).</string>
+
     <string name="routing_attr_driving_style_name">Način vožnje</string>
     <string name="select_gpx_folder">Izbor mape datotek GPX</string>
     <string name="file_can_not_be_moved">Datoteke ni mogoče premakniti.</string>

OsmAnd/res/values-sr/strings.xml

@@ -1525,7 +1525,7 @@
     <string name="index_item_depth_points_northern_hemisphere">Поморске дубинске тачке северне полулопте</string>
     <string name="download_depth_countours">Поморске изобате</string>
     <string name="shared_string_color">Боја</string>
-    <string name="routing_attr_height_obstacles_description">Урачунај и податке висине земљишта (обезбеђених помоћу СРМ, АСТЕР и ЕУ-ДЕМ података).</string>
+
     <string name="auto_split_recording_title">Самоподели снимке после размака</string>
     <string name="auto_split_recording_descr">Почни нови одсечак после размака од 6 минута, нову путању после размака од 2 сата, или нови фајл после дужег размака ако је дан измењен.</string>
     <string name="rendering_attr_showMtbRoutes_name">Прикажи путеве планинских бицикли</string>

OsmAnd/res/values-sv/strings.xml

@@ -2097,7 +2097,7 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="quick_action_map_overlay_switch">"Kartöverlägget har ändrats till  \"%s\"."</string>
     <string name="quick_action_btn_tutorial_descr">Tryck länge och dra knappen för att ändra dess position på skärmen.</string>
     <string name="routing_attr_height_obstacles_name">Använd höjddata</string>
-    <string name="routing_attr_height_obstacles_description">Använd terränghöjddata från SRTM, ASTER och EU-DEM.</string>
+
     <string name="rendering_attr_depthContours_description">Visa djupkonturer och punkter.</string>
     <string name="shared_string_slope">Sluttning</string>
     <string name="altitude_range">Höjdområde</string>

OsmAnd/res/values-tr/strings.xml

@@ -2307,7 +2307,7 @@
     <string name="average_altitude">Ortalama yükseklik</string>
     <string name="routing_attr_relief_smoothness_factor_name">Yükseklikte dalgalanma seçin</string>
     <string name="routing_attr_height_obstacles_name">Yükseklik verisi kullan</string>
-    <string name="routing_attr_height_obstacles_description">Arazi kotunda faktör (SRTM, ASTER ve EU-DEM verileri aracılığıyla).</string>
+
     <string name="search_map_hint">Şehir veya bölge</string>
     <string name="route_roundabout_short">%1$d çıkışa gir ve ilerle</string>
     <string name="gpx_no_tracks_title">Henüz yol dosyanız yok</string>

OsmAnd/res/values-uk/strings.xml

@@ -2130,7 +2130,7 @@
     <string name="shared_string_time">Час</string>
     <string name="total_distance">Загальна відстань</string>
     <string name="routing_attr_height_obstacles_name">Використовувати дані висоти</string>
-    <string name="routing_attr_height_obstacles_description">Фактор висоти рельєфу земної поверхні (дані від SRTM, ASTER та EU-DEM).</string>
+
     <string name="rendering_attr_depthContours_description">Показати контури глибини і точки.</string>
     <string name="rendering_attr_depthContours_name">Контури морських глибин</string>
     <string name="auto_split_recording_title">Авто-розрив запису після перерви</string>

OsmAnd/res/values-zh-rCN/strings.xml

@@ -1382,7 +1382,7 @@
     <string name="average_altitude">平均海拔</string>
     <string name="routing_attr_relief_smoothness_factor_name">选择海拔波动</string>
     <string name="routing_attr_height_obstacles_name">使用标高数据</string>
-    <string name="routing_attr_height_obstacles_description">地形高程因素（通过 SRTM、ASTER 和欧盟 DEM 数据）。</string>
+
     <string name="rendering_attr_depthContours_description">显示等深线和标记。</string>
     <string name="rendering_attr_depthContours_name">航海等深线</string>
     <string name="auto_split_recording_title">自动拆分录音后的间隙</string>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -2161,7 +2161,7 @@
     <string name="rendering_attr_depthContours_description">顯示等深線和標記。</string>
     <string name="rendering_attr_depthContours_name">航海等深線</string>
     <string name="routing_attr_height_obstacles_name">使用海拔資料</string>
-    <string name="routing_attr_height_obstacles_description">將地勢海拔納入 (透過 SRTM、ASTER 和 EU-DEM 的資料)。</string>
+
     <string name="route_altitude">路線的海拔</string>
     <string name="altitude_descent">下坡</string>
     <string name="altitude_ascent">上坡</string>

OsmAnd/res/values/strings.xml

@@ -12,6 +12,7 @@
 
 -->
 
+    <string name="routing_attr_height_obstacles_description">Routing could avoid strong uphills.</string>
     <string name="app_restart_required">Application restart required to apply some settings.</string>
     <string name="on_pause">On pause</string>
     <string name="track_recording_description">Are you sure you want to stop recording?\nAll unsaved data will be lost.</string>
@@ -21,7 +22,6 @@
     <string name="delete_number_files_question">Delete %1$d files?</string>
     <string name="shared_strings_all_regions">All regions</string>
     <string name="restart">Restart</string>
-    <string name="elevation_data_descr">Routing could avoid strong uphills</string>
     <string name="map_orientation_threshold_descr">Don\'t rotate map view if speed is less than a threshold</string>
     <string name="snap_to_road_descr">Current location icon will be snapped to the current navigation route</string>
     <string name="routing_attr_driving_style_description">Select driving purpose to get shorter, faster or safer route</string>
@@ -1624,7 +1624,6 @@
     <string name="total_distance">Total distance</string>
     <string name="routing_attr_relief_smoothness_factor_name">Select elevation fluctuation</string>
     <string name="routing_attr_height_obstacles_name">Use elevation data</string>
-    <string name="routing_attr_height_obstacles_description">Factor in terrain elevation (via SRTM, ASTER, and EU-DEM data).</string>
     <string name="rendering_attr_depthContours_description">Show depth contours and points.</string>
     <string name="rendering_attr_depthContours_name">Nautical depth contours</string>
     <!-- string name="release_2_6">

OsmAnd/src/net/osmand/plus/download/DownloadResources.java

@@ -418,12 +418,14 @@ public class DownloadResources extends DownloadResourceGroup {
 			mainGrp.region = reg;
 			parentGroup.addGroup(mainGrp);
 
+			DownloadResourceGroup flatFiles = new DownloadResourceGroup(mainGrp, REGION_MAPS);
 			List<IndexItem> list = groupByRegion.get(reg);
 			if (list != null) {
-				DownloadResourceGroup flatFiles = new DownloadResourceGroup(mainGrp, REGION_MAPS);
 				for (IndexItem ii : list) {
 					flatFiles.addItem(ii);
 				}
+			}
+			if (list != null || !reg.isContinent()) {
 				mainGrp.addGroup(flatFiles);
 			}
 			DownloadResourceGroup subRegions = new DownloadResourceGroup(mainGrp, DownloadResourceGroupType.SUBREGIONS);
@@ -467,12 +469,16 @@ public class DownloadResources extends DownloadResourceGroup {
 		addGroup(otherGroup);
 
 		createHillshadeSRTMGroups();
+		collectMultipleIndexesItems();
 		trimEmptyGroups();
 		updateLoadedFiles();
-		collectMultipleIndexesItems(region);
 		return true;
 	}
 
+	private void collectMultipleIndexesItems() {
+		collectMultipleIndexesItems(region);
+	}
+
 	private void collectMultipleIndexesItems(@NonNull WorldRegion region) {
 		List<WorldRegion> subRegions = region.getSubregions();
 		if (Algorithms.isEmpty(subRegions)) return;

OsmAnd/src/net/osmand/plus/download/MultipleIndexesUiHelper.java

@@ -29,7 +29,7 @@ public class MultipleIndexesUiHelper {
 		OsmandRegions osmandRegions = app.getRegions();
 		for (IndexItem indexItem : multipleIndexItem.getAllIndexes()) {
 			SelectableItem selectableItem = new SelectableItem();
-			selectableItem.setTitle(indexItem.getVisibleName(app, osmandRegions));
+			selectableItem.setTitle(indexItem.getVisibleName(app, osmandRegions, false));
 
 			String size = indexItem.getSizeDescription(app);
 			String date = indexItem.getDate(dateFormat, showRemoteDate);

OsmAnd/src/net/osmand/plus/helpers/TrackSelectSegmentAdapter.java

@@ -49,7 +49,7 @@ public class TrackSelectSegmentAdapter extends RecyclerView.Adapter<TrackViewHol
 
 	@Override
 	public void onBindViewHolder(@NonNull final TrackViewHolder holder, int position) {
-		holder.icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_split_interval));
+		holder.iconSegment.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_split_interval));
 
 		TrkSegment segment = segments.get(position);
 
@@ -59,8 +59,10 @@ public class TrackSelectSegmentAdapter extends RecyclerView.Adapter<TrackViewHol
 		double distance = getDistance(segment);
 		long time = getSegmentTime(segment);
 		if (time != 1) {
+			holder.timeIcon.setVisibility(View.VISIBLE);
 			holder.time.setText(OsmAndFormatter.getFormattedDurationShort((int) (time / 1000)));
 		} else {
+			holder.timeIcon.setVisibility(View.GONE);
 			holder.time.setText("");
 		}
 		holder.distance.setText(OsmAndFormatter.getFormattedDistance((float) distance, app));
@@ -118,14 +120,16 @@ public class TrackSelectSegmentAdapter extends RecyclerView.Adapter<TrackViewHol
 
 	static class TrackViewHolder extends RecyclerView.ViewHolder {
 
-		ImageView icon;
+		ImageView iconSegment;
+		ImageView timeIcon;
 		TextView name;
 		TextView distance;
 		TextView time;
 
 		TrackViewHolder(View itemView) {
 			super(itemView);
-			icon = itemView.findViewById(R.id.icon);
+			iconSegment = itemView.findViewById(R.id.icon);
+			timeIcon = itemView.findViewById(R.id.time_icon);
 			name = itemView.findViewById(R.id.name);
 			distance = itemView.findViewById(R.id.distance);
 			time = itemView.findViewById(R.id.time_interval);

OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java

@@ -62,6 +62,7 @@ public class MeasurementEditingContext implements IRouteSettingsListener {
 	private List<TrkSegment> afterSegmentsForSnap;
 
 	private GpxData gpxData;
+	private int selectedSegment = -1;
 
 	private int selectedPointPosition = -1;
 	private WptPt originalPointToMove;
@@ -180,6 +181,10 @@ public class MeasurementEditingContext implements IRouteSettingsListener {
 		this.gpxData = gpxData;
 	}
 
+	public void setSelectedSegment(int selectedSegment) {
+		this.selectedSegment = selectedSegment;
+	}
+
 	public boolean hasRoutePoints() {
 		return gpxData != null && gpxData.getGpxFile() != null && gpxData.getGpxFile().hasRtePt();
 	}
@@ -688,7 +693,7 @@ public class MeasurementEditingContext implements IRouteSettingsListener {
 		return res;
 	}
 
-  private List<Pair<WptPt, WptPt>> getOrderedRoadSegmentDataKeys() {
+	private List<Pair<WptPt, WptPt>> getOrderedRoadSegmentDataKeys() {
 		List<Pair<WptPt, WptPt>> keys = new ArrayList<>();
 		for (List<WptPt> points : Arrays.asList(before.points, after.points)) {
 			for (int i = 0; i < points.size() - 1; i++) {
@@ -697,7 +702,7 @@ public class MeasurementEditingContext implements IRouteSettingsListener {
 		}
 		return keys;
 	}
-  
+
 	private void recreateSegments(List<TrkSegment> segments, List<TrkSegment> segmentsForSnap, List<WptPt> points, boolean calculateIfNeeded) {
 		List<Integer> roadSegmentIndexes = new ArrayList<>();
 		TrkSegment s = new TrkSegment();
@@ -767,67 +772,82 @@ public class MeasurementEditingContext implements IRouteSettingsListener {
 		if (Algorithms.isEmpty(segments)) {
 			return;
 		}
-		for (int si = 0; si < segments.size(); si++) {
+		if (selectedSegment != -1 && segments.size() > selectedSegment) {
-			TrkSegment segment = segments.get(si);
+			TrkSegment segment = segments.get(selectedSegment);
-			List<WptPt> points = segment.points;
 			if (segment.hasRoute()) {
-				RouteImporter routeImporter = new RouteImporter(segment);
+				addPoints(collectRoutePointsFromSegment(segment, selectedSegment));
-				List<RouteSegmentResult> routeSegments = routeImporter.importRoute();
-				List<WptPt> routePoints = gpxData.getGpxFile().getRoutePoints(si);
-				int prevPointIndex = 0;
-				if (routePoints.isEmpty() && points.size() > 1) {
-					routePoints.add(points.get(0));
-					routePoints.add(points.get(points.size() - 1));
-				}
-				for (int i = 0; i < routePoints.size() - 1; i++) {
-					Pair<WptPt, WptPt> pair = new Pair<>(routePoints.get(i), routePoints.get(i + 1));
-					int startIndex = pair.first.getTrkPtIndex();
-					if (startIndex < 0 || startIndex < prevPointIndex || startIndex >= points.size()) {
-						startIndex = MeasurementEditingContextUtils.findPointIndex(pair.first, points, prevPointIndex);
-					}
-					int endIndex = pair.second.getTrkPtIndex();
-					if (endIndex < 0 || endIndex < startIndex || endIndex >= points.size()) {
-						endIndex = MeasurementEditingContextUtils.findPointIndex(pair.second, points, startIndex);
-					}
-					if (startIndex >= 0 && endIndex >= 0) {
-						List<WptPt> pairPoints = new ArrayList<>();
-						for (int j = startIndex; j < endIndex && j < points.size(); j++) {
-							pairPoints.add(points.get(j));
-							prevPointIndex = j;
-						}
-						if (points.size() > prevPointIndex + 1 && i == routePoints.size() - 2) {
-							pairPoints.add(points.get(prevPointIndex + 1));
-						}
-						Iterator<RouteSegmentResult> it = routeSegments.iterator();
-						int k = endIndex - startIndex - 1;
-						List<RouteSegmentResult> pairSegments = new ArrayList<>();
-						if (k == 0 && !routeSegments.isEmpty()) {
-							pairSegments.add(routeSegments.remove(0));
-						} else {
-							while (it.hasNext() && k > 0) {
-								RouteSegmentResult s = it.next();
-								pairSegments.add(s);
-								it.remove();
-								k -= Math.abs(s.getEndPointIndex() - s.getStartPointIndex());
-							}
-						}
-						ApplicationMode appMode = ApplicationMode.valueOfStringKey(pair.first.getProfileType(), DEFAULT_APP_MODE);
-						roadSegmentData.put(pair, new RoadSegmentData(appMode, pair.first, pair.second, pairPoints, pairSegments));
-					}
-				}
-				if (!routePoints.isEmpty() && si < segments.size() - 1) {
-					routePoints.get(routePoints.size() - 1).setGap();
-				}
-				addPoints(routePoints);
 			} else {
-				addPoints(points);
+				addPoints(segment.points);
-				if (!points.isEmpty() && si < segments.size() - 1) {
+			}
-					points.get(points.size() - 1).setGap();
+		} else {
+			for (int si = 0; si < segments.size(); si++) {
+				TrkSegment segment = segments.get(si);
+				if (segment.hasRoute()) {
+					List<WptPt> routePoints = collectRoutePointsFromSegment(segment, si);
+					if (!routePoints.isEmpty() && si < segments.size() - 1) {
+						routePoints.get(routePoints.size() - 1).setGap();
+					}
+					addPoints(routePoints);
+				} else {
+					List<WptPt> points = segment.points;
+					addPoints(points);
+					if (!points.isEmpty() && si < segments.size() - 1) {
+						points.get(points.size() - 1).setGap();
+					}
 				}
 			}
 		}
 	}
 
+	private List<WptPt> collectRoutePointsFromSegment(TrkSegment segment, int segmentIndex) {
+		RouteImporter routeImporter = new RouteImporter(segment);
+		List<RouteSegmentResult> routeSegments = routeImporter.importRoute();
+		List<WptPt> routePoints = gpxData.getGpxFile().getRoutePoints(segmentIndex);
+		int prevPointIndex = 0;
+		List<WptPt> points = segment.points;
+		if (routePoints.isEmpty() && points.size() > 1) {
+			routePoints.add(points.get(0));
+			routePoints.add(points.get(points.size() - 1));
+		}
+		for (int i = 0; i < routePoints.size() - 1; i++) {
+			Pair<WptPt, WptPt> pair = new Pair<>(routePoints.get(i), routePoints.get(i + 1));
+			int startIndex = pair.first.getTrkPtIndex();
+			if (startIndex < 0 || startIndex < prevPointIndex || startIndex >= points.size()) {
+				startIndex = MeasurementEditingContextUtils.findPointIndex(pair.first, points, prevPointIndex);
+			}
+			int endIndex = pair.second.getTrkPtIndex();
+			if (endIndex < 0 || endIndex < startIndex || endIndex >= points.size()) {
+				endIndex = MeasurementEditingContextUtils.findPointIndex(pair.second, points, startIndex);
+			}
+			if (startIndex >= 0 && endIndex >= 0) {
+				List<WptPt> pairPoints = new ArrayList<>();
+				for (int j = startIndex; j < endIndex && j < points.size(); j++) {
+					pairPoints.add(points.get(j));
+					prevPointIndex = j;
+				}
+				if (points.size() > prevPointIndex + 1 && i == routePoints.size() - 2) {
+					pairPoints.add(points.get(prevPointIndex + 1));
+				}
+				Iterator<RouteSegmentResult> it = routeSegments.iterator();
+				int k = endIndex - startIndex - 1;
+				List<RouteSegmentResult> pairSegments = new ArrayList<>();
+				if (k == 0 && !routeSegments.isEmpty()) {
+					pairSegments.add(routeSegments.remove(0));
+				} else {
+					while (it.hasNext() && k > 0) {
+						RouteSegmentResult s = it.next();
+						pairSegments.add(s);
+						it.remove();
+						k -= Math.abs(s.getEndPointIndex() - s.getStartPointIndex());
+					}
+				}
+				ApplicationMode appMode = ApplicationMode.valueOfStringKey(pair.first.getProfileType(), DEFAULT_APP_MODE);
+				roadSegmentData.put(pair, new RoadSegmentData(appMode, pair.first, pair.second, pairPoints, pairSegments));
+			}
+		}
+		return routePoints;
+	}
+
 	public List<WptPt> setPoints(GpxRouteApproximation gpxApproximation, List<WptPt> originalPoints, ApplicationMode mode) {
 		if (gpxApproximation == null || Algorithms.isEmpty(gpxApproximation.finalPoints) || Algorithms.isEmpty(gpxApproximation.result)) {
 			return null;

OsmAnd/src/net/osmand/plus/osmedit/dialogs/DismissRouteBottomSheetFragment.java

@@ -46,12 +46,12 @@ public class DismissRouteBottomSheetFragment extends MenuBottomSheetDialogFragme
 
 	@Override
 	protected int getDismissButtonTextId() {
-		return R.string.shared_string_cancel;
+		return R.string.shared_string_no;
 	}
 
 	@Override
 	protected int getRightBottomButtonTextId() {
-		return R.string.shared_string_dismiss;
+		return R.string.shared_string_yes;
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java

@@ -226,16 +226,14 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
 				GPXRouteParamsBuilder rparams = routingHelper.getCurrentGPXRoute();
 				boolean osmandRouter = mode.getRouteService() == RouteProvider.RouteService.OSMAND;
 				if (rparams != null && osmandRouter) {
-					boolean showReverseCard = !routingHelper.isCurrentGPXRouteV2();
+					cardsContainer.addView(buildDividerView(cardsContainer, false));
-					if (showReverseCard) {
+
-						cardsContainer.addView(buildDividerView(cardsContainer, false));
+					ReverseTrackCard reverseTrackCard = new ReverseTrackCard(mapActivity, rparams.isReverse());
+					reverseTrackCard.setListener(this);
+					cardsContainer.addView(reverseTrackCard.build(mapActivity));
 
-						ReverseTrackCard reverseTrackCard = new ReverseTrackCard(mapActivity, rparams.isReverse());
-						reverseTrackCard.setListener(this);
-						cardsContainer.addView(reverseTrackCard.build(mapActivity));
-					}
 					if (!gpxFile.hasRtePt() && !gpxFile.hasRoute()) {
-						cardsContainer.addView(buildDividerView(cardsContainer, showReverseCard));
+						cardsContainer.addView(buildDividerView(cardsContainer, true));
 
 						AttachTrackToRoadsCard attachTrackCard = new AttachTrackToRoadsCard(mapActivity);
 						attachTrackCard.setListener(this);
@@ -584,6 +582,7 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
 			MeasurementEditingContext editingContext = new MeasurementEditingContext();
 			editingContext.setGpxData(gpxData);
 			editingContext.setAppMode(app.getRoutingHelper().getAppMode());
+			editingContext.setSelectedSegment(app.getSettings().GPX_ROUTE_SEGMENT.get());
 			MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager(), editingContext, true);
 		}
 	}
@@ -720,12 +719,12 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
 
 	@Override
 	public void onSegmentSelect(GPXFile gpxFile, int selectedSegment) {
+		app.getSettings().GPX_ROUTE_SEGMENT.set(selectedSegment);
 		selectTrackToFollow(gpxFile);
-			GPXRouteParamsBuilder paramsBuilder = app.getRoutingHelper().getCurrentGPXRoute();
+		GPXRouteParamsBuilder paramsBuilder = app.getRoutingHelper().getCurrentGPXRoute();
-			if (paramsBuilder != null) {
+		if (paramsBuilder != null) {
-				paramsBuilder.setSelectedSegment(selectedSegment);
+			paramsBuilder.setSelectedSegment(selectedSegment);
-				app.getSettings().GPX_ROUTE_SEGMENT.set(selectedSegment);
+			app.getRoutingHelper().onSettingsChanged(true);
-				app.getRoutingHelper().onSettingsChanged(true);
 		}
 		updateSelectionMode(false);
 	}

OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/TrackEditCard.java

@@ -3,6 +3,7 @@ package net.osmand.plus.routepreparationmenu.cards;
 import android.graphics.drawable.ColorDrawable;
 import android.view.View;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -15,6 +16,7 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
 import net.osmand.plus.helpers.TrackSelectSegmentAdapter;
@@ -83,19 +85,21 @@ public class TrackEditCard extends BaseCard {
 		if (gpxFile.getNonEmptySegmentsCount() > 1 && routeParams != null && routeParams.getSelectedSegment() != -1) {
 			TextView distanceView = view.findViewById(R.id.distance);
 			TextView timeView = view.findViewById(R.id.time);
-			TextView pointsView = view.findViewById(R.id.points_count);
+			ImageView timeIcon = view.findViewById(R.id.time_icon);
+			AndroidUiHelper.updateVisibility(view.findViewById(R.id.points_icon), false);
+			AndroidUiHelper.updateVisibility(view.findViewById(R.id.points_count), false);
 			List<GPXUtilities.TrkSegment> segments = gpxFile.getNonEmptyTrkSegments(false);
 			GPXUtilities.TrkSegment segment = segments.get(routeParams.getSelectedSegment());
-			int point = segment.points.size();
 			double distance = TrackSelectSegmentAdapter.getDistance(segment);
 			long time = TrackSelectSegmentAdapter.getSegmentTime(segment);
-			if (time != 1) {
+			boolean timeAvailable = time != 1;
-				timeView.setText(OsmAndFormatter.getFormattedDurationShort((int) (time / 1000)));
+			if (timeAvailable) {
-			} else {
+				timeView.setText(Algorithms.formatDuration((int) (time / 1000),
-				timeView.setText("");
+						app.accessibilityEnabled()));
 			}
+			AndroidUiHelper.updateVisibility(timeView, timeAvailable);
+			AndroidUiHelper.updateVisibility(timeIcon, timeAvailable);
 			distanceView.setText(OsmAndFormatter.getFormattedDistance((float) distance, app));
-			pointsView.setText(String.valueOf(point));
 		}
 
 		ImageButton editButton = view.findViewById(R.id.show_on_map);

OsmAnd/src/net/osmand/plus/routing/RouteProvider.java

@@ -289,7 +289,11 @@ public class RouteProvider {
 			int selectedSegment = builder.getSelectedSegment();
 			if (OSMAND_ROUTER_V2.equals(file.author)) {
 				route = parseOsmAndGPXRoute(points, file, selectedSegment);
-				routePoints = file.getRoutePoints();
+				if (selectedSegment == -1) {
+					routePoints = file.getRoutePoints();
+				} else {
+					routePoints = file.getRoutePoints(selectedSegment);
+				}
 				if (reverse) {
 					Collections.reverse(points);
 					Collections.reverse(routePoints);

OsmAnd/src/net/osmand/plus/settings/bottomsheets/ElevationDateBottomSheet.java

@@ -114,7 +114,7 @@ public class ElevationDateBottomSheet extends MenuBottomSheetDialogFragment {
 
 		int contentPaddingSmall = getResources().getDimensionPixelSize(R.dimen.content_padding_small);
 		items.add(new DividerSpaceItem(app, contentPaddingSmall));
-		items.add(new ShortDescriptionItem((getString(R.string.elevation_data_descr))));
+		items.add(new ShortDescriptionItem((getString(R.string.routing_attr_height_obstacles_description))));
 
 		createReliefFactorButtons(themedCtx);
 	}

OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java

@@ -1090,10 +1090,10 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 
 	@Override
 	public void onSegmentSelect(GPXFile gpxFile, int selectedSegment) {
+		app.getSettings().GPX_ROUTE_SEGMENT.set(selectedSegment);
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
 			startNavigationForGPX(gpxFile, mapActivity.getMapActions());
-			app.getSettings().GPX_ROUTE_SEGMENT.set(selectedSegment);
 			RouteProvider.GPXRouteParamsBuilder paramsBuilder = app.getRoutingHelper().getCurrentGPXRoute();
 			if (paramsBuilder != null) {
 				paramsBuilder.setSelectedSegment(selectedSegment);

OsmAnd/src/net/osmand/plus/track/TrackSelectSegmentBottomSheet.java

@@ -30,6 +30,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
+import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.helpers.TrackSelectSegmentAdapter;
 import net.osmand.plus.helpers.TrackSelectSegmentAdapter.OnItemClickListener;
@@ -81,6 +82,7 @@ public class TrackSelectSegmentBottomSheet extends MenuBottomSheetDialogFragment
 		TextView distance = gpxTrackContainer.findViewById(R.id.distance);
 		TextView pointsCount = gpxTrackContainer.findViewById(R.id.points_count);
 		TextView time = gpxTrackContainer.findViewById(R.id.time);
+		ImageView timeIcon = gpxTrackContainer.findViewById(R.id.time_icon);
 		LinearLayout container = gpxTrackContainer.findViewById(R.id.container);
 		LinearLayout containerNameAndReadSection = gpxTrackContainer.findViewById(R.id.name_and_read_section_container);
 		container.setPadding(sidePadding, 0, 0, 0);
@@ -93,7 +95,13 @@ public class TrackSelectSegmentBottomSheet extends MenuBottomSheetDialogFragment
 		pointsCount.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
 		pointsCount.setText(String.valueOf(analysis.wptPoints));
 		time.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
-		time.setText(analysis.isTimeSpecified() ? Algorithms.formatDuration((int) (analysis.timeSpan / 1000), app.accessibilityEnabled()) : "");
+		boolean timeSpecified = analysis.isTimeSpecified();
+		if (timeSpecified) {
+			time.setText(Algorithms.formatDuration((int) (analysis.timeSpan / 1000),
+					app.accessibilityEnabled()));
+		}
+		AndroidUiHelper.updateVisibility(time, timeSpecified);
+		AndroidUiHelper.updateVisibility(timeIcon, timeSpecified);
 
 		RecyclerView recyclerView = itemView.findViewById(R.id.gpx_segment_list);
 		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));