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

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

Browse source
This commit is contained in:
Alexey Kulish 2015-09-25 23:43:48 +03:00
commit 4c989c085f
41 changed files with 507 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
OsmAnd/res/layout/expandable_list_item_category.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/list_header_height" android:minHeight="@dimen/list_header_height"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/list_header_padding" > android:paddingLeft="@dimen/list_header_padding">
<CheckBox <CheckBox
android:id="@+id/check_item" android:id="@+id/check_item"
@ -14,7 +14,8 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="?attr/dashboard_button" android:background="?attr/dashboard_button"
android:focusable="false" android:focusable="false"
android:visibility="gone" /> android:visibility="gone"
tools:visiblity="visible"/>
<ImageView <ImageView
android:id="@+id/explist_indicator" android:id="@+id/explist_indicator"
@ -24,23 +25,24 @@
<TextView <TextView
android:id="@+id/category_name" android:id="@+id/category_name"
android:layout_weight="1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/list_header_text_left_margin" android:layout_marginLeft="@dimen/list_header_text_left_margin"
android:layout_weight="1"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
tools:text="@string/lorem_ipsum" /> tools:text="@string/lorem_ipsum"/>
<ImageView <ImageView
android:id="@+id/options" android:id="@+id/options"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:focusable="false" android:background="?attr/dashboard_button"
android:visibility="gone" android:focusable="false"
android:background="?attr/dashboard_button" android:src="@drawable/ic_overflow_menu_white"
android:src="@drawable/ic_overflow_menu_white"/> android:visibility="gone"
tools:visiblity="visible"/>
</LinearLayout> </LinearLayout>

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

@ -2099,4 +2099,6 @@
<string name="simulate_your_location_stop_descr">Спыніць эмуляцыю свайго становішча</string> <string name="simulate_your_location_stop_descr">Спыніць эмуляцыю свайго становішча</string>
<string name="simulate_your_location_descr">Эмуляваць, выкарыстоўваючы запісаны GPX або разьлічаны маршрут</string> <string name="simulate_your_location_descr">Эмуляваць, выкарыстоўваючы запісаны GPX або разьлічаны маршрут</string>
<string name="downloads_left_template">%1$s сьцягваньняў засталося</string> <string name="downloads_left_template">%1$s сьцягваньняў засталося</string>
<string name="shared_string_wikipedia">Вікіпэдыя</string>
<string name="roads">Дарогі</string>
</resources> </resources>

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

@ -2048,7 +2048,7 @@ OsmAnd е с отворен код и активно да се развива.
<string name="osmo_session_token">Маркер за сесия: %1$s</string> <string name="osmo_session_token">Маркер за сесия: %1$s</string>
<string name="osmo_auth_pending">Чака за разрешение…</string> <string name="osmo_auth_pending">Чака за разрешение…</string>
<string name="av_camera_pic_size_descr">Изберете размер на снимката за вградената камера</string> <string name="av_camera_pic_size_descr">Изберете размер на снимката за вградената камера</string>
<string name="download_wikipedia_item">Уикипедия</string> <string name="shared_string_wikipedia">Уикипедия</string>
<string name="local_indexes_cat_wiki">Уикипедия</string> <string name="local_indexes_cat_wiki">Уикипедия</string>
<string name="shared_string_show_details">Покажи подробни данни</string> <string name="shared_string_show_details">Покажи подробни данни</string>
<string name="gps_network_not_enabled">Услугата за местоположение не е разрешена. Искате ли да я включите?</string> <string name="gps_network_not_enabled">Услугата за местоположение не е разрешена. Искате ли да я включите?</string>

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

@ -2008,7 +2008,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="rendering_value_walkingRoutesOSMC_name">Acoloreix segons l\'OSMC</string> <string name="rendering_value_walkingRoutesOSMC_name">Acoloreix segons l\'OSMC</string>
<string name="osm_edit_context_menu_delete">Suprimeix l\'edició d\'OSM</string> <string name="osm_edit_context_menu_delete">Suprimeix l\'edició d\'OSM</string>
<string name="read_full_article">Llegiu l\'article complet (en línia)</string> <string name="read_full_article">Llegiu l\'article complet (en línia)</string>
<string name="download_wikipedia_item">Viquipèdia</string> <string name="shared_string_wikipedia">Viquipèdia</string>
<string name="local_indexes_cat_wiki">Viquipèdia</string> <string name="local_indexes_cat_wiki">Viquipèdia</string>
<string name="shared_string_show_details">Mostra els detalls</string> <string name="shared_string_show_details">Mostra els detalls</string>
<string name="download_wikipedia_maps">Viquipèdia</string> <string name="download_wikipedia_maps">Viquipèdia</string>

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

@ -1953,7 +1953,7 @@ s často kladenými otázkami.</string>
<string name="shared_string_logoff">Odhlásit</string> <string name="shared_string_logoff">Odhlásit</string>
<string name="shared_string_import2osmand">Importovat do OsmAnd</string> <string name="shared_string_import2osmand">Importovat do OsmAnd</string>
<string name="read_full_article">Přečíst celý článek (online)</string> <string name="read_full_article">Přečíst celý článek (online)</string>
<string name="download_wikipedia_item">Wikipedie</string> <string name="shared_string_wikipedia">Wikipedie</string>
<string name="local_indexes_cat_wiki">Wikipedie</string> <string name="local_indexes_cat_wiki">Wikipedie</string>
<string name="shared_string_show_details">Zobrazit detaily</string> <string name="shared_string_show_details">Zobrazit detaily</string>
<string name="osm_edit_context_menu_delete">Smazat OSM změnu</string> <string name="osm_edit_context_menu_delete">Smazat OSM změnu</string>

16
OsmAnd/res/values-da/phrases.xml
View file

@ -1427,16 +1427,16 @@
<string name="poi_wheelchair_no">Kørestol: ikke tilladt</string> <string name="poi_wheelchair_no">Kørestol: ikke tilladt</string>
<string name="poi_wheelchair_limited">Kørestol: begrænset</string> <string name="poi_wheelchair_limited">Kørestol: begrænset</string>
<string name="poi_stars_1">Stjerner: 1 (turist)</string> <string name="poi_stars_1">Stjerner: 1 (Turist)</string>
<string name="poi_stars_1s">Stjerner: 1S (super turist)</string> <string name="poi_stars_1s">Stjerner: 1S (Superior Turist)</string>
<string name="poi_stars_2">Stjerner: 2 (Standard)</string> <string name="poi_stars_2">Stjerner: 2 (Standard)</string>
<string name="poi_stars_2s">Stjerner: 2S (Superior Standard)</string> <string name="poi_stars_2s">Stjerner: 2S (Superior Standard)</string>
<string name="poi_stars_3">Stjerner: 3 (komfort)</string> <string name="poi_stars_3">Stjerner: 3 (Komfort)</string>
<string name="poi_stars_3s">Stjerner: 3S (super komfort)</string> <string name="poi_stars_3s">Stjerner: 3S (Superior Komfort)</string>
<string name="poi_stars_4">Stjerner: 4 (Førsteklasses)</string> <string name="poi_stars_4">Stjerner: 4 (Førsteklasse)</string>
<string name="poi_stars_4s">Stjerner: 4S (super førsteklasse)</string> <string name="poi_stars_4s">Stjerner: 4S (Superior Førsteklasse)</string>
<string name="poi_stars_5">Stjerner: 5 (luksus)</string> <string name="poi_stars_5">Stjerner: 5 (Luksus)</string>
<string name="poi_stars_5s">Stjerner: 5S (Superior luksus)</string> <string name="poi_stars_5s">Stjerner: 5S (Superior Luksus)</string>
<string name="poi_stars_6">Stjerner: 6</string> <string name="poi_stars_6">Stjerner: 6</string>
<string name="poi_stars_7">Stjerner: 7</string> <string name="poi_stars_7">Stjerner: 7</string>
<string name="poi_rooms">Værelser</string> <string name="poi_rooms">Værelser</string>

3
OsmAnd/res/values-da/strings.xml
View file

@ -2016,7 +2016,7 @@
<string name="rendering_value_walkingRoutesOSMC_name">Farvelægning ifølge OSMC</string> <string name="rendering_value_walkingRoutesOSMC_name">Farvelægning ifølge OSMC</string>
<string name="osm_edit_context_menu_delete">Slet OSM redigering</string> <string name="osm_edit_context_menu_delete">Slet OSM redigering</string>
<string name="read_full_article">Læs hele artiklen (online)</string> <string name="read_full_article">Læs hele artiklen (online)</string>
<string name="download_wikipedia_item">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string> <string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Vis detaljer</string> <string name="shared_string_show_details">Vis detaljer</string>
<string name="download_wikipedia_maps">Wikipedia</string> <string name="download_wikipedia_maps">Wikipedia</string>
@ -2137,4 +2137,5 @@
<string name="simulate_your_location_stop_descr">Stop simulering af position</string> <string name="simulate_your_location_stop_descr">Stop simulering af position</string>
<string name="simulate_your_location_descr">Simuler ved brug af optaget GPX eller beregnet rute</string> <string name="simulate_your_location_descr">Simuler ved brug af optaget GPX eller beregnet rute</string>
<string name="downloads_left_template">%1$s filhentninger tilbage</string> <string name="downloads_left_template">%1$s filhentninger tilbage</string>
<string name="roads">Veje</string>
</resources> </resources>

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

@ -2169,7 +2169,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="routing_attr_avoid_borders_name">Überfahren von Grenzen vermeiden</string> <string name="routing_attr_avoid_borders_name">Überfahren von Grenzen vermeiden</string>
<string name="routing_attr_height_name">Höhenbeschränkung</string> <string name="routing_attr_height_name">Höhenbeschränkung</string>
<string name="read_full_article">Vollständigen Artikel lesen (online)</string> <string name="read_full_article">Vollständigen Artikel lesen (online)</string>
<string name="download_wikipedia_item">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string> <string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Details anzeigen</string> <string name="shared_string_show_details">Details anzeigen</string>
<string name="routing_attr_avoid_borders_description">Überqueren einer Staatsgrenze vermeiden</string> <string name="routing_attr_avoid_borders_description">Überqueren einer Staatsgrenze vermeiden</string>

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

