Merge branch 'master' into fix_#21369

OsmAnd-java/src/main/java/net/osmand/binary/GeocodingUtilities.java

@@ -199,7 +199,7 @@ public List<String> prepareStreetName(String s, boolean addCommonWords) {
 		List<String> ls = new ArrayList<String>();
 		int beginning = 0;
 		for (int i = 1; i < s.length(); i++) {
-			if (Character.isWhitespace(s.charAt(i))) {
+			if (Character.isWhitespace(s.charAt(i)) || s.charAt(i) == '-') {
 				addWord(ls, s.substring(beginning, i), addCommonWords);
 				beginning = i + 1;
 			} else if (s.charAt(i) == '(') {

OsmAnd-java/src/main/java/net/osmand/binary/HeightDataLoader.java

@@ -24,12 +24,12 @@ public class HeightDataLoader {
     public static final int ZOOM_TO_LOAD_TILES_SHIFT_L = ZOOM_TO_LOAD_TILES + 1;
     public static final int ZOOM_TO_LOAD_TILES_SHIFT_R = 31 - ZOOM_TO_LOAD_TILES;
 
-    public interface InterfaceIsCancelled {
+    public interface Cancellable {
         boolean isCancelled();
     }
 
-    public interface InterfaceCancellableCallback<T> {
-        boolean callback(T object, InterfaceIsCancelled canceller);
+    public interface CancellableCallback<T> {
+        boolean callback(T object, Cancellable canceller);
     }
 
     private final static Log log = PlatformUtil.getLog(HeightDataLoader.class);
@@ -50,7 +50,7 @@ public HeightDataLoader(BinaryMapIndexReader[] readers) {
         }
     }
 
-    public List<WptPt> loadHeightDataAsWaypoints(long osmId, QuadRect bbox31, InterfaceIsCancelled canceller) {
+    public List<WptPt> loadHeightDataAsWaypoints(long osmId, QuadRect bbox31, Cancellable canceller) {
         Map<Long, RouteDataObject> results = new HashMap<>();
         ResultMatcher<RouteDataObject> matcher = new ResultMatcher<>() {
             @Override

OsmAnd-java/src/test/java/net/osmand/router/RouteTestingTest.java

@@ -17,6 +17,7 @@
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -66,7 +67,7 @@ public static Iterable<Object[]> data() throws IOException {
 
 	}
 
-//	@Ignore 
+	@Ignore
 	@Test(timeout = TIMEOUT)
 	public void testRouting() throws Exception {
 		NativeLibrary nativeLibrary = null;

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

@@ -5694,4 +5694,5 @@
     <string name="original_icon_description">Svaka bi tačka zadržala svoju ikonu.</string>
     <string name="original_shape_description">Svaka bi tačka zadržala svoj oblik.</string>
     <string name="original_color_description">Svaka bi tačka zadržala svoju boju.</string>
+    <string name="save_favorite_default_appearance">Primenjujete promene na postojeće tačke u folderu ili samo na nove?</string>
 </resources>

OsmAnd/res/values-cs/strings.xml

@@ -5037,7 +5037,7 @@
     <string name="delete_map_description">Odstranit mapu %1$s?</string>
     <string name="maps_and_resources">Mapy a zdroje</string>
     <string name="help_article_navigation_routing_osmand_routing_name">O OsmAnd navigaci</string>
-    <string name="empty_smart_folder_title">Žádná odpovídající trasa</string>
+    <string name="empty_smart_folder_title">Žádná odpovídající stopa</string>
     <string name="smart_folder_name_present">Taková chytrá složka již existuje</string>
     <string name="help_article_search_search_coordinates_name">Hledat souřadnice</string>
     <string name="empty_smart_folder_description">Odpovídající trasy se zobrazí zde</string>
@@ -5704,4 +5704,9 @@
     <string name="hmd_promo_description">Bezplatný přístup k funkcím včetně neomezeného stahování map, 3D reliéfu a dalších na %1$s měsíců</string>
     <string name="shared_string_road_exit">Výjezd</string>
     <string name="hmd_promo">HMD Promo na %1$s měsíců</string>
+    <string name="original_color_description">Každý bod by si zachoval svou vlastní barvu.</string>
+    <string name="original_icon_description">Každý bod by si ponechal vlastní ikonu.</string>
+    <string name="original_shape_description">Každý bod by si zachoval svůj vlastní tvar.</string>
+    <string name="save_favorite_default_appearance">Použít změny na stávající body ve složce, nebo pouze na nové?</string>
+    <string name="apply_to_all_points">Použít pro všechny body</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -5740,4 +5740,5 @@
     <string name="original_icon_description">Hvert punkt beholder sit eget ikon.</string>
     <string name="original_shape_description">Hvert punkt beholder sin egen form.</string>
     <string name="apply_to_all_points">Anvend på alle punkter</string>
+    <string name="save_favorite_default_appearance">Anvend ændringer på de eksisterende punkter i mappen eller kun på de nye?</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -5720,4 +5720,9 @@
     <string name="shared_string_road_exit">Ausfahrt</string>
     <string name="hmd_promo_description">Kostenloser Zugriff auf Funktionen wie unbegrenzte Karten-Downloads, 3D-Reliefs usw. für einen Monat (%1$s)</string>
     <string name="hmd_promo">HMD Promo für %1$s Monate</string>
+    <string name="apply_to_all_points">Auf alle Punkte anwenden</string>
+    <string name="save_favorite_default_appearance">Änderungen auf die vorhandenen Punkte im Ordner anwenden oder nur auf neue?</string>
+    <string name="original_color_description">Jeder Punkt würde seine eigene Farbe behalten.</string>
+    <string name="original_icon_description">Jeder Punkt würde sein eigenes Symbol behalten.</string>
+    <string name="original_shape_description">Jeder Punkt würde seine eigene Form behalten.</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -5706,4 +5706,5 @@
     <string name="apply_to_all_points">Appliquer à tous les points</string>
     <string name="original_icon_description">Chaque point conservera sa propre icône.</string>
     <string name="original_shape_description">Chaque point conservera sa propre forme.</string>
+    <string name="save_favorite_default_appearance">Appliquer les modifications à tous les points existants dans le dossier ou seulement aux nouveaux ?</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -5661,4 +5661,9 @@
     <string name="hmd_promo_description">Ingyenes hozzáférés %1$s hónapig a funkciókhoz, beleértve a korlátlan térképletöltést, a 3D domborzatot stb</string>
     <string name="shared_string_road_exit">Kijárat</string>
     <string name="hmd_promo">%1$s hónapos HMD promóció</string>
+    <string name="original_color_description">Minden pont megtartja a saját színét.</string>
+    <string name="save_favorite_default_appearance">Alkalmazza a változtatásokat a mappában lévő meglévő pontokra, vagy csak az újakra?</string>
+    <string name="original_icon_description">Minden pont megtartja a saját ikonját.</string>
+    <string name="original_shape_description">Minden pont megtartja a saját alakját.</string>
+    <string name="apply_to_all_points">Alkalmazza az összes pontra</string>
 </resources>

OsmAnd/res/values-it/phrases.xml

@@ -382,7 +382,7 @@
     <string name="poi_picnic_site">Area attrezzata per picnic</string>
     <string name="poi_spring">Sorgente</string>
     <string name="poi_cemetery">Cimitero</string>
-    <string name="poi_grave_yard">Cimitero</string>
+    <string name="poi_grave_yard">Camposanto</string>
     <string name="poi_shelter">Pensilina o ricovero</string>
     <string name="poi_funicular">Funicolare</string>
     <string name="poi_club_art">Club artistico</string>

OsmAnd/res/values-it/strings.xml

@@ -5724,4 +5724,5 @@
     <string name="shared_string_road_exit">Uscita</string>
     <string name="hmd_promo_description">Accesso gratuito alle funzionalità, inclusi scaricamenti mappe illimitati, rilievi 3D, ecc. per %1$s mese</string>
     <string name="hmd_promo">Promozione HMD per%1$s mesi</string>
+    <string name="apply_to_all_points">Applica a tutti i punti</string>
 </resources>

OsmAnd/res/values-nb/strings.xml

@@ -714,7 +714,7 @@
     <string name="lang_ar">Arabisk</string>
     <string name="lang_fa">Persisk</string>
     <string name="lang_sc">Sardisk</string>
-    <string name="route_descr_select_destination">Velg reisemål</string>
+    <string name="route_descr_select_destination">Angi reisemål</string>
     <string name="routing_attr_prefer_motorway_name">Foretrekk motorveier</string>
     <string name="routing_attr_prefer_motorway_description">Foretrekk motorveier</string>
     <string name="routing_attr_avoid_toll_name">Ingen bomveier</string>
@@ -893,7 +893,7 @@
     <string name="monitoring_settings">Turopptak</string>
     <string name="monitoring_settings_descr">Sett opp hvordan du gjør opptak av turer.</string>
     <string name="record_plugin_name">Turopptak</string>
-    <string name="download_additional_maps">Laste ned manglende kart %1$s (%2$d MB)\?</string>
+    <string name="download_additional_maps">Laste ned manglende kart %1$s (%2$d MB)?</string>
     <string name="keep_navigation_service">Hold</string>
     <string name="gps_wake_up_timer">GPS-vekkingsintervall</string>
     <string name="forward">Videre</string>
@@ -1590,7 +1590,7 @@
     <string name="rendering_value_low_name">Lav</string>
     <string name="rendering_attr_hideWaterPolygons_description">Vann</string>
     <string name="rendering_attr_hideWaterPolygons_name">Skjul vann</string>
-    <string name="wiki_around">Nærliggende Wikipiedia-artikler</string>
+    <string name="wiki_around">Wikipedia-artikler i nærheten</string>
     <string name="route_roundabout_short">Ta avkjøring %1$d og fortsett</string>
     <string name="route_calculation">Ruteberegning</string>
     <string name="shared_string_appearance">Utseende</string>
@@ -1892,7 +1892,7 @@
     <string name="nearest_cities">Nærmeste byer</string>
     <string name="select_city">Velg by</string>
     <string name="select_postcode">Postnummersøk</string>
-    <string name="quick_action_auto_zoom">Auto-zoom på/av</string>
+    <string name="quick_action_auto_zoom">Auto-zoom kart</string>
     <string name="quick_action_auto_zoom_on">Aktiver auto-zoom</string>
     <string name="quick_action_auto_zoom_off">Deaktiver auto-zoom</string>
     <string name="no_overlay">Ingen overlegg</string>
@@ -2292,7 +2292,7 @@
     <string name="tap_on_map_to_hide_interface_descr">Et trykk på kartet skjuler/viser kontrollknappene og miniprogrammene.</string>
     <string name="mark_passed">Marker som passert</string>
     <string name="osn_modify_dialog_error">Kunne ikke endre notatet.</string>
-    <string name="quick_action_auto_zoom_desc">Knapp til å slå av eller på hastighetsbasert auto-zoom.</string>
+    <string name="quick_action_auto_zoom_desc">Knapp til å slå av eller på hastighetsstyrt auto-zoom.</string>
     <string name="quick_action_add_destination_desc">En knapp for å gjøre skjermsenteret til rutemålet, et tidligere valgt reisemål blir det siste mellomliggende målet.</string>
     <string name="quick_action_replace_destination_desc">En knapp for å gjøre skjermsenteret til det nye rutemålet, erstatter det tidligere valgte reisemålet (hvis noe).</string>
     <string name="quick_action_add_first_intermediate_desc">En knapp for å gjøre skjermsenteret til det første mellomliggende reisemålet.</string>
@@ -2866,8 +2866,8 @@
     <string name="shared_string_milliradians">Milliradianer</string>
     <string name="angular_measeurement">Vinkelenhet</string>
     <string name="angular_measeurement_descr">Endre hva asimut måles i.</string>
-    <string name="routing_attr_avoid_sett_name">Ingen kuppelstein eller brostein</string>
-    <string name="routing_attr_avoid_sett_description">Unngår kuppelstein og brostein</string>
+    <string name="routing_attr_avoid_sett_name">Ingen brostein</string>
+    <string name="routing_attr_avoid_sett_description">Unngår brostein</string>
     <string name="routing_attr_avoid_tram_name">Ingen trikk</string>
     <string name="routing_attr_avoid_tram_description">Unngår trikk</string>
     <string name="routing_attr_avoid_bus_name">Ingen buss</string>
@@ -3121,7 +3121,7 @@
     <string name="track_storage_directory_descrp">Spor kan lagres i \'rec\'-mappen, månedlige eller daglige mapper.</string>
     <string name="store_tracks_in_rec_directory">Ta opp spor til \'rec\'-mappen</string>
     <string name="store_tracks_in_daily_directories">Ta opp spor i daglige mapper</string>
-    <string name="store_tracks_in_daily_directories_descrp">Ta opp spor i undermapper for hver forskjellig dag (som 2018-01-01).</string>
+    <string name="store_tracks_in_daily_directories_descrp">Ta opp spor i undermapper for hver opptaksdag (som 2018-01-01).</string>
     <string name="shared_string_memory_used_tb_desc">%1$s TB brukt</string>
     <string name="shared_string_memory_used_gb_desc">%1$s GB brukt</string>
     <string name="shared_string_memory_used_mb_desc">%1$s MB brukt</string>
@@ -4233,18 +4233,18 @@
     <string name="safe_settings">Trygg</string>
     <string name="no_plugins_enabled">Du har ingen programtillegg påslått. Du finner en liste i «Meny → Programtillegg».</string>
     <string name="use_external_timestamps">Bruk eksterne tidsstempler</string>
-    <string name="approx_safe_mode">Trygt GPX-anslag</string>
-    <string name="approx_safe_mode_description">Utfør GPX-anslag ved bruk av tregere Android-metode istedenfor systemspesifikk kode.</string>
+    <string name="approx_safe_mode">Sikker GPX-tilnærming</string>
+    <string name="approx_safe_mode_description">Utfør GPX-tilnærmingen ved hjelp av tregere Android i stedet for innebygd kode.</string>
     <string name="use_external_timestamps_description">Bruk den nettbaserte ruterens tidsstempler til å justere estimert tid og gjennomsnittshastighet</string>
     <string name="routing_attr_prefer_tactile_paving_description">Foretrekk taktile ledelinjer</string>
     <string name="enter_verification_code">Skriv inn engangspassord</string>
     <string name="files_remaining">Gjenstående filer: %1$s %2$s</string>
     <string name="copying_file">Kopierer filen %1$s …</string>
     <string name="from_to_with_params">Fra %1$s til %2$s</string>
-    <string name="storage_copied_files_size">Kopierte %1$s filer %2$s</string>
+    <string name="storage_copied_files_size">Behandlet %1$s fil(er), %2$s</string>
     <string name="storage_found_files_descr">Trykk «%1$s» for å kopiere %2$s filer fra «%3$s» til «%4$s». Det kan ta litt tid.</string>
     <string name="storage_found_files_size">Fant %1$s filer %2$s</string>
-    <string name="folder_access_denied">Tilgang til valgt mappe kreves.</string>
+    <string name="folder_access_denied">Tillatelse kreves for å få tilgang til valgt mappe.</string>
     <string name="shared_storage_second_step">Klikk «Bruk denne mappen».</string>
     <string name="shared_string_copy_to">Kopier til</string>
     <string name="copying_completed">Kopiert</string>
@@ -4286,7 +4286,7 @@
     <string name="shared_string_hide_all">Skjul alle</string>
     <string name="memory_allocated_for_routing">Minnetildelning for ruting</string>
     <string name="display_groups_visibility_dialog_description">Du kan kontrollere gryppesynlighet på kartet. Hvis et spor er skjult vil alle grupper også være det.</string>
-    <string name="migration_files_present">Det er %1$d filer (%2$s) i valgt mappe «%3$s».</string>
+    <string name="migration_files_present">%1$d fil(er) (%2$s) allerede tilstede på målet \'%3$s\' og ikke overskrevet.</string>
     <string name="shared_string_memory">Minne</string>
     <string name="save_changes_into_file">Lagre endringer til fil</string>
     <string name="save_as_copy">Lagre som kopi</string>
@@ -4335,7 +4335,7 @@
     <string name="track_file_description">Å trykke denne handlingen vil vise en utvalgsdialog over tilgjengelige spor.</string>
     <string name="please_provide_group_name_message">Gi gruppen et navn.</string>
     <string name="rendering_attr_seabedDetail_description">Ytterligere tekstinfo om overflatebeskaffenhet til havbunnen, kombinerte overflatetyper, kategori og art for tang og sjøgress.</string>
-    <string name="rendering_attr_showWaterwayTunnels_name">Vannveistunneler</string>
+    <string name="rendering_attr_showWaterwayTunnels_name">Øk synlighet for vannveitunneler</string>
     <string name="rendering_attr_OSMMapperAssistantIconsLowZooms_description">Skjematisk visning av ikoner ved lav forstørrelse</string>
     <string name="gpx_no_routes_title">Det finnes ingen ruter</string>
     <string name="gpx_no_routes_descr">Du kan bruke «%1$s»-verktøyet for å lagre ruten i en fil.</string>
@@ -4346,7 +4346,7 @@
     <string name="rendering_attr_OSMMapperAssistantIconsLowZooms_name">Ikoner ved lav forstørrelse</string>
     <string name="predefined_waypoint_appearance_description">Ved å trykke på denne handlingen auto-lagres rutepunktet med forhåndsdefinerte parametere.</string>
     <string name="always_ask_waypoint_appearance_description">Ved å trykke på denne handlingen åpnes «Legg til rutepunkt», der du kan endre navn og utseende.</string>
-    <string name="rendering_attr_showWaterwayTunnels_description">Ikke skjul vannveistunneler</string>
+    <string name="rendering_attr_showWaterwayTunnels_description">Øk synlighet for vannveitunneler</string>
     <string name="not_enough_contributions_descr">Minst %1$s endringer de siste to månedene %2$s kreves for ubegrenset tilgang til timevise kartoppdateringer.</string>
     <string name="shared_string_reading_file">Leser fil …</string>
     <string name="exit_import">Avslutte\?</string>
@@ -5709,4 +5709,10 @@
     <string name="show_grids_description">Tillat visning av rutenett over kartet</string>
     <string name="shared_string_road_exit">Avkjøring</string>
     <string name="show_utm_grids_description">Vis rutenett i UTM-meter istedenfor WGS84-grader</string>
+    <string name="original_icon_description">Hvert punkt beholder sitt eget ikon.</string>
+    <string name="map_widget_route_information_desc">Viser beregnet ankomsttid, gjenværende reisetid og distanse for den aktuelle navigeringsruten.</string>
+    <string name="save_favorite_default_appearance">Bruke endringer på de eksisterende punkter i mappen eller kun på nye?</string>
+    <string name="original_color_description">Hvert punkt beholder sin egen farge.</string>
+    <string name="original_shape_description">Hvert punkt beholder sin egen form.</string>
+    <string name="apply_to_all_points">Bruk på alle punkter</string>
 </resources>

OsmAnd/res/values-sr/strings.xml

@@ -5698,4 +5698,5 @@
     <string name="original_shape_description">Свака тачка би задржала своју oblik.</string>
     <string name="apply_to_all_points">Примени на све тачке</string>
     <string name="original_color_description">Свака тачка би задржала своју боју.</string>
+    <string name="save_favorite_default_appearance">Примењујете промене на постојеће тачке у фолдеру или само на нове?</string>
 </resources>