Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
max-klaus 2020-03-19 12:54:49 +03:00
commit b499315837
9 changed files with 114 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd-java/src/main/java/net/osmand/router/RouteSegmentResult.java
View file

@ -201,10 +201,14 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
bundle.putArray("types", convertTypes(object.types, rules));
int start = Math.min(startPointIndex, endPointIndex);
int end = Math.max(startPointIndex, endPointIndex);
bundle.putArray("pointTypes", convertTypes(Arrays.copyOfRange(object.pointTypes, start,
Math.min(end + 1, object.pointTypes.length)), rules));
if (object.hasPointTypes()) {
bundle.putArray("pointTypes", convertTypes(
Arrays.copyOfRange(object.pointTypes, start, Math.min(end + 1, object.pointTypes.length)), rules));
}
if (object.hasPointNames()) {
bundle.putArray("names", convertNameIds(object.nameIds, rules));
}
}
@Override
public void readFromBundle(RouteDataBundle bundle) {

1
OsmAnd/res/values-de/strings.xml
View file

@ -3581,4 +3581,5 @@ Lon %2$s</string>
\nDas kann einige Zeit dauern.</string>
<string name="items_added">Elemente hinzugefügt</string>
<string name="shared_string_import_complete">Import abgeschlossen</string>
<string name="clear_recorded_data_warning">Sind Sie sicher, dass Sie die aufgezeichneten Daten löschen möchten\?</string>
</resources>

13
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -3812,4 +3812,17 @@
<string name="poi_tactile_paving_primitive">Primitivo</string>
<string name="poi_tactile_paving_incorrect">Incorrecto</string>
<string name="poi_internet_access_fee_customers">Señal para encontrar el poste</string>
<string name="poi_seamark_water_level_part_submerged">Nivel del agua: parcialmente sumergido</string>
<string name="poi_seamark_water_level_submerged">Nivel del agua: sumergido</string>
<string name="poi_seamark_water_level_dry">Nivel de agua: seco</string>
<string name="poi_seamark_water_level_covers">Nivel del agua: cubierto</string>
<string name="poi_seamark_water_level_awash">Nivel de agua: inundado</string>
<string name="poi_seamark_water_level_floods">Nivel del agua: inundaciones</string>
<string name="poi_seamark_water_level_floating">Nivel del agua: flotante</string>
<string name="poi_seamark_water_level_above_mwl">Nivel del agua: por encima del nivel medio del agua</string>
<string name="poi_seamark_water_level_below_mwl">Nivel del agua: por debajo del nivel medio del agua</string>
<string name="poi_seamark_obstruction">Obstrucción</string>
<string name="poi_drinking_water_refill_yes">Recarga de agua potable: sí</string>
<string name="poi_drinking_water_refill_no">Recarga de agua potable: no</string>
<string name="poi_drinking_water_refill_network">Red de recarga de agua potable</string>
</resources>

9
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -3569,4 +3569,13 @@ Lon %2$s</string>
<string name="restore_all_profile_settings">¿Restaurar todos los ajustes del perfil\?</string>
<string name="saving_new_profile">Guardando el nuevo perfil</string>
<string name="profile_backup_failed">No se pudo respaldar el perfil.</string>
<string name="clear_recorded_data_warning">¿Borrar los datos registrados\?</string>
<string name="importing_from">Importación de datos de %1$s</string>
<string name="shared_string_importing">Importación</string>
<string name="checking_for_duplicate_description">OsmAnd comprueba %1$s para ver si hay duplicados con los elementos existentes en la aplicación.
\n
\nPuede llevar algún tiempo.</string>
<string name="items_added">Elementos añadidos</string>
<string name="shared_string_import_complete">Importación completa</string>
<string name="import_complete_description">Todos los datos de %1$s son importados, puedes usar los botones de abajo para abrir la parte necesaria de la aplicación para manejarla.</string>
</resources>

9
OsmAnd/res/values-es-rUS/strings.xml
View file

@ -3569,4 +3569,13 @@ Lon %2$s</string>
<string name="restore_all_profile_settings">¿Restaurar todos los ajustes del perfil\?</string>
<string name="saving_new_profile">Guardando el nuevo perfil</string>
<string name="profile_backup_failed">No se pudo respaldar el perfil.</string>
<string name="clear_recorded_data_warning">¿Borrar los datos registrados\?</string>
<string name="importing_from">Importación de datos de %1$s</string>
<string name="shared_string_importing">Importación</string>
<string name="checking_for_duplicate_description">OsmAnd comprueba %1$s para ver si hay duplicados con los elementos existentes en la aplicación.
\n
\nPuede llevar algún tiempo.</string>
<string name="items_added">Elementos añadidos</string>
<string name="shared_string_import_complete">Importación completa</string>
<string name="import_complete_description">Todos los datos de %1$s son importados, puedes usar los botones de abajo para abrir la parte necesaria de la aplicación para manejarla.</string>
</resources>

72
OsmAnd/res/values-it/phrases.xml
View file

@ -749,7 +749,7 @@
<string name="poi_smoking">Fumatori</string>
<string name="poi_delivery">Consegna</string>
<string name="poi_drive_in">"Drive in "</string>
<string name="poi_takeaway">A portar via</string>
<string name="poi_takeaway">Cibo da asporto</string>
<string name="poi_cocktails">Cocktail</string>
<string name="poi_microbrewery">Microbirrificio</string>
<string name="poi_beauty_salon_service">Servizio</string>
@ -2285,7 +2285,7 @@
<string name="poi_payment_union_card_no">Union Card non accettata</string>
<string name="poi_payment_mtsmoney_yes">MTS-Money</string>
<string name="poi_payment_mtsmoney_no">MTS-Money non accettato</string>
<string name="poi_brewery_additional">Nome birrificio</string>
<string name="poi_brewery_additional">Birre</string>
<string name="poi_fire_hydrant_style_water_source_main">Principale</string>
<string name="poi_fire_hydrant_style_water_source_pond">Stagno</string>
<string name="poi_fire_hydrant_style_water_source_stream">Ruscello</string>
@ -2714,4 +2714,72 @@
<string name="poi_water_tap">Rubinetto</string>
<string name="poi_free_flying_site_takeoff">Decollo</string>
<string name="poi_free_flying_site_landing">Atterraggio</string>
<string name="poi_seamark_building">Edificio di segnalazione marina</string>
<string name="poi_seamark_bridge">Ponte di segnalazione marina</string>
<string name="poi_beacon_cardinal">Segnalatore marino cardinale</string>
<string name="poi_beacon_lateral">Segnalatore marino laterale</string>
<string name="poi_beacon_safe_water">Segnalatore marino di acque sicure</string>
<string name="poi_beacon_special_purpose">Segnalatore marino speciale</string>
<string name="poi_buoy_cardinal">Boa di segnalazione cardinale</string>
<string name="poi_buoy_safe_water">Boa di segnalazione di acque sicure</string>
<string name="poi_buoy_special_purpose">Boa di segnalazione speciale</string>
<string name="poi_daymark">Punto notevole</string>
<string name="poi_small_craft_facility">Deposito per piccole imbarcazioni</string>
<string name="poi_piste_playground">Pista di un parco giochi</string>
<string name="poi_hanami">Hanami</string>
<string name="poi_trail_riding_station">Stazione di equiturismo</string>
<string name="poi_cattle_grid">Grata per il bestiame</string>
<string name="poi_bump_gate">Cancello di tipo \"bump gate\"</string>
<string name="poi_horse_stile">Scaletta per cavalli</string>
<string name="poi_kissing_gate">Cancello per il contenimento del bestiame</string>
<string name="poi_sally_port">Porta militare per sortita</string>
<string name="poi_swing_gate">Porta a vento</string>
<string name="poi_kent_carriage_gap">Apertura per carrozze Kent</string>
<string name="poi_route_hiking_ref_poi">Riferimento di un itinerario di escursionismo</string>
<string name="poi_denomination_mennonite">Mennonita</string>
<string name="poi_denomination_old_believers">Vecchi credenti</string>
<string name="poi_denomination_scientist">Scientifica</string>
<string name="poi_denomination_wesleyan">Wesleyana</string>
<string name="poi_denomination_shaktism">Shaktismo</string>
<string name="poi_denomination_shingon_shu">Shingon shu</string>
<string name="poi_denomination_mahayana">Mahayana</string>
<string name="poi_wholesale">Grossista</string>
<string name="poi_trees_pomegranate">Melograno</string>
<string name="poi_nudism_customary">Solito</string>
<string name="poi_information_route_marker">Cartello stradale</string>
<string name="poi_leisure_common">Area di svago</string>
<string name="poi_artwork_type_sculpture">Tipo di opera: scultura</string>
<string name="poi_artwork_type_statue">Tipo di opera: statua</string>
<string name="poi_artwork_type_mural">Tipo di opera: murale</string>
<string name="poi_artwork_type_architecture">Tipo di opera: archittettura</string>
<string name="poi_artwork_type_painting">Tipo di opera: dipinto</string>
<string name="poi_artwork_type_stone">Tipo di opera: roccia</string>
<string name="poi_artwork_type_bust">Tipo di opera: busto</string>
<string name="poi_artwork_type_installation">Tipo di opera: installazione</string>
<string name="poi_artwork_type_mosaic">Tipo di opera: mosaico</string>
<string name="poi_artwork_type_relief">Tipo di opera: rilievo</string>
<string name="poi_artwork_type_graffiti">Tipo di opera: graffiti</string>
<string name="poi_artwork_type_stele">Tipo di opera: stele</string>
<string name="poi_artwork_type_fountain">Tipo di opera: fontana</string>
<string name="poi_wiki_lang_nap">Wiki napoletana</string>
<string name="poi_lock_basin">Chiusa</string>
<string name="poi_government_public_service">Servizio pubblico</string>
<string name="poi_seamark_clearance_height">Margine di altezza</string>
<string name="poi_seamark_clearance_height_closed">Margine di altezza (chiuso)</string>
<string name="poi_seamark_clearance_height_open">Margine di altezza (aperto)</string>
<string name="poi_seamark_clearance_width">Margine di larghezza</string>
<string name="poi_car_pooling">Punto per la condivisione di automobili</string>
<string name="poi_changing_table_yes">Fasciatoio: presente</string>
<string name="poi_changing_table_no">Fasciatoio: non presente</string>
<string name="poi_changing_table_limited">Fasciatoio: limitato</string>
<string name="poi_changing_table_location_room">Posizionamento del fasciatoio: in stanza</string>
<string name="poi_changing_table_location_male_toilet">Posizionamento del fasciatoio: bagno maschile</string>
<string name="poi_changing_table_location_female_toilet">Posizionamento del fasciatoio: bagno femminile</string>
<string name="poi_changing_table_location_unisex_toilet">Posizionamento del fasciatoio: bagno unisex</string>
<string name="poi_changing_table_count">Numero di fasciatoi</string>
<string name="poi_changing_table_fee_yes">Tarriffa per l\' uso del fasciatoio: si</string>
<string name="poi_changing_table_fee_no">Tariffa per l\' uso del fasciatoio: nessuna</string>
<string name="poi_historic_tank">Carro armato storico</string>
<string name="poi_sms">SMS</string>
<string name="poi_video_telephone">Video</string>
</resources>

2
OsmAnd/res/values-sc/strings.xml
View file

@ -2714,7 +2714,7 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="shared_string_wifi_only">WiFi ebbia</string>
<string name="select_travel_book">Issèbera unu libru de biàgiu</string>
<string name="shared_string_travel_book">Libru de biàgiu</string>
<string name="online_webpage_warning">Pàgina disponìbile petzi in lìnia. La cheres abèrrere in un\'eploradore (unu browser) ìnternet?</string>
<string name="online_webpage_warning">Custa pàgina est disponìbile in lìnia ebbia. La cheres abèrrere in s\'esploradore/navigadore (browser) web\?</string>
<string name="images_cache">Cache de sas immàgines</string>
<string name="delete_search_history">Iscantzella sa cronologia de sas chircas</string>
<string name="download_images">Iscàrriga sas immàgines</string>

1
OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
View file

@ -708,6 +708,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
}
private void saveProfile() {
profile = changedProfile;
if (isNewProfile) {
DialogInterface.OnShowListener showListener = new DialogInterface.OnShowListener() {

2
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -1023,8 +1023,10 @@ public class MapInfoWidgetsFactory {
}
if (showExitInfo) {
if(!Algorithms.isEmpty(exitInfo.getExitStreetName())) {
text = exitInfo.getExitStreetName();
}
}
if (directionInfo != null && directionInfo.getRouteDataObject() != null) {
object = directionInfo.getRouteDataObject();