@ -892,15 +892,15 @@
<string name="poi_tourism_attraction">Atracción turística</string> <string name="poi_tourism_attraction">Atracción turística</string>
<string name="poi_cutline">Cortafuegos forestal</string> <string name="poi_cutline">Cortafuegos forestal</string>
<string name="poi_icn_ref">Red de nodos ciclista internacional</string> <string name="poi_icn_ref">Red de ruta ciclista internacional</string>
<string name="poi_ncn_ref">Red de nodos ciclista nacional</string> <string name="poi_ncn_ref">Red de ruta ciclista nacional</string>
<string name="poi_rcn_ref">Red de nodos ciclista regional</string> <string name="poi_rcn_ref">Red de ruta ciclista regional</string>
<string name="poi_lcn_ref">Red de nodos ciclista local</string> <string name="poi_lcn_ref">Red de ruta ciclista local</string>
<string name="poi_iwn_ref">Red internacional de senderismo</string> <string name="poi_iwn_ref">Red de ruta internacional de senderismo</string>
<string name="poi_nwn_ref">Red nacional de senderismo</string> <string name="poi_nwn_ref">Red de ruta nacional de senderismo</string>
<string name="poi_rwn_ref">Red regional de senderismo</string> <string name="poi_rwn_ref">Red de ruta regional de senderismo</string>
<string name="poi_lwn_ref">Red local de senderismo</string> <string name="poi_lwn_ref">Red de ruta local de senderismo</string>
<string name="poi_opening_hours">Horario de atención</string> <string name="poi_opening_hours">Horario de atención</string>
<string name="poi_collection_times">Horario de recolección</string> <string name="poi_collection_times">Horario de recolección</string>
@ -939,7 +939,7 @@
<string name="poi_access_no">Sin acceso</string> <string name="poi_access_no">Sin acceso</string>
<string name="poi_access_destination">Acceso a destino</string> <string name="poi_access_destination">Acceso a destino</string>
<string name="poi_access_permissive">Acceso permisivo</string> <string name="poi_access_permissive">Acceso permisivo</string>
<string name="poi_access_customers">Acceso de clientes</string> <string name="poi_access_customers">Acceso a clientes</string>
<string name="poi_access_agricultural">Acceso agrícola</string> <string name="poi_access_agricultural">Acceso agrícola</string>
<string name="poi_access_delivery">Acceso para entregas</string> <string name="poi_access_delivery">Acceso para entregas</string>
@ -951,7 +951,7 @@
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
<string name="poi_facebook">Facebook</string> <string name="poi_facebook">Facebook</string>
<string name="poi_mobile">Celular</string> <string name="poi_mobile">Celular</string>
<string name="poi_animal_shelter_dog">Refugio para perros</string> <string name="poi_animal_shelter_dog">Refugio canino</string>
<string name="poi_animal_shelter_cat">Refugio para gatos</string> <string name="poi_animal_shelter_cat">Refugio para gatos</string>
<string name="poi_animal_shelter_dog_cat">Refugio para perros y gatos</string> <string name="poi_animal_shelter_dog_cat">Refugio para perros y gatos</string>
<string name="poi_animal_shelter_bird">Refugio para aves</string> <string name="poi_animal_shelter_bird">Refugio para aves</string>
@ -1044,7 +1044,7 @@
<string name="poi_mill_pond">Laguna de molino</string> <string name="poi_mill_pond">Laguna de molino</string>
<string name="poi_twitter">Twitter</string> <string name="poi_twitter">Twitter</string>
<string name="poi_skype">Skype</string> <string name="poi_skype">Skype</string>
<string name="poi_youtube">Youtube</string> <string name="poi_youtube">YouTube</string>
<string name="poi_instagram">Instagram</string> <string name="poi_instagram">Instagram</string>
<string name="poi_vk">VKontakte</string> <string name="poi_vk">VKontakte</string>
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
@ -1137,24 +1137,24 @@
<string name="poi_start_date">Fecha de inicio</string> <string name="poi_start_date">Fecha de inicio</string>
<string name="poi_wheelchair">Silla de rueda</string> <string name="poi_wheelchair">Silla de rueda</string>
<string name="poi_content_silage">Ensilado (contenido)</string> <string name="poi_content_silage">Contenido: ensilaje</string>
<string name="poi_content_water">Agua (contenido)</string> <string name="poi_content_water">Contenido: agua</string>
<string name="poi_content_oil">Petróleo (contenido)</string> <string name="poi_content_oil">Contenido: petróleo</string>
<string name="poi_content_fuel">Combustible (contenido)</string> <string name="poi_content_fuel">Contenido: combustible</string>
<string name="poi_content_manure">Estiércol (contenido)</string> <string name="poi_content_manure">Contenido: estiércol</string>
<string name="poi_content_wine">Vino (contenido)</string> <string name="poi_content_wine">Contenido: vino</string>
<string name="poi_content_sewage">Agua residual (contenido)</string> <string name="poi_content_sewage">Contenido: aguas negras</string>
<string name="poi_content_gas">Gas (contenido)</string> <string name="poi_content_gas">Contenido: gas</string>
<string name="poi_content_biomass">Biomasa (contenido)</string> <string name="poi_content_biomass">Contenido: biomasa</string>
<string name="poi_content_wastewater">Agua residual (contenido)</string> <string name="poi_content_wastewater">Contenido: aguas residuales</string>
<string name="poi_content_crop">Cultivo (contenido)</string> <string name="poi_content_crop">Contenido: cultivo</string>
<string name="poi_content_fodder">Forraje (contenido)</string> <string name="poi_content_fodder">Contenido: forraje</string>
<string name="poi_content_beer">Cerveza (contenido)</string> <string name="poi_content_beer">Contenido: cerveza</string>
<string name="poi_content_salt">Sal (contenido)</string> <string name="poi_content_salt">Contenido: sal</string>
<string name="poi_content_grain">Cereal (contenido)</string> <string name="poi_content_grain">Contenido: granos</string>
<string name="poi_bunker_silo">Silo bunker</string> <string name="poi_bunker_silo">Silo bunker</string>
<string name="poi_content_slurry">Mezcla (contenido)</string> <string name="poi_content_slurry">Contenido: mezcla</string>
<string name="poi_brownfield">Suelo abandonado urbanizable</string> <string name="poi_brownfield">Suelo abandonado urbanizable</string>
<string name="poi_greenfield">Suelo urbanizable</string> <string name="poi_greenfield">Suelo urbanizable</string>
<string name="poi_wholesale">Venta mayorista</string> <string name="poi_wholesale">Venta mayorista</string>
@ -1273,48 +1273,48 @@
<string name="poi_information_terminal">Terminal de información</string> <string name="poi_information_terminal">Terminal de información</string>
<string name="poi_information_route_marker">Marcador de ruta</string> <string name="poi_information_route_marker">Marcador de ruta</string>
<string name="poi_information_hikingmap">Mapa de senderismo</string> <string name="poi_information_hikingmap">Mapa de senderismo</string>
<string name="poi_information_nature">Información sobre la naturaleza</string> <string name="poi_information_nature">Información: naturaleza</string>
<string name="poi_information_wildlife">Información sobre la vida silvestre</string> <string name="poi_information_wildlife">Información: vida salvaje</string>
<string name="poi_information_history">Información histórica</string> <string name="poi_information_history">Información: historia</string>
<string name="poi_information_sign">Señal</string> <string name="poi_information_sign">Señal</string>
<string name="poi_information_audioguide">Audio-guía</string> <string name="poi_information_audioguide">Audio-guía</string>
<string name="poi_information_bicyclemap">Mapa ciclista</string> <string name="poi_information_bicyclemap">Mapa ciclista</string>
<string name="poi_information_tactile_model">Modelo táctil</string> <string name="poi_information_tactile_model">Modelo táctil</string>
<string name="poi_information_tactile_map">Mapa táctil</string> <string name="poi_information_tactile_map">Mapa táctil</string>
<string name="poi_board_type_notice">Tablero con aviso</string> <string name="poi_board_type_notice">Tablón con anuncio</string>
<string name="poi_board_type_plants">Información sobre plantas</string> <string name="poi_board_type_plants">Información: plantas</string>
<string name="poi_board_type_geology">Información geológica</string> <string name="poi_board_type_geology">Información: geología</string>
<string name="poi_board_type_public_transport">Información sobre el transporte público</string> <string name="poi_board_type_public_transport">Información: transporte público</string>
<string name="poi_board_type_technology">Información tecnológica</string> <string name="poi_board_type_technology">Información: tecnología</string>
<string name="poi_board_type_astronomy">Información astronómica</string> <string name="poi_board_type_astronomy">Información: astronomía</string>
<string name="poi_commercial">Área de oficinas</string> <string name="poi_commercial">Área de oficinas</string>
<string name="poi_fireplace_yes">Chimenea</string> <string name="poi_fireplace_yes">Chimenea</string>
<string name="poi_fireplace_no">Sin chimenea</string> <string name="poi_fireplace_no">Sin chimenea</string>
<string name="poi_covered_yes">Con refugio</string> <string name="poi_covered_yes">Cubierto</string>
<string name="poi_covered_no">Sin refugio</string> <string name="poi_covered_no">Sin cobertura</string>
<string name="poi_smoking_no">No fumar</string> <string name="poi_smoking_no">No fumar</string>
<string name="poi_smoking_outside">Permitido fumar en el exterior</string> <string name="poi_smoking_outside">Permitido fumar afuera</string>
<string name="poi_smoking_yes">Permitido fumar</string> <string name="poi_smoking_yes">Permitido fumar</string>
<string name="poi_smoking_separated">Permitido fumar en habitación separada y sin separación efectiva</string> <string name="poi_smoking_separated">Permitido fumar en habitación separada</string>
<string name="poi_smoking_isolated">Permitido fumar en una sala aislada físicamente</string> <string name="poi_smoking_isolated">Permitido fumar en habitación aislada</string>
<string name="poi_smoking_dedicated">Solo fumadores</string> <string name="poi_smoking_dedicated">Solo fumadores</string>
<string name="poi_toll_no">Peaje sin tarifa</string> <string name="poi_toll_no">Sin Peaje</string>
<string name="poi_toll_yes">Peaje tarifado</string> <string name="poi_toll_yes">Peaje</string>
<string name="poi_tactile_paving_yes">Con pavimento táctil</string> <string name="poi_tactile_paving_yes">Con pavimento táctil</string>
<string name="poi_tactile_paving_no">Sin pavimento táctil</string> <string name="poi_tactile_paving_no">Sin pavimento táctil</string>
<string name="poi_traffic_signals_sound_yes">Sonoro</string> <string name="poi_traffic_signals_sound_yes">Sonoro</string>
<string name="poi_traffic_signals_sound_no">Sin sonido</string> <string name="poi_traffic_signals_sound_no">Sin sonido</string>
<string name="poi_traffic_signals_sound_walk">Sonoro sólo cuando se permite caminar</string> <string name="poi_traffic_signals_sound_walk">Sonoro cuando se permite caminar</string>
<string name="poi_retail">Área comercial</string> <string name="poi_retail">Área comercial</string>
<string name="poi_ford_stepping_stones">Puente de piedras</string> <string name="poi_ford_stepping_stones">Puente de piedras</string>
<string name="poi_information_board">Tablero de información</string> <string name="poi_information_board">Tablero de información</string>
<string name="poi_toll_hgv_yes">Peaje tarifado para vehículos pesados</string> <string name="poi_toll_hgv_yes">Peaje para camiones</string>
<string name="poi_information_trail_blaze">Marcador del camino</string> <string name="poi_information_trail_blaze">Marcador del camino</string>
<string name="poi_rescue_station">Estación de rescate</string> <string name="poi_rescue_station">Estación de rescate</string>
@ -1345,7 +1345,7 @@
<string name="poi_leisure_common">Área de ocio común</string> <string name="poi_leisure_common">Área de ocio común</string>
<string name="poi_heath">Brezal</string> <string name="poi_heath">Brezal</string>
<string name="poi_windfall">Fruto caído</string> <string name="poi_windfall">Fruto caído</string>
<string name="poi_rtsa_scale">Dificultad del paso de montaña</string> <string name="poi_rtsa_scale">Escala RTSA</string>
<string name="poi_pump">Bomba</string> <string name="poi_pump">Bomba</string>
@ -1381,7 +1381,7 @@
<string name="poi_capacity_women_yes">Lugares reservados para mujeres</string> <string name="poi_capacity_women_yes">Lugares reservados para mujeres</string>
<string name="poi_capacity_women_no">Sin lugar dedicado para mujeres</string> <string name="poi_capacity_women_no">Sin lugar dedicado para mujeres</string>
<string name="poi_capacity_women">Lugares reservados para mujeres</string> <string name="poi_capacity_women">Lugares reservados para mujeres</string>
<string name="poi_capacity_pupils">Lugares reservados para alumnos</string> <string name="poi_capacity_pupils">Lugares reservados para estudiantes</string>
<string name="poi_capacity_teachers">Lugares reservados para profesores</string> <string name="poi_capacity_teachers">Lugares reservados para profesores</string>
<string name="poi_capacity_parent_yes">Lugares reservados para padres</string> <string name="poi_capacity_parent_yes">Lugares reservados para padres</string>
<string name="poi_capacity_parent_no">Sin lugares reservados para padres</string> <string name="poi_capacity_parent_no">Sin lugares reservados para padres</string>
@ -1404,4 +1404,22 @@
<string name="poi_aerialway_summer_access_exit">Sólo acceso de salida en verano</string> <string name="poi_aerialway_summer_access_exit">Sólo acceso de salida en verano</string>
<string name="poi_aerialway_summer_access_both">Acesso de entrada y salida en verano</string> <string name="poi_aerialway_summer_access_both">Acesso de entrada y salida en verano</string>
<string name="poi_wheelchair_no">Silla de ruedas: no permitido</string>
<string name="poi_wheelchair_limited">Silla de ruedas: limitado</string>
<string name="poi_stars_1">Estrellas: 1 (Turista)</string>
<string name="poi_stars_1s">Estrellas: 1S (Turista Superior)</string>
<string name="poi_stars_2">Estrellas: 2 (Estándar)</string>
<string name="poi_stars_2s">Estrellas: 2S (Estándar Superior)</string>
<string name="poi_stars_3">Estrellas: 3 (Confortable)</string>
<string name="poi_stars_3s">Estrellas: 3S (Confortable Superior)</string>
<string name="poi_stars_4">Estrellas: 4 (Primera Clase)</string>
<string name="poi_stars_4s">Estrellas: 4S (Primera Clase Superior)</string>
<string name="poi_stars_5">Estrellas: 5 (Lujurioso)</string>
<string name="poi_stars_5s">Estrellas: 5S (Lujurioso Superior)</string>
<string name="poi_stars_6">Estrellas: 6</string>
<string name="poi_stars_7">Estrellas: 7</string>
<string name="poi_rooms">Habitaciones</string>
<string name="poi_love_hotel">Telo</string>
</resources> </resources>

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

