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

Merge

Browse source
This commit is contained in:
Victor Shcherb 2015-08-30 20:50:37 +02:00
commit fc3403af78
17 changed files with 641 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/build.gradle
View file

@ -19,7 +19,7 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 21 compileSdkVersion 21
buildToolsVersion "21.1.2" buildToolsVersion "23.0.0"
signingConfigs { signingConfigs {
development { development {
@ -38,7 +38,7 @@ android {
} }
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14
targetSdkVersion 21 targetSdkVersion 21
versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode

5
OsmAnd/res/layout/editing_poi.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" > android:layout_height="fill_parent" >
@ -201,7 +202,9 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:stretchColumns="1" android:stretchColumns="1"
android:visibility="gone" > android:visibility="gone"
tools:layout_height="25dp"
tools:visibility="visible">
</TableLayout> </TableLayout>
<LinearLayout <LinearLayout

2
OsmAnd/res/layout/poi_tag_list_item.xml
View file

@ -14,7 +14,7 @@
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_weight="1"> android:layout_weight="1">
<EditText <AutoCompleteTextView
android:id="@+id/tagEditText" android:id="@+id/tagEditText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

122
OsmAnd/res/values-ca/phrases.xml
View file

@ -781,7 +781,7 @@
<string name="poi_notice">Senyal nàutica</string> <string name="poi_notice">Senyal nàutica</string>
<string name="poi_pile">Torreta</string> <string name="poi_pile">Torreta</string>
<string name="poi_radar_transponder">Radar transponedor</string> <string name="poi_radar_transponder">Radar transponedor</string>
<string name="poi_signal_station_traffic">Semàfor de tràfic nàutic</string> <string name="poi_signal_station_traffic">Semàfor de trànsit nàutic</string>
<string name="poi_signal_station_warning">Semàfor d\'advertiment nàutic</string> <string name="poi_signal_station_warning">Semàfor d\'advertiment nàutic</string>
<string name="poi_small_craft_facility">Instal·lacions per naus petites</string> <string name="poi_small_craft_facility">Instal·lacions per naus petites</string>
<string name="poi_topmark">Boia amb format IALA</string> <string name="poi_topmark">Boia amb format IALA</string>
@ -857,7 +857,7 @@
<string name="poi_entrance_exit">Sortida</string> <string name="poi_entrance_exit">Sortida</string>
<string name="poi_coffee">Coffee shop</string> <string name="poi_coffee">Coffee shop</string>
<string name="poi_pasta">Pasta shop</string> <string name="poi_pasta">Botiga de pasta</string>
<string name="poi_fashion">Botiga de moda</string> <string name="poi_fashion">Botiga de moda</string>
<string name="poi_free_flying">Botiga de vol lliure</string> <string name="poi_free_flying">Botiga de vol lliure</string>
<string name="poi_garden_furniture">Mobles de jardí</string> <string name="poi_garden_furniture">Mobles de jardí</string>
@ -873,12 +873,12 @@
<string name="poi_weapons">Armeria</string> <string name="poi_weapons">Armeria</string>
<string name="poi_stile">Restricció de pas</string> <string name="poi_stile">Restricció de pas</string>
<string name="poi_horse_stile">Pas per cavalls</string> <string name="poi_horse_stile">Pas per a cavalls</string>
<string name="poi_kissing_gate">porta laberíntica</string> <string name="poi_kissing_gate">porta laberíntica</string>
<string name="poi_sally_port">Porta llevadissa</string> <string name="poi_sally_port">Porta llevadissa</string>
<string name="poi_swing_gate">Barrera griratòria</string> <string name="poi_swing_gate">Barrera griratòria</string>
<string name="poi_turnstile">Torn de pas</string> <string name="poi_turnstile">Torn de pas</string>
<string name="poi_kent_carriage_gap">Pas exclusiu per carruatges</string> <string name="poi_kent_carriage_gap">Pas exclusiu per a carruatges</string>
<string name="poi_breakwater">Escullera</string> <string name="poi_breakwater">Escullera</string>
<string name="poi_groyne">Espigó</string> <string name="poi_groyne">Espigó</string>
@ -916,12 +916,12 @@
<string name="poi_brand">Marca</string> <string name="poi_brand">Marca</string>
<string name="poi_enforcement_traffic_signals">Control de tràfic: obeir el semàfor</string> <string name="poi_enforcement_traffic_signals">Control de tràfic: obeir el semàfor</string>
<string name="poi_enforcement_maxspeed">Control de tràfic: velocitat màxima</string> <string name="poi_enforcement_maxspeed">Control de trànsit: velocitat màxima</string>
<string name="poi_enforcement_maxheight">Control de tràfic: alçada màxima</string> <string name="poi_enforcement_maxheight">Control de trànsit: alçada màxima</string>
<string name="poi_enforcement_mindistance">Control de tràfic: distància mínima</string> <string name="poi_enforcement_mindistance">Control de trànsit: distància mínima</string>
<string name="poi_enforcement_check">Control de compliment</string> <string name="poi_enforcement_check">Control de trànsit</string>
<string name="poi_enforcement_access">Control de tràfic: accés</string> <string name="poi_enforcement_access">Control de trànsit: accés</string>
<string name="poi_enforcement_toll">Control de tràfic: peatge</string> <string name="poi_enforcement_toll">Control de trànsit: peatge</string>
<string name="poi_furnace">Botiga de calefactors</string> <string name="poi_furnace">Botiga de calefactors</string>
<string name="poi_trophy">Trofeus i distincions</string> <string name="poi_trophy">Trofeus i distincions</string>
@ -933,7 +933,7 @@
<string name="poi_abandoned_poi">Objectes perduts</string> <string name="poi_abandoned_poi">Objectes perduts</string>
<string name="poi_node_networks">Xarxa de nodes de senderisme/ciclisme</string> <string name="poi_node_networks">Xarxa de nodes de senderisme/ciclisme</string>
<string name="poi_hiking_routes">Rutes de senderisme</string> <string name="poi_hiking_routes">Rutes de senderisme</string>
<string name="poi_traffic_enforcement">Control de tràfic</string> <string name="poi_traffic_enforcement">Control de trànsit</string>
<string name="poi_route_hiking_iwn_poi">Ruta internacional de senderisme</string> <string name="poi_route_hiking_iwn_poi">Ruta internacional de senderisme</string>
<string name="poi_route_hiking_nwn_poi">Ruta nacional de senderisme</string> <string name="poi_route_hiking_nwn_poi">Ruta nacional de senderisme</string>
<string name="poi_route_hiking_rwn_poi">Ruta senderista regional</string> <string name="poi_route_hiking_rwn_poi">Ruta senderista regional</string>
@ -945,21 +945,21 @@
<string name="poi_access_destination">Accés a la destinació</string> <string name="poi_access_destination">Accés a la destinació</string>
<string name="poi_access_permissive">Accés tolerat</string> <string name="poi_access_permissive">Accés tolerat</string>
<string name="poi_access_customers">Accés de clients</string> <string name="poi_access_customers">Accés de clients</string>
<string name="poi_access_delivery">Accés per lliuraments</string> <string name="poi_access_delivery">Accés per a lliuraments</string>
<string name="poi_access_agricultural">Accés per activitats agrícoles</string> <string name="poi_access_agricultural">Accés per a activitats agrícoles</string>
<string name="poi_monitoring_station">Centre de control</string> <string name="poi_monitoring_station">Centre de control</string>
<string name="poi_capital">Capital</string> <string name="poi_capital">Capital</string>
<string name="poi_fee_no">Sense cap cost</string> <string name="poi_fee_no">Sense cap cost</string>
<string name="poi_email">e-mail</string> <string name="poi_email">Correu electrònic</string>
<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">Mòbil</string> <string name="poi_mobile">Mòbil</string>
<string name="poi_animal_shelter_dog">Refugi per gossos</string> <string name="poi_animal_shelter_dog">Refugi per a gossos</string>
<string name="poi_animal_shelter_cat">Refugi per gats</string> <string name="poi_animal_shelter_cat">Refugi per a gats</string>
<string name="poi_animal_shelter_dog_cat">Refugi per gossos i gats</string> <string name="poi_animal_shelter_dog_cat">Refugi per a gossos i gats</string>
<string name="poi_animal_shelter_bird">Refugi per ocells</string> <string name="poi_animal_shelter_bird">Refugi per a ocells</string>
<string name="poi_recycling_centre">Deixalleria</string> <string name="poi_recycling_centre">Deixalleria</string>
<string name="poi_recycling_container">Contenidor</string> <string name="poi_recycling_container">Contenidor</string>
@ -998,7 +998,7 @@
<string name="poi_recycling_tyres">Pneumàtics</string> <string name="poi_recycling_tyres">Pneumàtics</string>
<string name="poi_recycling_tv_monitor">TV, monitors</string> <string name="poi_recycling_tv_monitor">TV, monitors</string>
<string name="poi_recycling_rubble">Runes</string> <string name="poi_recycling_rubble">Runes</string>
<string name="poi_recycling_cds">CDs</string> <string name="poi_recycling_cds">CD</string>
<string name="poi_recycling_waste_oil">Oli residual</string> <string name="poi_recycling_waste_oil">Oli residual</string>
<string name="poi_recycling_bottles">Ampolles</string> <string name="poi_recycling_bottles">Ampolles</string>
<string name="poi_recycling_cork">Suro</string> <string name="poi_recycling_cork">Suro</string>
@ -1028,9 +1028,9 @@
<string name="poi_seasonal_autumn">Tardor</string> <string name="poi_seasonal_autumn">Tardor</string>
<string name="poi_seasonal_winter">Hivern</string> <string name="poi_seasonal_winter">Hivern</string>
<string name="poi_recycling_waste">Rebuig (bosses de negres)</string> <string name="poi_recycling_waste">Rebuig (bosses negres)</string>
<string name="poi_recycling_paper_packaging">Embalatge de paper</string> <string name="poi_recycling_paper_packaging">Embalatge de paper</string>
<string name="poi_recycling_tetrapak">Tetra Pak</string> <string name="poi_recycling_tetrapak">Brics</string>
<string name="poi_recycling_hydrargyrum">Mercuri</string> <string name="poi_recycling_hydrargyrum">Mercuri</string>
<string name="poi_recycling_foil">Paper d\'alumini</string> <string name="poi_recycling_foil">Paper d\'alumini</string>
<string name="poi_recycling_styrofoam">Poliestirè extrudit</string> <string name="poi_recycling_styrofoam">Poliestirè extrudit</string>
@ -1059,4 +1059,84 @@
<string name="poi_building">Edifici</string> <string name="poi_building">Edifici</string>
<string name="poi_military_office">Administració militar</string> <string name="poi_military_office">Administració militar</string>
<string name="poi_office_religion">Administració religiosa</string>
<string name="poi_association">Administració d\'associació</string>
<string name="poi_financial">Administració financera</string>
<string name="poi_political_party">Administració de partit polític</string>
<string name="poi_notary">Notari</string>
<string name="poi_foundation">Administració de fundació</string>
<string name="poi_tax_advisor">Assessoria fiscal</string>
<string name="poi_religion_voodoo">Religió vudú</string>
<string name="poi_religion_unitarian_universalist">Religió unitarista universalista</string>
<string name="poi_religion_multifaith">Multi-religiós</string>
<string name="poi_religion_jain">Jainisme</string>
<string name="poi_religion_spiritualist">Espiritualisme</string>
<string name="poi_religion_bahai">Fe Bahai</string>
<string name="poi_religion_scientologist">Cienciologia</string>
<string name="poi_religion_pagan">Paganisme</string>
<string name="poi_religion_tenrikyo">Tenrikyo</string>
<string name="poi_religion_zoroastrian">Zoroastrisme</string>
<string name="poi_denomination_catholic">Religió catòlica</string>
<string name="poi_denomination_baptist">Església Baptista</string>
<string name="poi_denomination_roman_catholic">Catòlica Romana</string>
<string name="poi_denomination_orthodox">Ortodoxa</string>
<string name="poi_denomination_lutheran">Luterana</string>
<string name="poi_denomination_sunni">Sunnita</string>
<string name="poi_denomination_protestant">Protestant</string>
<string name="poi_denomination_methodist">Metodista</string>
<string name="poi_denomination_anglican">Anglicana</string>
<string name="poi_denomination_presbyterian">Presbiteriana</string>
<string name="poi_denomination_evangelical">Evangèlica</string>
<string name="poi_denomination_russian_orthodox">Ortodoxa Russa</string>
<string name="poi_denomination_pentecostal">Pentecostal</string>
<string name="poi_denomination_mormon">Mormó</string>
<string name="poi_denomination_jehovahs_witness">Testimonis de Jehovà</string>
<string name="poi_denomination_greek_orthodox">Ortodox grec</string>
<string name="poi_denomination_reformed">Calvinisme</string>
<string name="poi_denomination_seventh_day_adventist">Adventistes del setè dia</string>
<string name="poi_denomination_new_apostolic">Nova apostòlica</string>
<string name="poi_denomination_church_of_england">Església d\'Anglaterra</string>
<string name="poi_denomination_episcopal">Episcopal</string>
<string name="poi_denomination_shia">Xiisme</string>
<string name="poi_denomination_united">Església unida</string>
<string name="poi_denomination_greek_catholic">Catòlic grec</string>
<string name="poi_denomination_tibetan">Tibetà</string>
<string name="poi_denomination_united_reformed">Església unida reformada</string>
<string name="poi_denomination_church_of_scotland">Església d\'Escòcia</string>
<string name="poi_denomination_salvation_army">Exèrcit de salvació</string>
<string name="poi_denomination_iglesia_ni_cristo">Església de crist</string>
<string name="poi_denomination_uniting">Església unificada</string>
<string name="poi_denomination_mennonite">Mennonisme</string>
<string name="poi_denomination_quaker">Quàquer</string>
<string name="poi_denomination_bulgarian_orthodox">Ortodox búlgar</string>
<string name="poi_denomination_assemblies_of_god">Assemblees de Déu</string>
<string name="poi_denomination_nondenominational">Sense denominació</string>
<string name="poi_denomination_adventist">Adventista</string>
<string name="poi_denomination_nazarene">Natzarens</string>
<string name="poi_denomination_united_methodist">Metodista Unida</string>
<string name="poi_denomination_congregational">Congregacional</string>
<string name="poi_denomination_old_believers">Antics creients</string>
<string name="poi_denomination_serbian_orthodox">Ortodoxa sèrbia</string>
<string name="poi_denomination_spiritist">Espiritista</string>
<string name="poi_denomination_armenian_apostolic">Apostòlica d\'Armènia</string>
<string name="poi_denomination_dutch_reformed">Holandesa reformada</string>
<string name="poi_denomination_apostolic">Apostòlica</string>
<string name="poi_denomination_reform">Reformada</string>
<string name="poi_denomination_latter_day_saints">Moviment dels Sants dels Últims Dies</string>
<string name="poi_denomination_church_of_christ">Església de Crist</string>
<string name="poi_denomination_united_church_of_christ">Església unida de Crist</string>
<string name="poi_denomination_georgian_orthodox">Ortodoxa georgiana</string>
<string name="poi_denomination_scientist">Materialista</string>
<string name="poi_denomination_romanian_orthodox">Ortodoxa Romanesa</string>
<string name="poi_denomination_ethiopian_orthodox_tewahedo">Església Ortodoxa Etíop</string>
<string name="poi_denomination_unitarian">Unitarista</string>
<string name="poi_denomination_coptic_orthodox">Copte ortodox</string>
<string name="poi_denomination_wesleyan">Wesleià</string>
<string name="poi_denomination_shaktism">Xactisme</string>
<string name="poi_denomination_shingon_shu">Shingon (budisme)</string>
<string name="poi_denomination_maronite">Maronita</string>
<string name="poi_denomination_mahayana">Budisme mahayana</string>
</resources> </resources>

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

File diff suppressed because one or more lines are too long

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

@ -1071,4 +1071,84 @@
<string name="poi_building">Bygning</string> <string name="poi_building">Bygning</string>
<string name="poi_military_office">Militærkontor</string> <string name="poi_military_office">Militærkontor</string>
<string name="poi_notary">Notar</string>
<string name="poi_political_party">Partikontor</string>
<string name="poi_tax_advisor">Skatterådgiverkontor</string>
<string name="poi_office_religion">Religiøs kontor</string>
<string name="poi_association">Foreningskontor</string>
<string name="poi_financial">Finansiel kontor</string>
<string name="poi_foundation">Fondskontor</string>
<string name="poi_religion_voodoo">Voodoo</string>
<string name="poi_religion_scientologist">Scientolog</string>
<string name="poi_denomination_catholic">Katolsk</string>
<string name="poi_denomination_baptist">Baptist</string>
<string name="poi_denomination_roman_catholic">Romersk-katolsk</string>
<string name="poi_denomination_orthodox">Ortodoks</string>
<string name="poi_denomination_lutheran">Luthersk</string>
<string name="poi_denomination_sunni">Sunni</string>
<string name="poi_denomination_protestant">Protestant</string>
<string name="poi_denomination_methodist">Methodist</string>
<string name="poi_denomination_anglican">Anglikansk</string>
<string name="poi_denomination_presbyterian">Presbyteriansk</string>
<string name="poi_denomination_evangelical">Evangelisk</string>
<string name="poi_denomination_russian_orthodox">Russisk-ortodoks</string>
<string name="poi_denomination_pentecostal">Pinsebevægelsen</string>
<string name="poi_denomination_mormon">Mormon</string>
<string name="poi_denomination_jehovahs_witness">Jehovahs Vidner</string>
<string name="poi_denomination_reformed">Reformeret</string>
<string name="poi_denomination_episcopal">Episkopal</string>
<string name="poi_denomination_greek_catholic">Græsk-katolsk</string>
<string name="poi_denomination_tibetan">Tibetansk</string>
<string name="poi_denomination_salvation_army">Frelsens Hær</string>
<string name="poi_denomination_quaker">Kvæker</string>
<string name="poi_denomination_bulgarian_orthodox">Bulgarsk-ortodoks</string>
<string name="poi_denomination_adventist">Adventist</string>
<string name="poi_denomination_serbian_orthodox">Serbisk-ortodoks</string>
<string name="poi_denomination_spiritist">Spiritist</string>
<string name="poi_denomination_armenian_apostolic">Armensk apostolsk</string>
<string name="poi_denomination_dutch_reformed">Hollandsk reformeret</string>
<string name="poi_denomination_apostolic">Apostolsk</string>
<string name="poi_denomination_latter_day_saints">Sidste dages hellige</string>
<string name="poi_denomination_church_of_christ">Kristi kirke</string>
<string name="poi_denomination_georgian_orthodox">Georgisk-ortodoks</string>
<string name="poi_denomination_romanian_orthodox">Rumænsk-ortodoks</string>
<string name="poi_denomination_ethiopian_orthodox_tewahedo">Etiopisk-ortodoks tewahedo</string>
<string name="poi_denomination_coptic_orthodox">Koptisk-ortodoks</string>
<string name="poi_denomination_mahayana">Mahayana</string>
<string name="poi_religion_unitarian_universalist">Unitarisk universalistisk</string>
<string name="poi_religion_multifaith">Multireligiøse</string>
<string name="poi_religion_jain">Jainisme</string>
<string name="poi_religion_spiritualist">Spiritist</string>
<string name="poi_religion_bahai">Bahai</string>
<string name="poi_religion_pagan">Hedenskab</string>
<string name="poi_religion_tenrikyo">Tenrikyo</string>
<string name="poi_religion_zoroastrian">Zarathustrisme</string>
<string name="poi_denomination_greek_orthodox">Græsk-ortodoks</string>
<string name="poi_denomination_seventh_day_adventist">Syvende Dags Adventist</string>
<string name="poi_denomination_new_apostolic">Nyapostolsk</string>
<string name="poi_denomination_church_of_england">Den engelske kirke</string>
<string name="poi_denomination_shia">Shiisme</string>
<string name="poi_denomination_united_reformed">Forenede reformerte kirke</string>
<string name="poi_denomination_church_of_scotland">Den skotske kirke</string>
<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni cristo</string>
<string name="poi_denomination_mennonite">Mennonit</string>
<string name="poi_denomination_assemblies_of_god">Assemblies of god</string>
<string name="poi_denomination_nondenominational">Non-denominational</string>
<string name="poi_denomination_nazarene">Nazarene</string>
<string name="poi_denomination_united_methodist">United methodist</string>
<string name="poi_denomination_congregational">Kongregationalisme</string>
<string name="poi_denomination_old_believers">Gammeltroende</string>
<string name="poi_denomination_united_church_of_christ">United church of christ</string>
<string name="poi_denomination_unitarian">Unitarisme</string>
<string name="poi_denomination_wesleyan">Wesleyan</string>
<string name="poi_denomination_shaktism">Shaktism</string>
<string name="poi_denomination_shingon_shu">Shingon buddhisme</string>
<string name="poi_denomination_maronite">Maronit</string>
<string name="poi_denomination_reform">Reformert</string>
<string name="poi_denomination_united">Forenede</string>
<string name="poi_denomination_uniting">Forenende</string>
<string name="poi_denomination_scientist">Videnskab</string>
</resources> </resources>

17
OsmAnd/res/values-de/phrases.xml
View file

@ -147,7 +147,7 @@
<string name="poi_club_tourism">Tourismusverein</string> <string name="poi_club_tourism">Tourismusverein</string>
<string name="poi_club_veterans">Veteranenklub</string> <string name="poi_club_veterans">Veteranenklub</string>
<string name="poi_college">Hochschule</string> <string name="poi_college">Hochschule</string>
<string name="poi_communication_tower">Kommunikationstumr</string> <string name="poi_communication_tower">Kommunikationsturm</string>
<string name="poi_community_centre">Gemeindezentrum</string> <string name="poi_community_centre">Gemeindezentrum</string>
<string name="poi_company">Firma</string> <string name="poi_company">Firma</string>
<string name="poi_compressed_air">Druckluft</string> <string name="poi_compressed_air">Druckluft</string>
@ -699,7 +699,7 @@
<string name="poi_sailing">Segeln</string> <string name="poi_sailing">Segeln</string>
<string name="poi_apartment">Apartment</string> <string name="poi_apartment">Apartment</string>
<string name="poi_internet_access_wlan">Internetzugang: WLAN</string> <string name="poi_internet_access_wlan">Internetzugang: WLAN</string>
<string name="poi_internet_access_wired">Internetzugang: Kabel</string> <string name="poi_internet_access_wired">Internetzugang: Kabelgebunden</string>
<string name="poi_internet_access_public">Internetzugang: öffentlich</string> <string name="poi_internet_access_public">Internetzugang: öffentlich</string>
<string name="poi_picnic_table">Picknicktisch</string> <string name="poi_picnic_table">Picknicktisch</string>
<string name="poi_wine_cellar">Weinkeller</string> <string name="poi_wine_cellar">Weinkeller</string>
@ -1014,4 +1014,17 @@
<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>
<string name="poi_perfumery">Parfümerie</string>
<string name="poi_association">Geschäftsstelle</string>
<string name="poi_political_party">Parteibüro</string>
<string name="poi_notary">Notar</string>
<string name="poi_foundation">Stiftungsbüro</string>
<string name="poi_tax_advisor">Steuerberatung</string>
<string name="poi_military_office">Militärverwaltung</string>
<string name="poi_building">Gebäude</string>
<string name="poi_office_religion">Büro einer Glaubensgemeinschaft</string>
<string name="poi_financial">Finanzverwaltung</string>
</resources> </resources>

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

@ -1828,4 +1828,5 @@
<string name="osmand_parking_overdue">εκπρόθεσμο</string> <string name="osmand_parking_overdue">εκπρόθεσμο</string>
<string name="simulate_your_location">Προσομοίωση της θέση σας</string> <string name="simulate_your_location">Προσομοίωση της θέση σας</string>
<string name="rendering_value_highContrastRoads_name">Δρόμοι με υψηλή αντίθεση</string> <string name="rendering_value_highContrastRoads_name">Δρόμοι με υψηλή αντίθεση</string>
<string name="plugin_settings">Πρόσθετα</string>
</resources> </resources>

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

@ -1052,4 +1052,78 @@
<string name="poi_building">Edificio</string> <string name="poi_building">Edificio</string>
</resources> <string name="poi_office_religion">Oficina religiosa</string>
<string name="poi_association">Asociación</string>
<string name="poi_financial">Oficina financiera</string>
<string name="poi_political_party">Partido político</string>
<string name="poi_notary">Escribano</string>
<string name="poi_foundation">Fundación</string>
<string name="poi_tax_advisor">Asesor fiscal</string>
<string name="poi_military_office">Oficina militar</string>
<string name="poi_religion_voodoo">Vudú</string>
<string name="poi_religion_unitarian_universalist">Unitariano universalista</string>
<string name="poi_religion_multifaith">Multireligioso</string>
<string name="poi_religion_jain">Jainista</string>
<string name="poi_religion_spiritualist">Espiritualista</string>
<string name="poi_religion_bahai">Bahaísta</string>
<string name="poi_religion_scientologist">Cienciologísta</string>
<string name="poi_religion_pagan">Pagano</string>
<string name="poi_religion_tenrikyo">Tenrikyō</string>
<string name="poi_religion_zoroastrian">Zoroástrica</string>
<string name="poi_denomination_catholic">Católica</string>
<string name="poi_denomination_baptist">Bautista</string>
<string name="poi_denomination_roman_catholic">Católica romana</string>
<string name="poi_denomination_orthodox">Ortodoxa</string>
<string name="poi_denomination_lutheran">Luterana</string>
<string name="poi_denomination_sunni">Sunita</string>
<string name="poi_denomination_protestant">Protestante</string>
<string name="poi_denomination_methodist">Metodista</string>
<string name="poi_denomination_anglican">Anglicana</string>
<string name="poi_denomination_presbyterian">Presbiteriana</string>
<string name="poi_denomination_evangelical">Evangélica</string>
<string name="poi_denomination_russian_orthodox">Ortodoxa rusa</string>
<string name="poi_denomination_pentecostal">Pentecostal</string>
<string name="poi_denomination_mormon">Mormóna</string>
<string name="poi_denomination_jehovahs_witness">Testigos de Jehová</string>
<string name="poi_denomination_greek_orthodox">Ortodoxa griega</string>
<string name="poi_denomination_seventh_day_adventist">Adventista del séptimo día</string>
<string name="poi_denomination_new_apostolic">Nueva apostólica</string>
<string name="poi_denomination_church_of_england">Iglesia de Inglaterra</string>
<string name="poi_denomination_episcopal">Episcopal</string>
<string name="poi_denomination_shia">Chiíta</string>
<string name="poi_denomination_greek_catholic">Católica griega</string>
<string name="poi_denomination_tibetan">Tibetana</string>
<string name="poi_denomination_church_of_scotland">Iglesia de Escocia</string>
<string name="poi_denomination_salvation_army">Ejército de salvación</string>
<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni cristo</string>
<string name="poi_denomination_mennonite">Menonita</string>
<string name="poi_denomination_bulgarian_orthodox">Ortodoxa búlgara</string>
<string name="poi_denomination_assemblies_of_god">Asambleas de Dios</string>
<string name="poi_denomination_nondenominational">Sin denominación</string>
<string name="poi_denomination_adventist">Adventista</string>
<string name="poi_denomination_nazarene">Nazarena</string>
<string name="poi_denomination_united_methodist">Metodista Unida</string>
<string name="poi_denomination_congregational">Congregacional</string>
<string name="poi_denomination_old_believers">Antiguos creyentes</string>
<string name="poi_denomination_serbian_orthodox">Ortodoxa Serbia</string>
<string name="poi_denomination_spiritist">Espírita</string>
<string name="poi_denomination_armenian_apostolic">Apostólico armenio</string>
<string name="poi_denomination_dutch_reformed">Holandés reformado</string>
<string name="poi_denomination_apostolic">Apostólica</string>
<string name="poi_denomination_reform">Reformista</string>
<string name="poi_denomination_latter_day_saints">Santos del último día</string>
<string name="poi_denomination_church_of_christ">Iglesia de Cristo</string>
<string name="poi_denomination_united_church_of_christ">Iglesia Unida de Cristo</string>
<string name="poi_denomination_georgian_orthodox">Ortodoxa georgiana</string>
<string name="poi_denomination_scientist">Científica</string>
<string name="poi_denomination_romanian_orthodox">Ortodoxa rumana</string>
<string name="poi_denomination_ethiopian_orthodox_tewahedo">Tewahedo ortodoxa etíope</string>
<string name="poi_denomination_unitarian">Unitariana</string>
<string name="poi_denomination_coptic_orthodox">Ortodoxa copto</string>
<string name="poi_denomination_maronite">Maronita</string>
<string name="poi_denomination_mahayana">Mahāyāna</string>
<string name="poi_denomination_united_reformed">Reformada unida</string>
</resources>

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

@ -1055,4 +1055,77 @@
<string name="poi_building">Edificio</string> <string name="poi_building">Edificio</string>
</resources> <string name="poi_office_religion">Oficina religiosa</string>
<string name="poi_association">Asociación</string>
<string name="poi_financial">Oficina financiera</string>
<string name="poi_political_party">Partido político</string>
<string name="poi_notary">Escribano / notario</string>
<string name="poi_foundation">Fundación</string>
<string name="poi_tax_advisor">Asesor fiscal</string>
<string name="poi_military_office">Oficina militar</string>
<string name="poi_religion_voodoo">Vudú</string>
<string name="poi_religion_unitarian_universalist">Unitariano universalista</string>
<string name="poi_religion_multifaith">Multireligioso</string>
<string name="poi_religion_jain">Jainista</string>
<string name="poi_religion_spiritualist">Espiritualista</string>
<string name="poi_religion_bahai">Bahaísta</string>
<string name="poi_religion_scientologist">Cienciologísta</string>
<string name="poi_religion_pagan">Pagano</string>
<string name="poi_religion_tenrikyo">Tenrikyō</string>
<string name="poi_religion_zoroastrian">Zoroástrica</string>
<string name="poi_denomination_catholic">Católica</string>
<string name="poi_denomination_baptist">Bautista</string>
<string name="poi_denomination_roman_catholic">Católica romana</string>
<string name="poi_denomination_orthodox">Ortodoxa</string>
<string name="poi_denomination_lutheran">Luterana</string>
<string name="poi_denomination_sunni">Sunita</string>
<string name="poi_denomination_protestant">Protestante</string>
<string name="poi_denomination_methodist">Metodista</string>
<string name="poi_denomination_anglican">Anglicana</string>
<string name="poi_denomination_presbyterian">Presbiteriana</string>
<string name="poi_denomination_evangelical">Evangélica</string>
<string name="poi_denomination_russian_orthodox">Ortodoxa rusa</string>
<string name="poi_denomination_pentecostal">Pentecostal</string>
<string name="poi_denomination_mormon">Mormóna</string>
<string name="poi_denomination_jehovahs_witness">Testigos de Jehová</string>
<string name="poi_denomination_greek_orthodox">Ortodoxa griega</string>
<string name="poi_denomination_seventh_day_adventist">Adventista del séptimo día</string>
<string name="poi_denomination_new_apostolic">Nueva apostólica</string>
<string name="poi_denomination_church_of_england">Iglesia de Inglaterra</string>
<string name="poi_denomination_episcopal">Episcopal</string>
<string name="poi_denomination_shia">Chiíta</string>
<string name="poi_denomination_greek_catholic">Católica griega</string>
<string name="poi_denomination_tibetan">Tibetana</string>
<string name="poi_denomination_church_of_scotland">Iglesia de Escocia</string>
<string name="poi_denomination_salvation_army">Ejército de salvación</string>
<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni cristo</string>
<string name="poi_denomination_mennonite">Menonita</string>
<string name="poi_denomination_bulgarian_orthodox">Ortodoxa búlgara</string>
<string name="poi_denomination_assemblies_of_god">Asambleas de Dios</string>
<string name="poi_denomination_nondenominational">Sin denominación</string>
<string name="poi_denomination_adventist">Adventista</string>
<string name="poi_denomination_nazarene">Nazarena</string>
<string name="poi_denomination_united_methodist">Metodista Unida</string>
<string name="poi_denomination_congregational">Congregacional</string>
<string name="poi_denomination_old_believers">Antiguos creyentes</string>
<string name="poi_denomination_serbian_orthodox">Ortodoxa Serbia</string>
<string name="poi_denomination_spiritist">Espírita</string>
<string name="poi_denomination_armenian_apostolic">Apostólico armenio</string>
<string name="poi_denomination_dutch_reformed">Holandés reformado</string>
<string name="poi_denomination_apostolic">Apostólica</string>
<string name="poi_denomination_reform">Reformista</string>
<string name="poi_denomination_latter_day_saints">Santos del último día</string>
<string name="poi_denomination_church_of_christ">Iglesia de Cristo</string>
<string name="poi_denomination_united_church_of_christ">Iglesia Unida de Cristo</string>
<string name="poi_denomination_georgian_orthodox">Ortodoxa georgiana</string>
<string name="poi_denomination_scientist">Científica</string>
<string name="poi_denomination_romanian_orthodox">Ortodoxa rumana</string>
<string name="poi_denomination_ethiopian_orthodox_tewahedo">Tewahedo ortodoxa etíope</string>
<string name="poi_denomination_unitarian">Unitariana</string>
<string name="poi_denomination_coptic_orthodox">Ortodoxa copto</string>
<string name="poi_denomination_maronite">Maronita</string>
<string name="poi_denomination_mahayana">Mahāyāna</string>
</resources>

4
OsmAnd/res/values-fr/phrases.xml
View file

@ -1032,4 +1032,6 @@
<string name="poi_recycling_low_energy_bulbs">Ampoules basse consommation</string> <string name="poi_recycling_low_energy_bulbs">Ampoules basse consommation</string>
<string name="poi_building">Bâtiment</string> <string name="poi_building">Bâtiment</string>
</resources> <string name="poi_political_party">Bureau de parti politique</string>
<string name="poi_notary">Notaire</string>
</resources>

20
OsmAnd/res/values-pt-rBR/phrases.xml
View file

@ -1054,4 +1054,24 @@
<string name="poi_building">Número</string> <string name="poi_building">Número</string>
<string name="poi_military_office">Área militar</string> <string name="poi_military_office">Área militar</string>
<string name="poi_office_religion">Área religiosa</string>
<string name="poi_association">Escritório de Associação</string>
<string name="poi_financial">Escritório financeiro</string>
<string name="poi_political_party">Escritório de partido político</string>
<string name="poi_notary">Tabelião</string>
<string name="poi_foundation">Escritório de fundação</string>
<string name="poi_tax_advisor">Escritório de conselheiro fiscal</string>
<string name="poi_religion_voodoo">Voodoo</string>
<string name="poi_religion_multifaith">Multirreligiosa</string>
<string name="poi_religion_spiritualist">Espiritualista</string>
<string name="poi_religion_bahai">Bahai</string>
<string name="poi_religion_scientologist">Cientologista</string>
<string name="poi_religion_pagan">Pagão</string>
<string name="poi_religion_zoroastrian">Zoroastrismo</string>
<string name="poi_denomination_catholic">Católica</string>
<string name="poi_denomination_baptist">Batista</string>
<string name="poi_denomination_roman_catholic">Católica Romana</string>
<string name="poi_denomination_orthodox">Ortodoxo</string>
</resources> </resources>

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

@ -1946,4 +1946,20 @@
<string name="successfully_uploaded_pattern">Uspešno poslano {0}/{1}</string> <string name="successfully_uploaded_pattern">Uspešno poslano {0}/{1}</string>
<string name="try_again">Poskusi znova</string> <string name="try_again">Poskusi znova</string>
<string name="error_message_pattern">Napaka: {0}</string> <string name="error_message_pattern">Napaka: {0}</string>
</resources> <string name="plugin_settings">Vstavki</string>
<string name="dahboard_options_dialog_title">Možnosti nadzorne plošče</string>
<string name="shared_string_card_was_hidden">Kartica je bila skrita</string>
<string name="shared_string_undo">Razveljavi</string>
<string name="shared_string_skip">Preskoči</string>
<string name="app_name_osmand">OsmAnd</string>
<string name="commit_poi">Objavi točko POI</string>
<string name="basic_tab_title">Osnovno</string>
<string name="extended_tab_title">Razširjeno</string>
<string name="building_number">Številka zgradbe</string>
<string name="next_proceed">Naslenja</string>
<string name="opening_at">Odpiralni čas ob</string>
<string name="closing_at">Zapiralni čas ob</string>
<string name="routing_attr_avoid_shuttle_train_name">Izogni se vožnji z vlakom</string>
<string name="routing_attr_avoid_shuttle_train_description">Izogni se vožnji z vlakom</string>
<string name="offline_maps_and_navigation">Zemljevidi za delo brez\npovezave in navigacijo</string>
</resources>

50
OsmAnd/res/values-zh-rTW/phrases.xml
View file

@ -1052,4 +1052,54 @@
<string name="poi_building">建築物</string> <string name="poi_building">建築物</string>
<string name="poi_military_office">軍事辦公室</string> <string name="poi_military_office">軍事辦公室</string>
<string name="poi_office_religion">宗教辦公室</string>
<string name="poi_association">社團辦公室</string>
<string name="poi_financial">金融辦公室</string>
<string name="poi_political_party">政黨辦公室</string>
<string name="poi_notary">公證人</string>
<string name="poi_foundation">基金會辦公室</string>
<string name="poi_tax_advisor">稅務顧問辦公室</string>
<string name="poi_religion_voodoo">巫毒教</string>
<string name="poi_religion_unitarian_universalist">一神普救派</string>
<string name="poi_religion_multifaith">多元宗教</string>
<string name="poi_religion_jain">耆那教</string>
<string name="poi_religion_spiritualist">唯靈論教</string>
<string name="poi_religion_bahai">巴海大同教</string>
<string name="poi_religion_scientologist">山達基教</string>
<string name="poi_religion_pagan">異教</string>
<string name="poi_religion_tenrikyo">天理教</string>
<string name="poi_religion_zoroastrian">祆教</string>
<string name="poi_denomination_catholic">天主教</string>
<string name="poi_denomination_baptist">浸信會</string>
<string name="poi_denomination_roman_catholic">羅馬天主教</string>
<string name="poi_denomination_orthodox">東正教</string>
<string name="poi_denomination_lutheran">路德教派</string>
<string name="poi_denomination_sunni">遜尼派</string>
<string name="poi_denomination_protestant">基督新教</string>
<string name="poi_denomination_methodist">衛理公會</string>
<string name="poi_denomination_anglican">英國國教</string>
<string name="poi_denomination_presbyterian">長老教會</string>
<string name="poi_denomination_evangelical">福音派</string>
<string name="poi_denomination_russian_orthodox">俄羅斯東正教</string>
<string name="poi_denomination_pentecostal">聖靈降臨派</string>
<string name="poi_denomination_mormon">摩門教</string>
<string name="poi_denomination_jehovahs_witness">耶和華見證人</string>
<string name="poi_denomination_greek_orthodox">希臘正教</string>
<string name="poi_denomination_reformed">改革宗教會</string>
<string name="poi_denomination_seventh_day_adventist">基督復臨安息日會</string>
<string name="poi_denomination_episcopal">聖公會</string>
<string name="poi_denomination_shia">什葉派</string>
<string name="poi_denomination_united">聯合教會</string>
<string name="poi_denomination_greek_catholic">希臘天主教</string>
<string name="poi_denomination_tibetan">西藏</string>
<string name="poi_denomination_united_reformed">英國聯合歸正教會</string>
<string name="poi_denomination_church_of_scotland">蘇格蘭長老會</string>
<string name="poi_denomination_salvation_army">救世軍</string>
<string name="poi_denomination_iglesia_ni_cristo">基督堂教會</string>
<string name="poi_denomination_uniting">聯合教會</string>
<string name="poi_denomination_mennonite">門諾會</string>
<string name="poi_denomination_quaker">貴格會</string>
<string name="poi_denomination_bulgarian_orthodox">保加利亞東正教</string>
</resources> </resources>

78
OsmAnd/res/values/phrases.xml
View file

@ -498,6 +498,13 @@
<string name="poi_educational_institution">Educational institution</string> <string name="poi_educational_institution">Educational institution</string>
<string name="poi_studio">Studio</string> <string name="poi_studio">Studio</string>
<string name="poi_bookmaker">Bookmaker</string> <string name="poi_bookmaker">Bookmaker</string>
<string name="poi_office_religion">Religious office</string>
<string name="poi_association">Association office</string>
<string name="poi_financial">Financial office</string>
<string name="poi_political_party">Political party office</string>
<string name="poi_notary">Notary</string>
<string name="poi_foundation">Foundation office</string>
<string name="poi_tax_advisor">Tax advisor office</string>
<string name="poi_stadium">Stadium</string> <string name="poi_stadium">Stadium</string>
<string name="poi_sports_centre">Sports center</string> <string name="poi_sports_centre">Sports center</string>
@ -624,6 +631,77 @@
<string name="poi_religion_hindu">Place of worship: hindu</string> <string name="poi_religion_hindu">Place of worship: hindu</string>
<string name="poi_religion_shinto">Place of worship: shinto</string> <string name="poi_religion_shinto">Place of worship: shinto</string>
<string name="poi_religion_taoist">Place of worship: taoist</string> <string name="poi_religion_taoist">Place of worship: taoist</string>
<string name="poi_religion_voodoo">Voodoo</string>
<string name="poi_religion_unitarian_universalist">Unitarian universalist</string>
<string name="poi_religion_multifaith">Multifaith</string>
<string name="poi_religion_jain">Jain</string>
<string name="poi_religion_spiritualist">Spiritualist</string>
<string name="poi_religion_bahai">Bahai</string>
<string name="poi_religion_scientologist">Scientologist</string>
<string name="poi_religion_pagan">Pagan</string>
<string name="poi_religion_tenrikyo">Tenrikyo</string>
<string name="poi_religion_zoroastrian">Zoroastrian</string>
<string name="poi_denomination_catholic">Catholic</string>
<string name="poi_denomination_baptist">Baptist</string>
<string name="poi_denomination_roman_catholic">Roman catholic</string>
<string name="poi_denomination_orthodox">Orthodox</string>
<string name="poi_denomination_lutheran">Lutheran</string>
<string name="poi_denomination_sunni">Sunni</string>
<string name="poi_denomination_protestant">Protestant</string>
<string name="poi_denomination_methodist">Methodist</string>
<string name="poi_denomination_anglican">Anglican</string>
<string name="poi_denomination_presbyterian">Presbyterian</string>
<string name="poi_denomination_evangelical">Evangelical</string>
<string name="poi_denomination_russian_orthodox">Russian orthodox</string>
<string name="poi_denomination_pentecostal">Pentecostal</string>
<string name="poi_denomination_mormon">Mormon</string>
<string name="poi_denomination_jehovahs_witness">Jehovahs witness</string>
<string name="poi_denomination_greek_orthodox">Greek_orthodox</string>
<string name="poi_denomination_reformed">Reformed</string>
<string name="poi_denomination_seventh_day_adventist">Seventh_day_adventist</string>
<string name="poi_denomination_new_apostolic">New_apostolic</string>
<string name="poi_denomination_church_of_england">Church_of_england</string>
<string name="poi_denomination_episcopal">Episcopal</string>
<string name="poi_denomination_shia">Shia</string>
<string name="poi_denomination_united">United</string>
<string name="poi_denomination_greek_catholic">Greek catholic</string>
<string name="poi_denomination_tibetan">Tibetan</string>
<string name="poi_denomination_united_reformed">United reformed</string>
<string name="poi_denomination_church_of_scotland">Church of scotland</string>
<string name="poi_denomination_salvation_army">Salvation army</string>
<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni cristo</string>
<string name="poi_denomination_uniting">Uniting</string>
<string name="poi_denomination_mennonite">Mennonite</string>
<string name="poi_denomination_quaker">Quaker</string>
<string name="poi_denomination_bulgarian_orthodox">Bulgarian orthodox</string>
<string name="poi_denomination_assemblies_of_god">Assemblies of god</string>
<string name="poi_denomination_nondenominational">Nondenominational</string>
<string name="poi_denomination_adventist">Adventist</string>
<string name="poi_denomination_nazarene">Nazarene</string>
<string name="poi_denomination_united_methodist">United methodist</string>
<string name="poi_denomination_congregational">Congregational</string>
<string name="poi_denomination_old_believers">Old believers</string>
<string name="poi_denomination_serbian_orthodox">Serbian orthodox</string>
<string name="poi_denomination_spiritist">Spiritist</string>
<string name="poi_denomination_armenian_apostolic">Armenian apostolic</string>
<string name="poi_denomination_dutch_reformed">Dutch reformed</string>
<string name="poi_denomination_apostolic">Apostolic</string>
<string name="poi_denomination_reform">Reform</string>
<string name="poi_denomination_latter_day_saints">Latter day saints</string>
<string name="poi_denomination_church_of_christ">Church of christ</string>
<string name="poi_denomination_united_church_of_christ">United church of christ</string>
<string name="poi_denomination_georgian_orthodox">Georgian orthodox</string>
<string name="poi_denomination_scientist">Scientist</string>
<string name="poi_denomination_romanian_orthodox">Romanian orthodox</string>
<string name="poi_denomination_ethiopian_orthodox_tewahedo">Ethiopian orthodox tewahedo</string>
<string name="poi_denomination_unitarian">Unitarian</string>
<string name="poi_denomination_coptic_orthodox">Coptic orthodox</string>
<string name="poi_denomination_wesleyan">Wesleyan</string>
<string name="poi_denomination_shaktism">Shaktism</string>
<string name="poi_denomination_shingon_shu">Shingon shu</string>
<string name="poi_denomination_maronite">Maronite</string>
<string name="poi_denomination_mahayana">Mahayana</string>
<string name="poi_internet_access_wlan">Internet access: wlan</string> <string name="poi_internet_access_wlan">Internet access: wlan</string>
<string name="poi_internet_access_terminal">Internet access: terminal</string> <string name="poi_internet_access_terminal">Internet access: terminal</string>

59
OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java
View file

@ -1,15 +1,21 @@
package net.osmand.plus.osmedit; package net.osmand.plus.osmedit;
import android.app.Dialog;
import android.content.DialogInterface;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
@ -29,6 +35,8 @@ import org.apache.commons.logging.Log;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
public class AdvancedDataFragment extends Fragment { public class AdvancedDataFragment extends Fragment {
private static final String TAG = "AdvancedDataFragment"; private static final String TAG = "AdvancedDataFragment";
@ -99,6 +107,14 @@ public class AdvancedDataFragment extends Fragment {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
} }
private EditPoiFragment getEditPoiFragment() {
return (EditPoiFragment) getParentFragment();
}
private EditPoiData getData() {
return getEditPoiFragment().getEditPoiData();
}
public class TagAdapterLinearLayoutHack { public class TagAdapterLinearLayoutHack {
private final LinearLayout linearLayout; private final LinearLayout linearLayout;
private final EditPoiData editPoiData; private final EditPoiData editPoiData;
@ -131,7 +147,6 @@ public class AdvancedDataFragment extends Fragment {
public void updateViews() { public void updateViews() {
linearLayout.removeAllViews(); linearLayout.removeAllViews();
Iterator<Tag> iterator = editPoiData.tags.iterator();
for (Tag tag : editPoiData.tags) { for (Tag tag : editPoiData.tags) {
if (tag.tag.equals(OSMSettings.OSMTagKey.NAME.getValue())) { if (tag.tag.equals(OSMSettings.OSMTagKey.NAME.getValue())) {
nameTextView.setText(tag.value); nameTextView.setText(tag.value);
@ -155,7 +170,8 @@ public class AdvancedDataFragment extends Fragment {
private View getView(final Tag tag) { private View getView(final Tag tag) {
final View convertView = LayoutInflater.from(linearLayout.getContext()) final View convertView = LayoutInflater.from(linearLayout.getContext())
.inflate(R.layout.poi_tag_list_item, null, false); .inflate(R.layout.poi_tag_list_item, null, false);
final EditText tagEditText = (EditText) convertView.findViewById(R.id.tagEditText); final AutoCompleteTextView tagEditText =
(AutoCompleteTextView) convertView.findViewById(R.id.tagEditText);
tagEditText.setText(tag.tag); tagEditText.setText(tag.tag);
final EditText valueEditText = (EditText) convertView.findViewById(R.id.valueEditText); final EditText valueEditText = (EditText) convertView.findViewById(R.id.valueEditText);
ImageButton deleteItemImageButton = ImageButton deleteItemImageButton =
@ -193,6 +209,35 @@ public class AdvancedDataFragment extends Fragment {
editPoiData.notifyDatasetChanged(mTagsChangedListener); editPoiData.notifyDatasetChanged(mTagsChangedListener);
} }
}); });
final Set<String> tagKeys = new TreeSet<String>();
for (OSMSettings.OSMTagKey t : OSMSettings.OSMTagKey.values()) {
if ((t != OSMSettings.OSMTagKey.NAME) && (t != OSMSettings.OSMTagKey.OPENING_HOURS) && (t != OSMSettings.OSMTagKey.PHONE)
&& (t != OSMSettings.OSMTagKey.WEBSITE)) {
tagKeys.add(t.getValue());
}
}
ArrayAdapter<Object> adapter = new ArrayAdapter<Object>(linearLayout.getContext(),
R.layout.list_textview, tagKeys.toArray());
tagEditText.setAdapter(adapter);
tagEditText.setThreshold(1);
tagEditText.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// TODO: 8/29/15 Rewrite as dialog fragment
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
final String[] tags = tagKeys.toArray(new String[tagKeys.size()]);
builder.setItems(tags, new Dialog.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
tagEditText.setText(tags[which]);
}
});
builder.create();
builder.show();
}
});
valueEditText.addTextChangedListener(new TextWatcher() { valueEditText.addTextChangedListener(new TextWatcher() {
@Override @Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@ -214,12 +259,4 @@ public class AdvancedDataFragment extends Fragment {
return convertView; return convertView;
} }
} }
private EditPoiFragment getEditPoiFragment() {
return (EditPoiFragment) getParentFragment();
}
private EditPoiData getData() {
return getEditPoiFragment().getEditPoiData();
}
} }

72
OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
View file

@ -1,5 +1,29 @@
package net.osmand.plus.osmedit; package net.osmand.plus.osmedit;
import java.util.List;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast;
import net.osmand.data.Amenity;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.EnumAdapter;
import net.osmand.plus.activities.EnumAdapter.IEnumWithResource;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.TabActivity;
import net.osmand.plus.dashboard.tools.DashFragmentData;
import net.osmand.plus.myplaces.AvailableGPXFragment;
import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo;
import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AlertDialog.Builder; import android.app.AlertDialog.Builder;
@ -15,38 +39,15 @@ import android.widget.EditText;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.Toast; import android.widget.Toast;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast;
import net.osmand.data.Amenity;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.EnumAdapter;
import net.osmand.plus.activities.EnumAdapter.IEnumWithResource;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.TabActivity;
import net.osmand.plus.dashboard.DashPluginsFragment;
import net.osmand.plus.dashboard.tools.DashFragmentData;
import net.osmand.plus.myplaces.AvailableGPXFragment;
import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo;
import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;
import java.util.List;
public class OsmEditingPlugin extends OsmandPlugin { public class OsmEditingPlugin extends OsmandPlugin {
private static final Log LOG = PlatformUtil.getLog(OsmEditingPlugin.class);
private static final String ID = "osm.editing"; private static final String ID = "osm.editing";
private OsmandSettings settings; private OsmandSettings settings;
private OsmandApplication app; private OsmandApplication app;
OpenstreetmapsDbHelper dbpoi; OpenstreetmapsDbHelper dbpoi;
OsmBugsDbHelper dbbug; OsmBugsDbHelper dbbug;
private EditingPOIDialogProvider poiActions;
@Override @Override
public String getId() { public String getId() {
@ -136,12 +137,12 @@ public class OsmEditingPlugin extends OsmandPlugin {
return SettingsOsmEditingActivity.class; return SettingsOsmEditingActivity.class;
} }
// public EditingPOIDialogProvider getPoiActions(MapActivity activity) { public EditingPOIDialogProvider getPoiActions(MapActivity activity) {
// if (poiActions == null) { if (poiActions == null) {
// poiActions = new EditingPOIDialogProvider(activity, this); poiActions = new EditingPOIDialogProvider(activity, this);
// } }
// return poiActions; return poiActions;
// } }
@Override @Override
public void registerMapContextMenuActions(final MapActivity mapActivity, public void registerMapContextMenuActions(final MapActivity mapActivity,
@ -152,6 +153,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
OnContextMenuClick listener = new OnContextMenuClick() { OnContextMenuClick listener = new OnContextMenuClick() {
@Override @Override
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int resId, int pos, boolean isChecked) { public boolean onContextMenuClick(ArrayAdapter<?> adapter, int resId, int pos, boolean isChecked) {
LOG.debug("onContextMenuClick()");
if (resId == R.string.context_menu_item_create_poi) { if (resId == R.string.context_menu_item_create_poi) {
//getPoiActions(mapActivity).showCreateDialog(latitude, longitude); //getPoiActions(mapActivity).showCreateDialog(latitude, longitude);
EditPoiFragment editPoiFragment = EditPoiFragment editPoiFragment =
@ -167,13 +169,13 @@ public class OsmEditingPlugin extends OsmandPlugin {
} }
osmBugsLayer.openBug(latitude, longitude); osmBugsLayer.openBug(latitude, longitude);
} else if (resId == R.string.poi_context_menu_delete) { } else if (resId == R.string.poi_context_menu_delete) {
new EditPoiFragment.ShowDeleteDialogAsyncTask(mapActivity) // new EditPoiFragment.ShowDeleteDialogAsyncTask(mapActivity)
.execute((Amenity) selectedObj); // .execute((Amenity) selectedObj);
// TODO implement delete // TODO implement delete
// getPoiActions(mapActivity).showDeleteDialog((Amenity) selectedObj); getPoiActions(mapActivity).showDeleteDialog((Amenity) selectedObj);
} else if (resId == R.string.poi_context_menu_modify) { } else if (resId == R.string.poi_context_menu_modify) {
// TODO implement edit // TODO implement edit
// getPoiActions(mapActivity).showEditDialog((Amenity) selectedObj); getPoiActions(mapActivity).showEditDialog((Amenity) selectedObj);
} }
return true; return true;
} }