@ -1939,7 +1939,7 @@
<string name="rendering_value_walkingRoutesOSMC_name">Colorear según OSMC</string> <string name="rendering_value_walkingRoutesOSMC_name">Colorear según OSMC</string>
<string name="osm_edit_context_menu_delete">Quitar edición OSM</string> <string name="osm_edit_context_menu_delete">Quitar edición OSM</string>
<string name="read_full_article">Leer artículo completo (en línea)</string> <string name="read_full_article">Leer artículo completo (en línea)</string>
<string name="download_wikipedia_item">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string> <string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Ver detalles</string> <string name="shared_string_show_details">Ver detalles</string>
<string name="download_wikipedia_maps">Wikipedia</string> <string name="download_wikipedia_maps">Wikipedia</string>

19
OsmAnd/res/values-es/phrases.xml
View file

@ -1409,6 +1409,21 @@
<string name="poi_wheelchair_no">Silla de ruedas: no permitido</string> <string name="poi_wheelchair_no">Silla de ruedas: no permitido</string>
<string name="poi_wheelchair_limited">Silla de ruedas: limitado</string> <string name="poi_wheelchair_limited">Silla de ruedas: limitado</string>
<string name="poi_stars_1">1 estrella (Turista)</string> <string name="poi_stars_1">Estrellas: 1 (Turista)</string>
<string name="poi_stars_1s">Estrellas: 1S (Turista Superior)</string> <string name="poi_stars_1s">Estrellas: 1S (Turista Superior)</string>
</resources> <string name="poi_stars_2">Estrellas: 2 (Estándar)</string>
<string name="poi_stars_2s">Estrellas: 2S (Estándar Superior)</string>
<string name="poi_stars_3">Estrellas: 3 (Confortable)</string>
<string name="poi_stars_3s">Estrellas: 3S (Confortable Superior)</string>
<string name="poi_stars_4">Estrellas: 4 (Primera Clase)</string>
<string name="poi_stars_4s">Estrellas: 4S (Primera Clase Superior)</string>
<string name="poi_stars_5">Estrellas: 5 (Lujurioso)</string>
<string name="poi_stars_5s">Estrellas: 5S (Lujurioso Superior)</string>
<string name="poi_stars_6">Estrellas: 6</string>
<string name="poi_stars_7">Estrellas: 7</string>
<string name="poi_rooms">Habitaciones</string>
<string name="poi_garden_style_rosarium">Jardín rosaleda</string>
<string name="poi_love_hotel">Albergue transitorio</string>
</resources>

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

@ -2078,7 +2078,7 @@
<string name="osm_edit_context_menu_delete">Borrar edición de OSM</string> <string name="osm_edit_context_menu_delete">Borrar edición de OSM</string>
<string name="shared_string_import2osmand">Importar a OsmAnd</string> <string name="shared_string_import2osmand">Importar a OsmAnd</string>
<string name="read_full_article">Leer el artículo completo (en línea)</string> <string name="read_full_article">Leer el artículo completo (en línea)</string>
<string name="download_wikipedia_item">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string> <string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Mostrar detalles</string> <string name="shared_string_show_details">Mostrar detalles</string>
<string name="local_recordings_delete_all_confirm">Va a borrar %1$d notas. ¿Está seguro?</string> <string name="local_recordings_delete_all_confirm">Va a borrar %1$d notas. ¿Está seguro?</string>

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

@ -890,6 +890,6 @@
<string name="gps_network_not_enabled">Sijaintipalvelu poistettu käytöstä. Haluatko ottaa sen käyttöön?</string> <string name="gps_network_not_enabled">Sijaintipalvelu poistettu käytöstä. Haluatko ottaa sen käyttöön?</string>
<string name="shared_string_import2osmand">Tuo OsmAndiin</string> <string name="shared_string_import2osmand">Tuo OsmAndiin</string>
<string name="read_full_article">Lue koko artikkeli (online)</string> <string name="read_full_article">Lue koko artikkeli (online)</string>
<string name="download_wikipedia_item">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
<string name="shared_string_show_details">Näytä tiedot</string> <string name="shared_string_show_details">Näytä tiedot</string>
</resources> </resources>

10
OsmAnd/res/values-fr/strings.xml
View file

@ -2041,7 +2041,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="osm_edit_context_menu_delete">Supprimer la modification OSM</string> <string name="osm_edit_context_menu_delete">Supprimer la modification OSM</string>
<string name="shared_string_show_details">Afficher les détails</string> <string name="shared_string_show_details">Afficher les détails</string>
<string name="read_full_article">Lire l\'article complet (en ligne)</string> <string name="read_full_article">Lire l\'article complet (en ligne)</string>
<string name="download_wikipedia_item">Wikipédia</string> <string name="shared_string_wikipedia">Wikipédia</string>
<string name="local_indexes_cat_wiki">Wikipédia</string> <string name="local_indexes_cat_wiki">Wikipédia</string>
<string name="download_wikipedia_maps">Wikipedia</string> <string name="download_wikipedia_maps">Wikipedia</string>
<string name="shared_string_import2osmand">Importer dans OsmAnd</string> <string name="shared_string_import2osmand">Importer dans OsmAnd</string>
@ -2155,4 +2155,10 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="routing_attr_avoid_shuttle_train_name">Éviter les trains-navettes</string> <string name="routing_attr_avoid_shuttle_train_name">Éviter les trains-navettes</string>
<string name="av_locations_descr">Fichier GPS avec notes</string> <string name="av_locations_descr">Fichier GPS avec notes</string>
<string name="tag_poi_amenity">aménité</string> <string name="tag_poi_amenity">aménité</string>
</resources> <string name="simulate_your_location_stop_descr">Arrêter de simuler votre position</string>
<string name="simulate_your_location_descr">Simuler la position à partir d\'un fichier GPX ou d\'une route</string>
<string name="are_you_sure">Etes-vous certain ?</string>
<string name="unsaved_changes_will_be_lost">Les modifications non enregistrées seront perdues. Souhaitez-vous poursuivre ?</string>
<string name="downloads_left_template">%1$s téléchargement(s) restant(s)</string>
<string name="roads">Routes</string>
</resources>

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

@ -1960,7 +1960,7 @@
<string name="osm_edit_context_menu_delete">OSM szerkesztés törlése</string> <string name="osm_edit_context_menu_delete">OSM szerkesztés törlése</string>
<string name="shared_string_show_details">Részletek megjelenítése</string> <string name="shared_string_show_details">Részletek megjelenítése</string>
<string name="read_full_article">Teljes cikk elolvasása (interneten)</string> <string name="read_full_article">Teljes cikk elolvasása (interneten)</string>
<string name="download_wikipedia_item">Wikipédia</string> <string name="shared_string_wikipedia">Wikipédia</string>
<string name="local_indexes_cat_wiki">Wikipédia</string> <string name="local_indexes_cat_wiki">Wikipédia</string>
<string name="download_wikipedia_maps">Wikipédia</string> <string name="download_wikipedia_maps">Wikipédia</string>
<string name="shared_string_import2osmand">Importálás az OsmAnd programba</string> <string name="shared_string_import2osmand">Importálás az OsmAnd programba</string>

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

@ -2067,7 +2067,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="disable_recording_once_app_killed_descrp">Metterà in pausa la registrazione GPX quando l\'app viene chiusa (attraverso le app recenti). (L\'indicatore della modalità background di OsmAnd sparisce dalla barra delle notifiche di Android.)</string> <string name="disable_recording_once_app_killed_descrp">Metterà in pausa la registrazione GPX quando l\'app viene chiusa (attraverso le app recenti). (L\'indicatore della modalità background di OsmAnd sparisce dalla barra delle notifiche di Android.)</string>
<string name="shared_string_import2osmand">Importa in OsmAnd</string> <string name="shared_string_import2osmand">Importa in OsmAnd</string>
<string name="read_full_article">Leggi l\'articolo intero (online)</string> <string name="read_full_article">Leggi l\'articolo intero (online)</string>
<string name="download_wikipedia_item">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string> <string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Mostra i dettagli</string> <string name="shared_string_show_details">Mostra i dettagli</string>
<string name="local_recordings_delete_all_confirm">Stai per cancellare %1$d nota/e. Sei sicuro?</string> <string name="local_recordings_delete_all_confirm">Stai per cancellare %1$d nota/e. Sei sicuro?</string>

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

@ -2095,7 +2095,7 @@ POIの更新は利用できません</string>
<string name="rendering_value_defaultTranslucentCyan_name">デフォルト (半透明シアン)</string> <string name="rendering_value_defaultTranslucentCyan_name">デフォルト (半透明シアン)</string>
<string name="shared_string_import2osmand">OsmAndにインポート</string> <string name="shared_string_import2osmand">OsmAndにインポート</string>
<string name="read_full_article">記事全文を読む (オンライン)</string> <string name="read_full_article">記事全文を読む (オンライン)</string>
<string name="download_wikipedia_item">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string> <string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">パーソナルトラッカーIDを表示</string> <string name="shared_string_show_details">パーソナルトラッカーIDを表示</string>
<string name="local_recordings_delete_all_confirm">%1$d個のメモを削除します。よろしいですか？</string> <string name="local_recordings_delete_all_confirm">%1$d個のメモを削除します。よろしいですか？</string>

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

@ -7,7 +7,7 @@
<string name="lang_ms">ಮಲೇಷ್ಯಾ</string> <string name="lang_ms">ಮಲೇಷ್ಯಾ</string>
<string name="download_wikipedia_files">ನೀವು ಅಧಿಕ ವಿಕಿಪೀಡಿಯ ದತ್ತಾಂಶವನ್ನು (%1$s MB) ಡೌನ್ ಲೋಡ್ ಮಾಡಲು ಇಚ್ಚಿಸುವಿರಾ?</string> <string name="download_wikipedia_files">ನೀವು ಅಧಿಕ ವಿಕಿಪೀಡಿಯ ದತ್ತಾಂಶವನ್ನು (%1$s MB) ಡೌನ್ ಲೋಡ್ ಮಾಡಲು ಇಚ್ಚಿಸುವಿರಾ?</string>
<string name="read_full_article">ಪೂರ್ಣ ಲೇಖನ ಓದಿ(ಮಿಂಬಲೆಯೊಳಗೆ)</string> <string name="read_full_article">ಪೂರ್ಣ ಲೇಖನ ಓದಿ(ಮಿಂಬಲೆಯೊಳಗೆ)</string>
<string name="download_wikipedia_item">ವಿಕಿಪೀಡಿಯ</string> <string name="shared_string_wikipedia">ವಿಕಿಪೀಡಿಯ</string>
<string name="local_indexes_cat_wiki">ವಿಕಿಪೀಡಿಯ</string> <string name="local_indexes_cat_wiki">ವಿಕಿಪೀಡಿಯ</string>
<string name="shared_string_show_details">ವಿವರಣೆ ತೋರಿಸಿ</string> <string name="shared_string_show_details">ವಿವರಣೆ ತೋರಿಸಿ</string>
<string name="osm_edit_context_menu_delete">ಒಎಸ್ಎಂ ಸಂಪಾದನೆಯನ್ನು ಅಳಿಸು</string> <string name="osm_edit_context_menu_delete">ಒಎಸ್ಎಂ ಸಂಪಾದನೆಯನ್ನು ಅಳಿಸು</string>

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

@ -2261,7 +2261,7 @@
<string name="disable_recording_once_app_killed_descrp">앱이 죽을 때 GPX 로깅은 일시 중지 합니다. (OsmAnd 절전 모드 표시는 안드로이드 알림 표시줄에서 사라집니다.)</string> <string name="disable_recording_once_app_killed_descrp">앱이 죽을 때 GPX 로깅은 일시 중지 합니다. (OsmAnd 절전 모드 표시는 안드로이드 알림 표시줄에서 사라집니다.)</string>
<string name="shared_string_import2osmand">OsmAnd로 가져오기</string> <string name="shared_string_import2osmand">OsmAnd로 가져오기</string>
<string name="read_full_article">전체 기사 읽기 (온라인)</string> <string name="read_full_article">전체 기사 읽기 (온라인)</string>
<string name="download_wikipedia_item">위키백과</string> <string name="shared_string_wikipedia">위키백과</string>
<string name="local_indexes_cat_wiki">위키백과</string> <string name="local_indexes_cat_wiki">위키백과</string>
<string name="shared_string_show_details">세부 정보 보기</string> <string name="shared_string_show_details">세부 정보 보기</string>
<string name="osm_edit_context_menu_delete">OSM 편집을 삭제</string> <string name="osm_edit_context_menu_delete">OSM 편집을 삭제</string>

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

@ -2033,7 +2033,7 @@
<string name="gps_network_not_enabled">Neįjungta vietos nustatymo paslauga. Įjungti?</string> <string name="gps_network_not_enabled">Neįjungta vietos nustatymo paslauga. Įjungti?</string>
<string name="shared_string_import2osmand">Importavimas į OsmAnd</string> <string name="shared_string_import2osmand">Importavimas į OsmAnd</string>
<string name="read_full_article">Skaityti visą straipsnį (internete)</string> <string name="read_full_article">Skaityti visą straipsnį (internete)</string>
<string name="download_wikipedia_item">Vikipedija</string> <string name="shared_string_wikipedia">Vikipedija</string>
<string name="local_indexes_cat_wiki">Vikipedija</string> <string name="local_indexes_cat_wiki">Vikipedija</string>
<string name="shared_string_show_details">Rodyti detales</string> <string name="shared_string_show_details">Rodyti detales</string>
<string name="osm_edit_context_menu_delete">Ištrinti OSM taisymus</string> <string name="osm_edit_context_menu_delete">Ištrinti OSM taisymus</string>

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

@ -2071,7 +2071,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="disable_recording_once_app_killed_descrp">GPX loggings tiks nopauzēts, ja aplikāciju nobeidzēs (caur nesenajiem appiem). (OsmAnd fona servisa indikācija pazudīs no Android piezīmju joslas)</string> <string name="disable_recording_once_app_killed_descrp">GPX loggings tiks nopauzēts, ja aplikāciju nobeidzēs (caur nesenajiem appiem). (OsmAnd fona servisa indikācija pazudīs no Android piezīmju joslas)</string>
<string name="shared_string_import2osmand">Importēt OsmAndā</string> <string name="shared_string_import2osmand">Importēt OsmAndā</string>
<string name="read_full_article">Lasīt visu rakstu (onlainā)</string> <string name="read_full_article">Lasīt visu rakstu (onlainā)</string>
<string name="download_wikipedia_item">Vikipēdija</string> <string name="shared_string_wikipedia">Vikipēdija</string>
<string name="local_indexes_cat_wiki">Vikipēdija</string> <string name="local_indexes_cat_wiki">Vikipēdija</string>
<string name="shared_string_show_details">Rādīt detaļas</string> <string name="shared_string_show_details">Rādīt detaļas</string>
<string name="osm_edit_context_menu_delete">Dzēst OSM labojumu</string> <string name="osm_edit_context_menu_delete">Dzēst OSM labojumu</string>

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

@ -504,7 +504,7 @@
<string name="lang_th">थाइ</string> <string name="lang_th">थाइ</string>
<string name="lang_te">तेलगु</string> <string name="lang_te">तेलगु</string>
<string name="read_full_article">पूर्ण लेख वाचा (ऑनलाइन)</string> <string name="read_full_article">पूर्ण लेख वाचा (ऑनलाइन)</string>
<string name="download_wikipedia_item">विकिपेडिया</string> <string name="shared_string_wikipedia">विकिपेडिया</string>
<string name="local_indexes_cat_wiki">विकिपेडिया</string> <string name="local_indexes_cat_wiki">विकिपेडिया</string>
<string name="welmode_download_maps">नकाशे डाउनलोड करा</string> <string name="welmode_download_maps">नकाशे डाउनलोड करा</string>
<string name="current_route">सद्ध्याचा मार्ग</string> <string name="current_route">सद्ध्याचा मार्ग</string>

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

@ -2135,7 +2135,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="disable_recording_once_app_killed_descrp">Po zakończeniu pracy aplikacji wstrzymuje rejestrowanie trasy. (Ikona pracy w tle znika z paska powiadomień)</string> <string name="disable_recording_once_app_killed_descrp">Po zakończeniu pracy aplikacji wstrzymuje rejestrowanie trasy. (Ikona pracy w tle znika z paska powiadomień)</string>
<string name="shared_string_import2osmand">Import do OsmAnd</string> <string name="shared_string_import2osmand">Import do OsmAnd</string>
<string name="read_full_article">Czytaj cały artykuł (online)</string> <string name="read_full_article">Czytaj cały artykuł (online)</string>
<string name="download_wikipedia_item">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string> <string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Pokaż szczegóły</string> <string name="shared_string_show_details">Pokaż szczegóły</string>
<string name="local_recordings_delete_all_confirm">Usunąć %1$d notatek?</string> <string name="local_recordings_delete_all_confirm">Usunąć %1$d notatek?</string>

2
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -1709,7 +1709,7 @@
<string name="osm_edit_context_menu_delete">Apagar Edição do OSM</string> <string name="osm_edit_context_menu_delete">Apagar Edição do OSM</string>
<string name="shared_string_show_details">Mostrar detalhes</string> <string name="shared_string_show_details">Mostrar detalhes</string>
<string name="read_full_article">Leia o artigo completo (on-line)</string> <string name="read_full_article">Leia o artigo completo (on-line)</string>
<string name="download_wikipedia_item">Wikipédia</string> <string name="shared_string_wikipedia">Wikipédia</string>
<string name="local_indexes_cat_wiki">Wikipédia</string> <string name="local_indexes_cat_wiki">Wikipédia</string>
<string name="download_wikipedia_maps">Wikipédia</string> <string name="download_wikipedia_maps">Wikipédia</string>
<string name="shared_string_import2osmand">Importar para OsmAnd</string> <string name="shared_string_import2osmand">Importar para OsmAnd</string>

6
OsmAnd/res/values-ru/phrases.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<resources> <resources>
<string name="poi_bakery">Булочная</string> <string name="poi_bakery">Булочная</string>
<string name="poi_alcohol">Винно-водочный магазин</string> <string name="poi_alcohol">Винно-водочный магазин</string>
@ -1251,8 +1251,8 @@
<string name="poi_stars_4s">Число звёзд: 4S (улучшенный первый класс)</string> <string name="poi_stars_4s">Число звёзд: 4S (улучшенный первый класс)</string>
<string name="poi_stars_5">Число звёзд: 5 (категория люкс)</string> <string name="poi_stars_5">Число звёзд: 5 (категория люкс)</string>
<string name="poi_stars_5s">Число звёзд: 5S (категория люкс+)</string> <string name="poi_stars_5s">Число звёзд: 5S (категория люкс+)</string>
<string name="poi_stars_5">Число звёзд: 6</string> <string name="poi_stars_6">Число звёзд: 6</string>
<string name="poi_stars_5">Число звёзд: 7</string> <string name="poi_stars_7">Число звёзд: 7</string>
<string name="poi_rooms">Количество номеров</string> <string name="poi_rooms">Количество номеров</string>
<string name="poi_love_hotel">Love-отель</string> <string name="poi_love_hotel">Love-отель</string>

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

@ -1986,7 +1986,7 @@
<string name="osmo_share_my_location">Поделиться моим местоположением</string> <string name="osmo_share_my_location">Поделиться моим местоположением</string>
<string name="shared_string_logoff">Выход</string> <string name="shared_string_logoff">Выход</string>
<string name="index_name_netherlands">Европа - Нидерланды</string> <string name="index_name_netherlands">Европа - Нидерланды</string>
<string name="download_wikipedia_item">Википедия</string> <string name="shared_string_wikipedia">Википедия</string>
<string name="local_indexes_cat_wiki">Википедия</string> <string name="local_indexes_cat_wiki">Википедия</string>
<string name="shared_string_show_details">Показать детали</string> <string name="shared_string_show_details">Показать детали</string>
<string name="download_wikipedia_maps">Википедия</string> <string name="download_wikipedia_maps">Википедия</string>

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

@ -2172,7 +2172,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="rendering_value_walkingRoutesOSMC_name">Zafarbenie podľa OSMC</string> <string name="rendering_value_walkingRoutesOSMC_name">Zafarbenie podľa OSMC</string>
<string name="osm_edit_context_menu_delete">Odstrániť OSM zmenu</string> <string name="osm_edit_context_menu_delete">Odstrániť OSM zmenu</string>
<string name="read_full_article">Prečítať celý článok (online)</string> <string name="read_full_article">Prečítať celý článok (online)</string>
<string name="download_wikipedia_item">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string> <string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Zobraziť detaily</string> <string name="shared_string_show_details">Zobraziť detaily</string>
<string name="download_wikipedia_maps">Wikipedia</string> <string name="download_wikipedia_maps">Wikipedia</string>

47
OsmAnd/res/values-sl/strings.xml
View file

@ -79,7 +79,7 @@
<string name="email">elektronski naslov</string> <string name="email">elektronski naslov</string>
<string name="tip_recent_changes_0_8_4_t">"Spremembe v 0.8.4: <string name="tip_recent_changes_0_8_4_t">"Spremembe v 0.8.4:
\n\t* Odpravljene so nekatere napake delovanja\n\t* Zemljevid med prekinitvami ne izgubi pridobljenega položaja \n\t* Odpravljene so nekatere napake delovanja\n\t* Zemljevid med prekinitvami ne izgubi pridobljenega položaja
\n\t* Med navigacijo je omogočeno izvajanje storitev v pripravljenosti "</string> \n\t* Med navigacijo omogoči delovanje storitev v ozadju "</string>
<string name="tip_recent_changes_0_8_3_t">"Spremembe v 0.8.3: <string name="tip_recent_changes_0_8_3_t">"Spremembe v 0.8.3:
\n\t* Vmesne točke \n\t* Vmesne točke
\n\t* Izboljšano vodenje po poti\n\t* Možnost izogibanja avtocestam pri pripravi poti\n\t* Dodana nova vrsta kolesarske poti na zemljevid (Cycleway) \n\t* Izboljšano vodenje po poti\n\t* Možnost izogibanja avtocestam pri pripravi poti\n\t* Dodana nova vrsta kolesarske poti na zemljevid (Cycleway)
@ -347,8 +347,8 @@
<string name="map_widget_view_direction">Smer gledanja</string> <string name="map_widget_view_direction">Smer gledanja</string>
<string name="map_widget_transparent">Prosojni bočni pult</string> <string name="map_widget_transparent">Prosojni bočni pult</string>
<string name="use_transparent_map_theme">Prosojna tema</string> <string name="use_transparent_map_theme">Prosojna tema</string>
<string name="bg_service_sleep_mode_off">Omogoči\n način spanja</string> <string name="bg_service_sleep_mode_off">Omogoči\n ozadnji način delovanja</string>
<string name="bg_service_sleep_mode_on">Ustavi\n način spanja</string> <string name="bg_service_sleep_mode_on">Zaustavi\n ozadnji način delovanja</string>
<string name="gps_wakeup_interval">Interval prebujanja GPS: na %s</string> <string name="gps_wakeup_interval">Interval prebujanja GPS: na %s</string>
<string name="int_continuosly">neprekinjeno delovanje</string> <string name="int_continuosly">neprekinjeno delovanje</string>
<string name="screen_is_locked">Za odklepanje zaslona pritisnite ikono ključavnice</string> <string name="screen_is_locked">Za odklepanje zaslona pritisnite ikono ključavnice</string>
@ -408,7 +408,7 @@
\n\t* Izboljšano usmerjanje: hitrejše in natančnejše; do 250 km \n\t* Izboljšano usmerjanje: hitrejše in natančnejše; do 250 km
\n\t* Možnost prikaza le cest \n\t* Možnost prikaza le cest
\n\t* Zemljevid med prekinitvami ne izgubi pridobljenega položaja \n\t* Zemljevid med prekinitvami ne izgubi pridobljenega položaja
\n\t* Med navigacijo je omogočeno izvajanje storitev v pripravljenosti "</string> \n\t* Med navigacijo omogoči delovanje storitev v ozadju "</string>
<string name="close_changeset">Zapri paket sprememb</string> <string name="close_changeset">Zapri paket sprememb</string>
<string name="zxing_barcode_scanner_not_found">Program ZXing Barcode Scanner ni nameščen. Ali želite program poiskati?</string> <string name="zxing_barcode_scanner_not_found">Program ZXing Barcode Scanner ni nameščen. Ali želite program poiskati?</string>
<string name="rendering_attr_roadColors_description">Izberite barvno shemo cest:</string> <string name="rendering_attr_roadColors_description">Izberite barvno shemo cest:</string>
@ -444,7 +444,7 @@
<string name="osmand_development_plugin_description">Vstavek omogoča prikaz nastavitev za razvoj in razhroščevanje programa. Med možnostmi so simuliranje vodenja poti, hitrost izrisovanja zemljevida na zaslonu, glasovni opomniki in podobno. Nastavitve so namenjene razvijalcem programske opreme.</string> <string name="osmand_development_plugin_description">Vstavek omogoča prikaz nastavitev za razvoj in razhroščevanje programa. Med možnostmi so simuliranje vodenja poti, hitrost izrisovanja zemljevida na zaslonu, glasovni opomniki in podobno. Nastavitve so namenjene razvijalcem programske opreme.</string>
<string name="osmand_accessibility_description">Vstavek omogoča nastavljanje in uporabo možnosti dostopnosti pri uporabi programa OsmAnd. Podpira prilagajanje hitrosti govora med vodenjem, nastavljanje prikaza zaslona in prikaz sledilnika za nadzor pogleda zemljevida. Omogoča tudi glasovno objavljanje mesta.</string> <string name="osmand_accessibility_description">Vstavek omogoča nastavljanje in uporabo možnosti dostopnosti pri uporabi programa OsmAnd. Podpira prilagajanje hitrosti govora med vodenjem, nastavljanje prikaza zaslona in prikaz sledilnika za nadzor pogleda zemljevida. Omogoča tudi glasovno objavljanje mesta.</string>
<string name="osmand_background_plugin_description">Prikaži nastavitve za sledenje in navigacijo v načinu pripravljenosti (izklopljen zaslon) in občasno uporabo GPS.</string> <string name="osmand_background_plugin_description">Prikaži nastavitve za sledenje in navigacijo v ozadnjem načinu (izklopljen zaslon) in občasno uporabo GPS.</string>
<string name="shared_string_close">Zapri</string> <string name="shared_string_close">Zapri</string>
<string name="opening_hours">Delovni čas</string> <string name="opening_hours">Delovni čas</string>
<string name="send_location_way_choose_title">Za objavljanje trenutnega mesta uporabi:</string> <string name="send_location_way_choose_title">Za objavljanje trenutnega mesta uporabi:</string>
@ -684,8 +684,8 @@
<string name="settings_preset">Privzeti profil</string> <string name="settings_preset">Privzeti profil</string>
<string name="global_settings">Splošne nastavitve</string> <string name="global_settings">Splošne nastavitve</string>
<string name="index_settings">Upravljalnik datotek zemljevidov</string> <string name="index_settings">Upravljalnik datotek zemljevidov</string>
<string name="osmand_service">Način pripravljenosti</string> <string name="osmand_service">Način delovanja v ozadju</string>
<string name="osmand_service_descr">Uporabi za izvajanje OsmAnd, ko je zaslon izklopljen</string> <string name="osmand_service_descr">Osmand se zažene v ozadju, ko je zaslon izklopljen</string>
<string name="tip_day_night_mode">Dnevni/Nočni način</string> <string name="tip_day_night_mode">Dnevni/Nočni način</string>
<string name="daynight_mode_auto">Glede na sončni vzhod in zahod</string> <string name="daynight_mode_auto">Glede na sončni vzhod in zahod</string>
@ -886,7 +886,7 @@
<string name="background_service_provider_descr">Izberite ponudnika določevanja mesta med izvajanjem v ozadju</string> <string name="background_service_provider_descr">Izberite ponudnika določevanja mesta med izvajanjem v ozadju</string>
<string name="background_service_provider">Ponudnik mesta</string> <string name="background_service_provider">Ponudnik mesta</string>
<string name="background_router_service_descr">Izvaja OsmAnd v ozadju in omogoča spremljanje položaja, ko je zaslon izklopljen</string> <string name="background_router_service_descr">Izvaja OsmAnd v ozadju in omogoča spremljanje položaja, ko je zaslon izklopljen</string>
<string name="background_router_service">Izvajaj v ozadju</string> <string name="background_router_service">Zaženi OsmAnd v ozadju</string>
<string name="off_router_service_no_gps_available">Storitev navigacije v ozadju zahteva, da je zagnan vsaj en program, ki zahteva te podatke.</string> <string name="off_router_service_no_gps_available">Storitev navigacije v ozadju zahteva, da je zagnan vsaj en program, ki zahteva te podatke.</string>
<string name="search_poi_filter">Filter</string> <string name="search_poi_filter">Filter</string>
@ -1215,9 +1215,9 @@
<string name="av_photo_play_sound_descr">Ali naj se med fotografiranjem predvaja zvok</string> <string name="av_photo_play_sound_descr">Ali naj se med fotografiranjem predvaja zvok</string>
<string name="speak_speed_limit">Najavi omejitve hitrosti</string> <string name="speak_speed_limit">Omejitve hitrosti</string>
<string name="speak_cameras">Najavi hitrostne kamere</string> <string name="speak_cameras">Hitrostne kamere</string>
<string name="speak_traffic_warnings">Najavi prometna opozorila</string> <string name="speak_traffic_warnings">Pometna opozorila</string>
<string name="tip_recent_changes_1_5_t">"Spremembe v 1.5: <string name="tip_recent_changes_1_5_t">"Spremembe v 1.5:
\n\t* Glasovna opozorila o omejitvah hitrosti in kamere\n\t* Več možnosti glasovnih pozivov (najavljanje imen ulic)\n\t* Ikone za mape visoke gostote\n\t* Veliko sprememb v uporabniškem vmesniku\n\t* Popravek hroščev pri prikazu razdalj, analizatorju GPX, upravljanju točk, orodju za načrtovanje, nalaganje na OSM, pri uporabi protokola HTTPS in drugo "</string> \n\t* Glasovna opozorila o omejitvah hitrosti in kamere\n\t* Več možnosti glasovnih pozivov (najavljanje imen ulic)\n\t* Ikone za mape visoke gostote\n\t* Veliko sprememb v uporabniškem vmesniku\n\t* Popravek hroščev pri prikazu razdalj, analizatorju GPX, upravljanju točk, orodju za načrtovanje, nalaganje na OSM, pri uporabi protokola HTTPS in drugo "</string>
<string name="osb_author_or_password_not_specified">V nastavitvah je treba določiti uporabniško ime in geslo za OSM</string> <string name="osb_author_or_password_not_specified">V nastavitvah je treba določiti uporabniško ime in geslo za OSM</string>
@ -1233,10 +1233,10 @@
<string name="osb_author_dialog_password">Geslo OSM (neobvezno)</string> <string name="osb_author_dialog_password">Geslo OSM (neobvezno)</string>
<string name="announce_gpx_waypoints">Najavljanje vmesnih točk GPX</string> <string name="announce_gpx_waypoints">Vmesne točke GPX</string>
<string name="speak_title">Najavi …</string> <string name="speak_title">Najavi …</string>
<string name="speak_descr">Nastavitve za najavljanje imen ulic, prometnih opozoril (ležeče ovire in podobno), opozoril merilnikov hitrosti, omejitve hitrosti in drugo</string> <string name="speak_descr">Nastavitve za najavljanje imen ulic, prometnih opozoril (ležeče ovire in podobno), opozoril merilnikov hitrosti, omejitve hitrosti in drugo</string>
<string name="speak_street_names">Najavi imena ulic (TTS)</string> <string name="speak_street_names">Imena ulic (TTS)</string>
<string name="map_widget_fps_info">Podatki razhroščevanja FPS</string> <string name="map_widget_fps_info">Podatki razhroščevanja FPS</string>
<string name="driving_region_descr">Izbira določil vožnje: ZDA, Evropa, Velika Britanija, Azija in druga</string> <string name="driving_region_descr">Izbira določil vožnje: ZDA, Evropa, Velika Britanija, Azija in druga</string>
<string name="driving_region">Režim vožnje</string> <string name="driving_region">Režim vožnje</string>
@ -1541,9 +1541,9 @@
<string name="no_index_file_to_download">Prejetih datotek ni mogoče najti. Preverite internetno povezavo.</string> <string name="no_index_file_to_download">Prejetih datotek ni mogoče najti. Preverite internetno povezavo.</string>
<string name="keep_navigation_service">Obdrži</string> <string name="keep_navigation_service">Obdrži</string>
<string name="stop_navigation_service">Prekini</string> <string name="stop_navigation_service">Prekini</string>
<string name="enable_sleep_mode">Način delovanja sprejemnika GPS</string> <string name="enable_sleep_mode">Omogoči način delovanja GPS v ozadju</string>
<string name="gps_wake_up_timer">Interval prebujanja GPS</string> <string name="gps_wake_up_timer">Interval prebujanja GPS</string>
<string name="sleep_mode_stop_dialog">Nastavitve delovanja sprejemnika GPS</string> <string name="sleep_mode_stop_dialog">Ali želite prekiniti ozadnji način GPS?</string>
<string name="map_preferred_locale_descr">Prednostno uporabljeni jezik oznak na zemljevidu (če jezik ni na voljo, so uporabljene angleške ali krajevne oznake)</string> <string name="map_preferred_locale_descr">Prednostno uporabljeni jezik oznak na zemljevidu (če jezik ni na voljo, so uporabljene angleške ali krajevne oznake)</string>
<string name="map_preferred_locale">Jezik oznak na zemljevidu</string> <string name="map_preferred_locale">Jezik oznak na zemljevidu</string>
<string name="local_map_names">Krajevna imena</string> <string name="local_map_names">Krajevna imena</string>
@ -1610,7 +1610,7 @@
<string name="rendering_value_pedestrian_name">Pešačenje</string> <string name="rendering_value_pedestrian_name">Pešačenje</string>
<string name="way_alarms">Prometna opozorila</string> <string name="way_alarms">Prometna opozorila</string>
<string name="speak_favorites">Najavi bližnje priljubljene točke</string> <string name="speak_favorites">Bližnje priljubljene točke</string>
<string name="int_hour">ur</string> <string name="int_hour">ur</string>
<string name="duration">Trajanje</string> <string name="duration">Trajanje</string>
<string name="distance">Razdalja</string> <string name="distance">Razdalja</string>
@ -1624,7 +1624,7 @@
<string name="record_plugin_name">Dnevnik potovanj</string> <string name="record_plugin_name">Dnevnik potovanj</string>
<string name="index_tours">Izleti</string> <string name="index_tours">Izleti</string>
<string name="waypoints">Vmesne točke</string> <string name="waypoints">Vmesne točke</string>
<string name="speak_poi">Najavi bližnje točke POI</string> <string name="speak_poi">Bližnje točke POI</string>
<string name="rendering_value_browse_map_name">Poišči na zemljevidu</string> <string name="rendering_value_browse_map_name">Poišči na zemljevidu</string>
<string name="rendering_attr_alpineHiking_description">Izriši poti po lestvici SAC</string> <string name="rendering_attr_alpineHiking_description">Izriši poti po lestvici SAC</string>
<string name="pause_navigation">Ustavi navigacijo</string> <string name="pause_navigation">Ustavi navigacijo</string>
@ -1718,7 +1718,7 @@
<string name="osmo_use_https_descr">Uporabi varno povezavo s strežnikom</string> <string name="osmo_use_https_descr">Uporabi varno povezavo s strežnikom</string>
<string name="error_avoid_specific_road">Ni najdenih možnosti obvoza</string> <string name="error_avoid_specific_road">Ni najdenih možnosti obvoza</string>
<string name="voices">Glasovna navodila</string> <string name="voices">Glasovna navodila</string>
<string name="speak_pedestrian">Najavi prehode za pešce</string> <string name="speak_pedestrian">Prehodi za pešce</string>
<string name="navigate_point_zone">Območje</string> <string name="navigate_point_zone">Območje</string>
<string name="navigate_point_northing">Koordinata v smeri proti severu</string> <string name="navigate_point_northing">Koordinata v smeri proti severu</string>
<string name="navigate_point_easting">Koordinata v smeri proti vzhodu</string> <string name="navigate_point_easting">Koordinata v smeri proti vzhodu</string>
@ -1867,7 +1867,7 @@
<string name="rendering_value_walkingRoutesOSMC_name">Barvanje poti po OSMC</string> <string name="rendering_value_walkingRoutesOSMC_name">Barvanje poti po OSMC</string>
<string name="osm_edit_context_menu_delete">Izbriši urejanje OSM</string> <string name="osm_edit_context_menu_delete">Izbriši urejanje OSM</string>
<string name="read_full_article">Pokaži celoten prispevek</string> <string name="read_full_article">Pokaži celoten prispevek</string>
<string name="download_wikipedia_item">Wikipedija</string> <string name="shared_string_wikipedia">Wikipedija</string>
<string name="local_indexes_cat_wiki">Wikipedija</string> <string name="local_indexes_cat_wiki">Wikipedija</string>
<string name="shared_string_show_details">Pokaži podrobnosti</string> <string name="shared_string_show_details">Pokaži podrobnosti</string>
<string name="download_wikipedia_maps">Wikipedija</string> <string name="download_wikipedia_maps">Wikipedija</string>
@ -1981,4 +1981,13 @@
<string name="saved_at_time">Uspešno shranjeno ob: %1$s</string> <string name="saved_at_time">Uspešno shranjeno ob: %1$s</string>
<string name="poi_deleted_localy">Točka POI bo izbrisana po pošiljanju sprememb</string> <string name="poi_deleted_localy">Točka POI bo izbrisana po pošiljanju sprememb</string>
<string name="show_gpx">Pokaži GPX</string> <string name="show_gpx">Pokaži GPX</string>
<string name="simulate_your_location_stop_descr">Zaustavi simuliranje položaja</string>
<string name="simulate_your_location_descr">Simuliraj s shranjeno potjo GPX oziroma izračunano potjo</string>
<string name="address_unknown">Naslov še ni znan</string>
<string name="show_on_start">Pokaži ob zagonu</string>
<string name="count_of_lines">Seštevek vrstic</string>
<string name="are_you_sure">Ali ste prepričani?</string>
<string name="unsaved_changes_will_be_lost">Vse neshranjene spremembe bodo izgubljene. Ali želite nadaljevati?</string>
<string name="downloads_left_template">%1$s prejemov v vrsti</string>
<string name="roads">Poti</string>
</resources> </resources>

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

@ -1884,7 +1884,7 @@
<string name="osm_edit_context_menu_delete">Ta bort OSM-redigering</string> <string name="osm_edit_context_menu_delete">Ta bort OSM-redigering</string>
<string name="rendering_value_walkingRoutesOSMC_name">Färgläggning efter OSMC</string> <string name="rendering_value_walkingRoutesOSMC_name">Färgläggning efter OSMC</string>
<string name="read_full_article">Läs hela artikeln (online)</string> <string name="read_full_article">Läs hela artikeln (online)</string>
<string name="download_wikipedia_item">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string> <string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Visa detaljer</string> <string name="shared_string_show_details">Visa detaljer</string>
<string name="local_recordings_delete_all_confirm">Du håller på att ta bort %1$d anteckningar. Är du säker?</string> <string name="local_recordings_delete_all_confirm">Du håller på att ta bort %1$d anteckningar. Är du säker?</string>

2
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -1996,7 +1996,7 @@
<string name="rendering_value_walkingRoutesOSMC_name">依據 OSMC 來著色</string> <string name="rendering_value_walkingRoutesOSMC_name">依據 OSMC 來著色</string>
<string name="osm_edit_context_menu_delete">刪除 OSM 的編輯</string> <string name="osm_edit_context_menu_delete">刪除 OSM 的編輯</string>
<string name="read_full_article">閱讀全部文章 (線上)</string> <string name="read_full_article">閱讀全部文章 (線上)</string>
<string name="download_wikipedia_item">維基百科</string> <string name="shared_string_wikipedia">維基百科</string>
<string name="local_indexes_cat_wiki">維基百科</string> <string name="local_indexes_cat_wiki">維基百科</string>
<string name="shared_string_show_details">顯示詳細資訊</string> <string name="shared_string_show_details">顯示詳細資訊</string>
<string name="download_wikipedia_maps">維基百科</string> <string name="download_wikipedia_maps">維基百科</string>

3
OsmAnd/res/values/strings.xml
View file

@ -82,7 +82,7 @@
<string name="disable_recording_once_app_killed_descrp">Will pause GPX logging when the app is killed (via recent apps). (OsmAnd background indication disappears from the Android notification bar.)</string> <string name="disable_recording_once_app_killed_descrp">Will pause GPX logging when the app is killed (via recent apps). (OsmAnd background indication disappears from the Android notification bar.)</string>
<string name="shared_string_import2osmand">Import to OsmAnd</string> <string name="shared_string_import2osmand">Import to OsmAnd</string>
<string name="read_full_article">Read full article (online)</string> <string name="read_full_article">Read full article (online)</string>
<string name="download_wikipedia_item">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki">Wikipedia</string> <string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Show details</string> <string name="shared_string_show_details">Show details</string>
<string name="osm_edit_context_menu_delete">Delete OSM Edit</string> <string name="osm_edit_context_menu_delete">Delete OSM Edit</string>
@ -2273,4 +2273,5 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="are_you_sure">Are you sure?</string> <string name="are_you_sure">Are you sure?</string>
<string name="unsaved_changes_will_be_lost">Any unsaved changes will be lost. Continue?</string> <string name="unsaved_changes_will_be_lost">Any unsaved changes will be lost. Continue?</string>
<string name="downloads_left_template">%1$s downloads left</string> <string name="downloads_left_template">%1$s downloads left</string>
<string name="roads">Roads</string>
</resources> </resources>

14
OsmAnd/src/net/osmand/plus/GPXUtilities.java
View file

@ -226,7 +226,8 @@ public class GPXUtilities {
double totalSpeedSum = 0; double totalSpeedSum = 0;
points = 0; points = 0;
double channelThres = 10; double channelThresMin = 5; // Minimum oscillation amplitude considered as noise for Up/Down analysis
double channelThres = channelThresMin; // Actual oscillation amplitude considered as noise, try depedency on current hdop
double channelBase; double channelBase;
double channelTop; double channelTop;
double channelBottom; double channelBottom;
@ -238,6 +239,7 @@ public class GPXUtilities {
channelBase = 99999; channelBase = 99999;
channelTop = channelBase; channelTop = channelBase;
channelBottom = channelBase; channelBottom = channelBase;
channelThres = channelThresMin;
metricEnd += s.metricEnd; metricEnd += s.metricEnd;
points += numberOfPoints; points += numberOfPoints;
@ -271,18 +273,26 @@ public class GPXUtilities {
} }
// Trend channel approach for elevation gain/loss, Hardy 2015-09-22 // Trend channel approach for elevation gain/loss, Hardy 2015-09-22
// Self-adjusting turnarund threshold added for testing 2015-09-25: Current rule is now: "All up/down trends of amplitude <X are ignored to smooth the noise, where X is the maximum observed DOP value of any point which contributed to the current trend (but at least 5 m as the minimum noise threshold)".
if (!Double.isNaN(point.ele)) { if (!Double.isNaN(point.ele)) {
// Init channel // Init channel
if (channelBase == 99999) { if (channelBase == 99999) {
channelBase = point.ele; channelBase = point.ele;
channelTop = channelBase; channelTop = channelBase;
channelBottom = channelBase; channelBottom = channelBase;
channelThres = channelThresMin;
} }
// Channel maintenance // Channel maintenance
if (point.ele > channelTop) { if (point.ele > channelTop) {
channelTop = point.ele; channelTop = point.ele;
if (!Double.isNaN(point.hdop)) {
channelThres = Math.max(channelThres, 2.0*point.hdop); //Try empirical 2*hdop, may better serve very flat tracks, or high dop tracks
}
} else if (point.ele < channelBottom) { } else if (point.ele < channelBottom) {
channelBottom = point.ele; channelBottom = point.ele;
if (!Double.isNaN(point.hdop)) {
channelThres = Math.max(channelThres, 2.0*point.hdop);
}
} }
// Turnaround (breakout) detection // Turnaround (breakout) detection
if ((point.ele <= (channelTop - channelThres)) && (climb == true)) { if ((point.ele <= (channelTop - channelThres)) && (climb == true)) {
@ -292,6 +302,7 @@ public class GPXUtilities {
channelBase = channelTop; channelBase = channelTop;
channelBottom = point.ele; channelBottom = point.ele;
climb = false; climb = false;
channelThres = channelThresMin;
} else if ((point.ele >= (channelBottom + channelThres)) && (climb == false)) { } else if ((point.ele >= (channelBottom + channelThres)) && (climb == false)) {
if ((channelBase - channelBottom) >= channelThres) { if ((channelBase - channelBottom) >= channelThres) {
diffElevationDown += channelBase - channelBottom; diffElevationDown += channelBase - channelBottom;
@ -299,6 +310,7 @@ public class GPXUtilities {
channelBase = channelBottom; channelBase = channelBottom;
channelTop = point.ele; channelTop = point.ele;
climb = true; climb = true;
channelThres = channelThresMin;
} }
// End detection without breakout // End detection without breakout
if (j == (numberOfPoints -1)) { if (j == (numberOfPoints -1)) {

24
OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
View file

@ -1,15 +1,6 @@
package net.osmand.plus.download; package net.osmand.plus.download;
import static net.osmand.IndexConstants.BINARY_MAP_INDEX_EXT; import android.content.Context;
import java.io.File;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
@ -22,7 +13,16 @@ import net.osmand.util.Algorithms;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import android.content.Context; import java.io.File;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import static net.osmand.IndexConstants.BINARY_MAP_INDEX_EXT;
public class DownloadActivityType { public class DownloadActivityType {
private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd.MM.yyyy"); private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd.MM.yyyy");
@ -222,7 +222,7 @@ public class DownloadActivityType {
if (this == DownloadActivityType.SRTM_COUNTRY_FILE) { if (this == DownloadActivityType.SRTM_COUNTRY_FILE) {
return ctx.getString(R.string.download_srtm_maps); return ctx.getString(R.string.download_srtm_maps);
} else if (this == DownloadActivityType.WIKIPEDIA_FILE) { } else if (this == DownloadActivityType.WIKIPEDIA_FILE) {
return ctx.getString(R.string.download_wikipedia_item); return ctx.getString(R.string.shared_string_wikipedia);
} else if (this == DownloadActivityType.ROADS_FILE) { } else if (this == DownloadActivityType.ROADS_FILE) {
return ctx.getString(R.string.download_roads_only_item); return ctx.getString(R.string.download_roads_only_item);
} }

87
OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
View file

@ -398,10 +398,6 @@ public class DownloadIndexesThread {
} }
public void runReloadIndexFiles() { public void runReloadIndexFiles() {
runReloadIndexFiles(false);
}
public void runReloadIndexFiles(final boolean withSubcats) {
checkRunning(); checkRunning();
final BasicProgressAsyncTask<Void, Void, IndexFileList> inst final BasicProgressAsyncTask<Void, Void, IndexFileList> inst
= new BasicProgressAsyncTask<Void, Void, IndexFileList>(ctx) { = new BasicProgressAsyncTask<Void, Void, IndexFileList>(ctx) {
@ -447,7 +443,8 @@ public class DownloadIndexesThread {
currentRunningTask.remove(this); currentRunningTask.remove(this);
if (uiActivity != null) { if (uiActivity != null) {
uiActivity.updateProgress(false); uiActivity.updateProgress(false);
runCategorization(uiActivity.getDownloadType(), withSubcats); runCategorization(uiActivity.getDownloadType());
runCategorization(); // for new implementation
} }
} }
@ -481,12 +478,8 @@ public class DownloadIndexesThread {
} }
} }
;
}; };
execute(inst); execute(inst);
} }
public void runDownloadFiles() { public void runDownloadFiles() {
@ -510,14 +503,9 @@ public class DownloadIndexesThread {
} }
public void runCategorization(final DownloadActivityType type) { public void runCategorization(final DownloadActivityType type) {
runCategorization(type, false);
}
public void runCategorization(final DownloadActivityType type, final boolean withSubcats) {
final BasicProgressAsyncTask<Void, Void, List<IndexItem>> inst final BasicProgressAsyncTask<Void, Void, List<IndexItem>> inst
= new BasicProgressAsyncTask<Void, Void, List<IndexItem>>(ctx) { = new BasicProgressAsyncTask<Void, Void, List<IndexItem>>(ctx) {
private List<IndexItemCategory> cats; private List<IndexItemCategory> cats;
private List<IndexItemCategoryWithSubcat> catsWithSubcats;
@Override @Override
protected void onPreExecute() { protected void onPreExecute() {
@ -532,12 +520,7 @@ public class DownloadIndexesThread {
@Override @Override
protected List<IndexItem> doInBackground(Void... params) { protected List<IndexItem> doInBackground(Void... params) {
final List<IndexItem> filtered = getFilteredByType(); final List<IndexItem> filtered = getFilteredByType();
if (withSubcats) { cats = IndexItemCategory.categorizeIndexItems(app, filtered);
catsWithSubcats =
IndexItemCategoryWithSubcat.categorizeIndexItems(app, filtered);
} else {
cats = IndexItemCategory.categorizeIndexItems(app, filtered);
}
updateLoadedFiles(); updateLoadedFiles();
return filtered; return filtered;
} }
@ -563,11 +546,7 @@ public class DownloadIndexesThread {
prepareFilesToUpdate(); prepareFilesToUpdate();
currentRunningTask.remove(this); currentRunningTask.remove(this);
if (uiActivity != null) { if (uiActivity != null) {
if (withSubcats) { uiActivity.categorizationFinished(filtered, cats);
uiActivity.onCategorizationFinished(filtered, catsWithSubcats);
} else {
uiActivity.categorizationFinished(filtered, cats);
}
uiActivity.updateProgress(false); uiActivity.updateProgress(false);
} }
} }
@ -584,6 +563,62 @@ public class DownloadIndexesThread {
execute(inst); execute(inst);
} }
public void runCategorization() {
final BasicProgressAsyncTask<Void, Void, List<IndexItem>> inst
= new BasicProgressAsyncTask<Void, Void, List<IndexItem>>(ctx) {
private List<IndexItemCategoryWithSubcat> catsWithSubcats;
@Override
protected void onPreExecute() {
super.onPreExecute();
currentRunningTask.add(this);
this.message = ctx.getString(R.string.downloading_list_indexes);
if (uiActivity != null) {
uiActivity.updateProgress(false);
}
}
@Override
protected List<IndexItem> doInBackground(Void... params) {
final List<IndexItem> filtered = getFilteredByType();
catsWithSubcats =
IndexItemCategoryWithSubcat.categorizeIndexItems(app, filtered);
updateLoadedFiles();
return filtered;
}
public List<IndexItem> getFilteredByType() {
final List<IndexItem> filtered = new ArrayList<IndexItem>();
List<IndexItem> cachedIndexFiles = getCachedIndexFiles();
if (cachedIndexFiles != null) {
for (IndexItem file : cachedIndexFiles) {
filtered.add(file);
}
}
return filtered;
}
@Override
protected void onPostExecute(List<IndexItem> filtered) {
prepareFilesToUpdate();
currentRunningTask.remove(this);
if (uiActivity != null) {
uiActivity.onCategorizationFinished(filtered, catsWithSubcats);
uiActivity.updateProgress(false);
}
}
@Override
protected void updateProgress(boolean updateOnlyProgress) {
if (uiActivity != null) {
uiActivity.updateProgress(updateOnlyProgress);
}
}
};
execute(inst);
}
private void prepareFilesToUpdate() { private void prepareFilesToUpdate() {
List<IndexItem> filtered = getCachedIndexFiles(); List<IndexItem> filtered = getCachedIndexFiles();
if (filtered != null) { if (filtered != null) {
@ -734,6 +769,4 @@ public class DownloadIndexesThread {
} }
return i; return i;
} }
} }

21
OsmAnd/src/net/osmand/plus/download/IndexItem.java
View file

@ -30,6 +30,7 @@ public class IndexItem implements Comparable<IndexItem>, HasName {
DownloadActivityType type; DownloadActivityType type;
boolean extra; boolean extra;
private String initializedName;
public IndexItem(String fileName, String description, long timestamp, String size, long contentSize, public IndexItem(String fileName, String description, long timestamp, String size, long contentSize,
long containerSize, DownloadActivityType tp) { long containerSize, DownloadActivityType tp) {
@ -145,6 +146,24 @@ public class IndexItem implements Comparable<IndexItem>, HasName {
@Override @Override
public String getName() { public String getName() {
return getBasename(); return initializedName;
}
public void setName(String initializedName) {
this.initializedName = initializedName;
}
@Override
public String toString() {
return "IndexItem{" +
"description='" + description + '\'' +
", fileName='" + fileName + '\'' +
", size='" + size + '\'' +
", timestamp=" + timestamp +
", contentSize=" + contentSize +
", containerSize=" + containerSize +
", type=" + type.getTag() +
", extra=" + extra +
'}';
} }
} }

29
OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
View file

@ -1,18 +1,5 @@
package net.osmand.plus.download; package net.osmand.plus.download;
import java.text.MessageFormat;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import net.osmand.access.AccessibleToast;
import net.osmand.map.OsmandRegions;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.OsmAndListFragment;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
@ -30,6 +17,20 @@ import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import net.osmand.access.AccessibleToast;
import net.osmand.map.OsmandRegions;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.OsmAndListFragment;
import java.text.MessageFormat;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
/** /**
* Created by Denis * Created by Denis
* on 09.09.2014. * on 09.09.2014.
@ -340,7 +341,7 @@ public class UpdatesIndexFragment extends OsmAndListFragment {
if (resId == R.string.download_regular_maps){ if (resId == R.string.download_regular_maps){
return activity.getString(R.string.shared_string_map); return activity.getString(R.string.shared_string_map);
} else if (resId == R.string.download_wikipedia_maps){ } else if (resId == R.string.download_wikipedia_maps){
return activity.getString(R.string.download_wikipedia_item); return activity.getString(R.string.shared_string_wikipedia);
} else if (resId == R.string.voices) { } else if (resId == R.string.voices) {
return item.getTargetFileName().contains("tts") ? activity.getString(R.string.ttsvoice) : activity return item.getTargetFileName().contains("tts") ? activity.getString(R.string.ttsvoice) : activity
.getString(R.string.voice); .getString(R.string.voice);

132
OsmAnd/src/net/osmand/plus/download/newimplementation/CategoryStaticData.java Normal file
View file

@ -0,0 +1,132 @@
package net.osmand.plus.download.newimplementation;
import android.os.Parcel;
import android.os.Parcelable;
import net.osmand.plus.R;
public class CategoryStaticData implements Parcelable {
public static final CategoryStaticData WORLD_WIDE_AND_TOPIC =
new CategoryStaticData(R.string.index_name_other, 0);
public static final CategoryStaticData NAME_VOICE =
new CategoryStaticData(R.string.index_name_voice, 1);
public static final CategoryStaticData TTS_VOICE =
new CategoryStaticData(R.string.index_name_tts_voice, 2);
public static final CategoryStaticData WIKI =
new CategoryStaticData(R.string.index_name_wiki, 10);
public static final CategoryStaticData OPENMAPS =
new CategoryStaticData(R.string.index_name_openmaps, 90);
public static final CategoryStaticData NORTH_AMERICA =
new CategoryStaticData(R.string.index_name_north_america, 30);
public static final CategoryStaticData US =
new CategoryStaticData(R.string.index_name_us, 31, NORTH_AMERICA);
public static final CategoryStaticData CANADA =
new CategoryStaticData(R.string.index_name_canada, 32, NORTH_AMERICA);
public static final CategoryStaticData CENTRAL_AMERICA =
new CategoryStaticData(R.string.index_name_central_america, 40);
public static final CategoryStaticData SOUTH_AMERICA =
new CategoryStaticData(R.string.index_name_south_america, 45);
public static final CategoryStaticData RUSSIA =
new CategoryStaticData(R.string.index_name_russia, 25);
public static final CategoryStaticData EUROPE =
new CategoryStaticData(R.string.index_name_europe, 15);
public static final CategoryStaticData GERMANY =
new CategoryStaticData(R.string.index_name_germany, 16, EUROPE);
public static final CategoryStaticData FRANCE =
new CategoryStaticData(R.string.index_name_france, 17, EUROPE);
public static final CategoryStaticData ITALY =
new CategoryStaticData(R.string.index_name_italy, 18, EUROPE);
public static final CategoryStaticData GB =
new CategoryStaticData(R.string.index_name_gb, 19, EUROPE);
public static final CategoryStaticData NETHERLANDS =
new CategoryStaticData(R.string.index_name_netherlands, 20, EUROPE);
public static final CategoryStaticData AFRICA =
new CategoryStaticData(R.string.index_name_africa, 80);
public static final CategoryStaticData ASIA =
new CategoryStaticData(R.string.index_name_asia, 50);
public static final CategoryStaticData OCEANIA =
new CategoryStaticData(R.string.index_name_oceania, 70);
public static final CategoryStaticData TOURS =
new CategoryStaticData(R.string.index_tours, 0);
private final int nameId;
private final int order;
private final CategoryStaticData parent;
private String name;
CategoryStaticData(int nameId, int order) {
this.nameId = nameId;
this.order = order;
parent = null;
}
CategoryStaticData(int nameId, int order, CategoryStaticData parent) {
this.nameId = nameId;
this.order = order;
this.parent = parent;
}
public int getNameId() {
return nameId;
}
public int getOrder() {
return order;
}
public CategoryStaticData getParent() {
return parent;
}
public boolean hasParent() {
return parent != null;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Override
public String toString() {
return "CategoryStaticData{" +
"nameId=" + nameId +
", order=" + order +
", parent=" + parent +
", name='" + name + '\'' +
'}';
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(this.nameId);
dest.writeInt(this.order);
dest.writeParcelable(this.parent, flags);
dest.writeString(this.name);
}
protected CategoryStaticData(Parcel in) {
this.nameId = in.readInt();
this.order = in.readInt();
this.parent = in.readParcelable(CategoryStaticData.class.getClassLoader());
this.name = in.readString();
}
public static final Parcelable.Creator<CategoryStaticData> CREATOR = new Parcelable.Creator<CategoryStaticData>() {
public CategoryStaticData createFromParcel(Parcel source) {
return new CategoryStaticData(source);
}
public CategoryStaticData[] newArray(int size) {
return new CategoryStaticData[size];
}
};
}

135
OsmAnd/src/net/osmand/plus/download/newimplementation/IndexItemCategoryWithSubcat.java
View file

@ -6,13 +6,17 @@ import android.support.annotation.NonNull;
import net.osmand.Collator; import net.osmand.Collator;
import net.osmand.OsmAndCollator; import net.osmand.OsmAndCollator;
import net.osmand.PlatformUtil;
import net.osmand.map.OsmandRegions; import net.osmand.map.OsmandRegions;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.Version; import net.osmand.plus.Version;
import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.IndexItem; import net.osmand.plus.download.IndexItem;
import net.osmand.plus.helpers.HasName; import net.osmand.plus.helpers.HasName;
import org.apache.commons.logging.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -20,19 +24,22 @@ import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.TreeSet;
public class IndexItemCategoryWithSubcat implements Comparable<IndexItemCategoryWithSubcat>, public class IndexItemCategoryWithSubcat implements Comparable<IndexItemCategoryWithSubcat>,
Parcelable, HasName { HasName, Parcelable {
// private static final Log LOG = PlatformUtil.getLog(IndexItemCategoryWithSubcat.class); private static final Log LOG = PlatformUtil.getLog(IndexItemCategoryWithSubcat.class);
public final List<IndexItem> items; public final List<IndexItem> items;
public final List<IndexItemCategoryWithSubcat> subcats; public final List<IndexItemCategoryWithSubcat> subcats;
public final CategoryStaticData categoryStaticData; public final CategoryStaticData categoryStaticData;
public final TreeSet<Integer> types;
public IndexItemCategoryWithSubcat(CategoryStaticData categoryStaticData) { public IndexItemCategoryWithSubcat(CategoryStaticData categoryStaticData) {
this.categoryStaticData = categoryStaticData; this.categoryStaticData = categoryStaticData;
items = new ArrayList<>(); items = new ArrayList<>();
subcats = new ArrayList<>(); subcats = new ArrayList<>();
types = new TreeSet<>();
} }
@Override @Override
@ -109,9 +116,10 @@ public class IndexItemCategoryWithSubcat implements Comparable<IndexItemCategory
} }
String name = ctx.getString(categoryStaticData.getNameId()); String name = ctx.getString(categoryStaticData.getNameId());
categoryStaticData.setName(name); categoryStaticData.setName(name);
final IndexItemCategoryWithSubcat category =
new IndexItemCategoryWithSubcat(categoryStaticData); IndexItemCategoryWithSubcat category = cats.get(name);
if (!cats.containsKey(name)) { if (category == null) {
category = new IndexItemCategoryWithSubcat(categoryStaticData);
cats.put(name, category); cats.put(name, category);
if (!categoryStaticData.hasParent()) { if (!categoryStaticData.hasParent()) {
mainList.add(category); mainList.add(category);
@ -124,7 +132,31 @@ public class IndexItemCategoryWithSubcat implements Comparable<IndexItemCategory
} }
} }
} }
cats.get(name).items.add(i);
IndexItemCategoryWithSubcat region;
region = cats.get(i.getBasename());
final String visibleName = i.getVisibleName(ctx, ctx.getRegions());
i.setName(visibleName);
if (region == null) {
final CategoryStaticData regionStaticData = new CategoryStaticData(0, 0);
regionStaticData.setName(visibleName);
region = new IndexItemCategoryWithSubcat(regionStaticData);
cats.put(i.getBasename(), region);
category.subcats.add(region);
}
region.items.add(i);
if (i.getType() == DownloadActivityType.NORMAL_FILE) {
region.types.add(R.string.shared_string_map);
}
if (i.getType() == DownloadActivityType.WIKIPEDIA_FILE) {
region.types.add(R.string.shared_string_wikipedia);
}
if (i.getType() == DownloadActivityType.ROADS_FILE) {
region.types.add(R.string.roads);
}
final CategoryStaticData parent = category.categoryStaticData.getParent();
} }
final Collator collator = OsmAndCollator.primaryCollator(); final Collator collator = OsmAndCollator.primaryCollator();
for (IndexItemCategoryWithSubcat ct : mainList) { for (IndexItemCategoryWithSubcat ct : mainList) {
@ -146,79 +178,14 @@ public class IndexItemCategoryWithSubcat implements Comparable<IndexItemCategory
return categoryStaticData.getName(); return categoryStaticData.getName();
} }
public enum CategoryStaticData {
WORLD_WIDE_AND_TOPIC(R.string.index_name_other, 0),
NAME_VOICE(R.string.index_name_voice, 1),
TTS_VOICE(R.string.index_name_tts_voice, 2),
WIKI(R.string.index_name_wiki, 10),
OPENMAPS(R.string.index_name_openmaps, 90),
NORTH_AMERICA(R.string.index_name_north_america, 30),
US(R.string.index_name_us, 31, NORTH_AMERICA),
CANADA(R.string.index_name_canada, 32, NORTH_AMERICA),
CENTRAL_AMERICA(R.string.index_name_central_america, 40),
SOUTH_AMERICA(R.string.index_name_south_america, 45),
RUSSIA(R.string.index_name_russia, 25),
EUROPE(R.string.index_name_europe, 15),
GERMANY(R.string.index_name_germany, 16, EUROPE),
FRANCE(R.string.index_name_france, 17, EUROPE),
ITALY(R.string.index_name_italy, 18, EUROPE),
GB(R.string.index_name_gb, 19, EUROPE),
NETHERLANDS(R.string.index_name_netherlands, 20, EUROPE),
AFRICA(R.string.index_name_africa, 80),
ASIA(R.string.index_name_asia, 50),
OCEANIA(R.string.index_name_oceania, 70),
TOURS(R.string.index_tours, 0);
private final int nameId; @Override
private final int order; public String toString() {
private final CategoryStaticData parent; return "IndexItemCategoryWithSubcat{" +
private String name; "items=" + items +
", subcats=" + subcats +
CategoryStaticData(int nameId, int order) { ", categoryStaticData=" + categoryStaticData +
this.nameId = nameId; '}';
this.order = order;
parent = null;
}
CategoryStaticData(int nameId, int order, CategoryStaticData parent) {
this.nameId = nameId;
this.order = order;
this.parent = parent;
}
public int getNameId() {
return nameId;
}
public int getOrder() {
return order;
}
public CategoryStaticData getParent() {
return parent;
}
public boolean hasParent() {
return parent != null;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Override
public String toString() {
return "CategoryStaticData{" +
"nameId=" + nameId +
", order=" + order +
", parent=" + parent +
", name='" + name + '\'' +
'}';
}
} }
@Override @Override
@ -230,8 +197,8 @@ public class IndexItemCategoryWithSubcat implements Comparable<IndexItemCategory
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeList(this.items); dest.writeList(this.items);
dest.writeList(this.subcats); dest.writeList(this.subcats);
dest.writeInt(this.categoryStaticData.ordinal()); dest.writeParcelable(this.categoryStaticData, 0);
dest.writeString(this.categoryStaticData.getName()); dest.writeSerializable(this.types);
} }
protected IndexItemCategoryWithSubcat(Parcel in) { protected IndexItemCategoryWithSubcat(Parcel in) {
@ -239,13 +206,11 @@ public class IndexItemCategoryWithSubcat implements Comparable<IndexItemCategory
in.readList(this.items, List.class.getClassLoader()); in.readList(this.items, List.class.getClassLoader());
this.subcats = new ArrayList<IndexItemCategoryWithSubcat>(); this.subcats = new ArrayList<IndexItemCategoryWithSubcat>();
in.readList(this.subcats, List.class.getClassLoader()); in.readList(this.subcats, List.class.getClassLoader());
int tmpCategoryStaticData = in.readInt(); this.categoryStaticData = in.readParcelable(CategoryStaticData.class.getClassLoader());
this.categoryStaticData = CategoryStaticData.values()[tmpCategoryStaticData]; this.types = (TreeSet<Integer>) in.readSerializable();
this.categoryStaticData.setName(in.readString());
} }
public static final Parcelable.Creator<IndexItemCategoryWithSubcat> CREATOR = public static final Parcelable.Creator<IndexItemCategoryWithSubcat> CREATOR = new Parcelable.Creator<IndexItemCategoryWithSubcat>() {
new Parcelable.Creator<IndexItemCategoryWithSubcat>() {
public IndexItemCategoryWithSubcat createFromParcel(Parcel source) { public IndexItemCategoryWithSubcat createFromParcel(Parcel source) {
return new IndexItemCategoryWithSubcat(source); return new IndexItemCategoryWithSubcat(source);
} }

1
OsmAnd/src/net/osmand/plus/download/newimplementation/MapsInCategoryFragment.java
View file

@ -56,6 +56,7 @@ public class MapsInCategoryFragment extends DialogFragment {
} }
public void onCategorySelected(@NonNull IndexItemCategoryWithSubcat category) { public void onCategorySelected(@NonNull IndexItemCategoryWithSubcat category) {
LOG.debug("onCategorySelected()");
getChildFragmentManager().beginTransaction().replace(R.id.fragmentContainer, getChildFragmentManager().beginTransaction().replace(R.id.fragmentContainer,
SubcategoriesFragment.createInstance(category)).addToBackStack(null).commit(); SubcategoriesFragment.createInstance(category)).addToBackStack(null).commit();
} }

2
OsmAnd/src/net/osmand/plus/download/newimplementation/NewLocalIndexesFragment.java
View file

@ -104,7 +104,7 @@ public class NewLocalIndexesFragment extends OsmAndListFragment {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == RELOAD_ID) { if (item.getItemId() == RELOAD_ID) {
// re-create the thread // re-create the thread
DownloadActivity.downloadListIndexThread.runReloadIndexFiles(true); DownloadActivity.downloadListIndexThread.runReloadIndexFiles();
return true; return true;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);

30
OsmAnd/src/net/osmand/plus/download/newimplementation/SubcategoriesFragment.java
View file

@ -1,6 +1,7 @@
package net.osmand.plus.download.newimplementation; package net.osmand.plus.download.newimplementation;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
@ -57,7 +58,7 @@ public class SubcategoriesFragment extends Fragment {
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
final HasName item = mAdapter.getItem(position); final HasName item = mAdapter.getItem(position - 1);
if (item instanceof IndexItemCategoryWithSubcat) { if (item instanceof IndexItemCategoryWithSubcat) {
((MapsInCategoryFragment) getParentFragment()) ((MapsInCategoryFragment) getParentFragment())
.onCategorySelected((IndexItemCategoryWithSubcat) item); .onCategorySelected((IndexItemCategoryWithSubcat) item);
@ -105,9 +106,30 @@ public class SubcategoriesFragment extends Fragment {
} else { } else {
viewHolder = (ViewHolder) convertView.getTag(); viewHolder = (ViewHolder) convertView.getTag();
} }
viewHolder.nameTextView.setText(getItem(position).getName()); HasName item = getItem(position);
// TODO replace with real values if (item instanceof IndexItemCategoryWithSubcat) {
viewHolder.descrTextView.setText("Map, Roads, Contour lines, Wikipedia"); IndexItemCategoryWithSubcat category = (IndexItemCategoryWithSubcat) item;
viewHolder.nameTextView.setText(category.getName());
if (category.types.size() > 0) {
StringBuilder stringBuilder = new StringBuilder();
Resources resources = getContext().getResources();
for (Integer mapType : category.types) {
stringBuilder.append(resources.getString(mapType));
stringBuilder.append(", ");
}
LOG.debug("stringBuilder=" + stringBuilder);
stringBuilder.delete(stringBuilder.capacity() - 3, stringBuilder.capacity());
viewHolder.descrTextView.setText(stringBuilder.toString());
} else {
// TODO replace with string constant
viewHolder.descrTextView.setText("Others");
}
LOG.debug("category.types=" + category.types);
} else {
viewHolder.nameTextView.setText(item.getName());
// TODO replace with real values
viewHolder.descrTextView.setText("Temp values");
}
viewHolder.leftImageView.setImageDrawable(iconsCache.getContentIcon(R.drawable.ic_map)); viewHolder.leftImageView.setImageDrawable(iconsCache.getContentIcon(R.drawable.ic_map));
return convertView; return convertView;
} }