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 into plugins_preferences

Browse source
This commit is contained in:
Vitaliy 2020-01-15 09:50:14 +02:00
commit d6af0b679d
11 changed files with 179 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd-java/src/test/resources/search/double_parking.json
View file

@ -17,6 +17,7 @@
"Parking fee: no (Charging station / Transportation)",
"Parking fee: yes (Charging station / Transportation)",
"Parking lot (Fire hydrant / Emergency infrastructure)",
"Parking space (Personal transport)",
"Parking tickets (Vending machine / Store)",
"Parking tickets (Vending machine / Store)",
"Parking time limit (Parking / Personal transport)",

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

@ -763,7 +763,7 @@
<string name="poi_wiki_lang_sk">Slowakisches Wiki</string>
<string name="poi_wiki_lang_pl">Polnisches Wiki</string>
<string name="poi_wiki_lang_nl">Niederländisches Wiki</string>
<string name="poi_wiki_lang_nn">Neu-Norwegisches Wiki</string>
<string name="poi_wiki_lang_nn">Neu-norwegisches Wiki</string>
<string name="poi_wiki_lang_no">Norwegisches Wiki</string>
<string name="poi_wiki_lang_hr">Kroatisches Wiki</string>
<string name="poi_wiki_lang_ht">Haitianisches Wiki</string>
@ -773,7 +773,7 @@
<string name="poi_wiki_lang_ar">Arabisches Wiki</string>
<string name="poi_wiki_lang_be">Weißrussisches Wiki</string>
<string name="poi_wiki_lang_bg">Bulgarisches Wiki</string>
<string name="poi_wiki_lang_ceb">Cebuanosprachiges Wiki</string>
<string name="poi_wiki_lang_ceb">Cebuano-Wiki</string>
<string name="poi_wiki_lang_cs">Tschechisches Wiki</string>
<string name="poi_wiki_lang_da">Dänisches Wiki</string>
<string name="poi_wiki_lang_de">Deutsches Wiki</string>
@ -864,7 +864,7 @@
<string name="poi_route_hiking_nwn_poi">Nationaler Wanderweg</string>
<string name="poi_route_hiking_rwn_poi">Regionaler Wanderweg</string>
<string name="poi_route_hiking_lwn_poi">Örtlicher Wanderweg</string>
<string name="poi_route_hiking_ref_poi">Wanderwegshinweis</string>
<string name="poi_route_hiking_ref_poi">Wanderweghinweis</string>
<string name="poi_collection_times">Leerungszeiten</string>
<string name="poi_service_times">Betriebszeiten</string>
<string name="poi_abandoned_poi">Verlassenes Objekt</string>
@ -933,7 +933,7 @@
<string name="poi_shower">Dusche</string>
<string name="poi_email">E-Mail</string>
<string name="poi_fax">Fax</string>
<string name="facebook">"Facebook "</string>
<string name="facebook">Facebook</string>
<string name="poi_mobile">Handy</string>
<string name="poi_fee_no">nein</string>
<string name="poi_drinking_water_yes">ja</string>
@ -944,7 +944,7 @@
<string name="poi_access_no">Zutritt verboten</string>
<string name="poi_access_customers">Kundenverkehr frei</string>
<string name="poi_access_delivery">Lieferverkehr frei</string>
<string name="poi_access_agricultural">Landwirtschaftl. Verkehr frei</string>
<string name="poi_access_agricultural">Landwirtschaftlicher Verkehr frei</string>
<string name="poi_recycling_centre">Recyclingzentrum</string>
<string name="poi_recycling_aluminium">Aluminium</string>
<string name="poi_recycling_white_goods">Weiße Ware</string>
@ -1030,7 +1030,7 @@
<string name="poi_start_date">Anfangsdatum</string>
<string name="poi_wheelchair_yes">ja</string>
<string name="poi_wheelchair_no">nein</string>
<string name="poi_wheelchair_limited">Eingeschränkt</string>
<string name="poi_wheelchair_limited">eingeschränkt</string>
<string name="poi_wholesale">Großhandel</string>
<string name="poi_content_silage">Inhalt: Silage</string>
<string name="poi_content_water">Inhalt: Wasser</string>
@ -1133,7 +1133,7 @@
<string name="poi_maxwidth">Maximalbreite</string>
<string name="poi_iata">IATA-Code</string>
<string name="poi_icao">ICAO-Code</string>
<string name="poi_faa">FAA Code</string>
<string name="poi_faa">FAA-Code</string>
<string name="poi_width">Breite</string>
<string name="poi_architect_name">Architekt</string>
<string name="poi_architecture_modern">Architektur: Modern</string>
@ -1174,7 +1174,7 @@
<string name="poi_clothes_dance">Tanz</string>
<string name="poi_clothes_military">Militär</string>
<string name="poi_shoes_children">Kinder</string>
<string name="poi_shoes_women">Frauen</string>
<string name="poi_shoes_women">Damen</string>
<string name="poi_shoes_sport">Sport</string>
<string name="poi_shoes_men">Männer</string>
<string name="poi_shoes_orthopedic">Orthopädisch</string>
@ -1329,7 +1329,7 @@
<string name="poi_covered_yes">ja</string>
<string name="poi_covered_no">Nicht überdacht</string>
<string name="poi_smoking_no">Nicht erlaubt</string>
<string name="poi_smoking_outside">Nur Außerhalb</string>
<string name="poi_smoking_outside">Nur außerhalb</string>
<string name="poi_smoking_yes">Erlaubt</string>
<string name="poi_smoking_separated">In einem separaten Raum</string>
<string name="poi_traffic_signals_sound_yes">ja</string>
@ -1357,7 +1357,7 @@
<string name="poi_ford_stepping_stones">Trittsteine</string>
<string name="poi_greenfield">Grüne Wiese</string>
<string name="poi_religion_jain">Jainismus</string>
<string name="poi_board_type_notice">schwarzes Brett</string>
<string name="poi_board_type_notice">Schwarzes Brett</string>
<string name="poi_garden_style_english">Gartenstil: Englisch</string>
<string name="poi_garden_style_japanese">Gartenstil: Japanisch</string>
<string name="poi_capacity">Kapazität</string>
@ -1374,8 +1374,8 @@
<string name="poi_capacity_parent">Elternplätze</string>
<string name="poi_aerialway_occupancy">Kabinen-, Gondel-, Sesselkapazität</string>
<string name="poi_aerialway_capacity">Kapazität pro Stunde</string>
<string name="poi_aerialway_duration">durchschnittliche Fahrzeit, Minuten</string>
<string name="poi_aerialway_bubble_yes">mit Überdachung</string>
<string name="poi_aerialway_duration">Durchschnittliche Fahrzeit, Minuten</string>
<string name="poi_aerialway_bubble_yes">Mit Überdachung</string>
<string name="poi_aerialway_bubble_no">Ohne Überdachung</string>
<string name="poi_aerialway_heating_yes">ja</string>
<string name="poi_aerialway_heating_no">Keine Heizung</string>
@ -1387,7 +1387,7 @@
<string name="poi_aerialway_access_both">Ein- und Ausgang</string>
<string name="poi_aerialway_summer_access_entry">Sommereingang</string>
<string name="poi_aerialway_summer_access_exit">Sommerausgang</string>
<string name="poi_aerialway_summer_access_both">Sommer Ein- und Ausgang</string>
<string name="poi_aerialway_summer_access_both">Sommerein- und -ausgang</string>
<string name="poi_stars_1">1 (Tourist)</string>
<string name="poi_stars_1s">1S (gehobener Tourist)</string>
<string name="poi_stars_2">2 (Standard)</string>
@ -1397,7 +1397,7 @@
<string name="poi_stars_4">4 (Erste Klasse)</string>
<string name="poi_stars_4s">4S (gehobene Erste Klasse)</string>
<string name="poi_stars_5">5 (Luxus)</string>
<string name="poi_stars_5s">5S (gehobenes De Luxe)</string>
<string name="poi_stars_5s">5S (gehobener Luxus)</string>
<string name="poi_stars_6">Sterne: 6</string>
<string name="poi_stars_7">Sterne: 7</string>
<string name="poi_rooms">Zimmer</string>
@ -1467,7 +1467,7 @@
<string name="poi_denomination_pentecostal">Pfingstler</string>
<string name="poi_denomination_church_of_england">Kirche von England</string>
<string name="poi_denomination_episcopal">Episkopalkirche</string>
<string name="poi_denomination_shia">Schia</string>
<string name="poi_denomination_shia">Schiitisch</string>
<string name="poi_denomination_united">Vereinigten</string>
<string name="poi_denomination_tibetan">Tibetisch</string>
<string name="poi_denomination_united_reformed">Vereinigt Reformiert</string>
@ -1504,11 +1504,11 @@
<string name="poi_site_type_city">Stadt</string>
<string name="poi_site_type_necropolis">Nekropole</string>
<string name="poi_site_type_earthwork">Erdarbeiten</string>
<string name="poi_megalith_type_menhir">Megalith-Typ: Menhir</string>
<string name="poi_megalith_type_dolmen">Megalith-Typ: Dolmen</string>
<string name="poi_megalith_type_menhir">Megalithtyp: Menhir</string>
<string name="poi_megalith_type_dolmen">Megalithtyp: Dolmen</string>
<string name="poi_fortification_type_hill_fort">Befestigungstyp: Wallburg</string>
<string name="poi_fortification_type_limes">Befestigungstyp: Limes</string>
<string name="poi_fortification_type_sconce">Festungsbautyp: Schanze</string>
<string name="poi_fortification_type_sconce">Befestungstyp: Schanze</string>
<string name="poi_fortification_type_ring_ditch">Befestigungstyp: Ringgraben</string>
<string name="poi_pa">Pa (befestigte Siedlung der Maori)</string>
<string name="poi_historic_farm">Historischer Bauernhof</string>
@ -1603,8 +1603,8 @@
<string name="poi_denomination_unitarian">Unitarisch</string>
<string name="poi_denomination_wesleyan">Wesleyaner</string>
<string name="poi_denomination_shingon_shu">Shingon-shū</string>
<string name="poi_denomination_mahayana">Mahayana Buddhisten</string>
<string name="poi_jersey_barrier">Jersey Barriere</string>
<string name="poi_denomination_mahayana">Mahayana-Buddhisten</string>
<string name="poi_jersey_barrier">Jersey-Barriere</string>
<string name="poi_leaf_type_needleleaved">Nadelwald</string>
<string name="poi_cuisine">Küche</string>
<string name="poi_information_guidepost">Wegweiser</string>
@ -1620,7 +1620,7 @@
<string name="poi_toll_hgv_yes">Lkw-Maut</string>
<string name="poi_tactile_paving_yes">ja</string>
<string name="poi_tactile_paving_no">Ohne Blindenleitsystem</string>
<string name="poi_traffic_signals_sound_walk">Nur wenn Gehen erlaubt ist</string>
<string name="poi_traffic_signals_sound_walk">Nur, wenn Gehen erlaubt ist</string>
<string name="poi_services">Raststätte</string>
<string name="poi_railway_level_crossing">Bahnübergang</string>
<string name="poi_horse_riding">Reiten</string>
@ -1669,7 +1669,7 @@
<string name="poi_payment_routex_no">Routex-Tankkarten nicht akzeptiert</string>
<string name="poi_payment_bancomat_yes">Bancomat</string>
<string name="poi_payment_bancomat_no">Bancomat nicht akzeptiert</string>
<string name="poi_payment_prepaid_ticket_yes">vorausbezahlte Fahrkarten</string>
<string name="poi_payment_prepaid_ticket_yes">Vorausbezahlte Fahrkarten</string>
<string name="poi_payment_jcb_yes">JCB</string>
<string name="poi_payment_jcb_no">JCB-Karten nicht akzeptiert</string>
<string name="poi_payment_eurowag_yes">Eurowag</string>
@ -1693,9 +1693,9 @@
<string name="poi_payment_e_zpass_no">E‑ZPass nicht akzeptiert</string>
<string name="poi_payment_kitcard_yes">KITCard</string>
<string name="poi_payment_kitcard_no">KITCard nicht akzeptiert</string>
<string name="poi_payment_v_pay_yes">V PAY</string>
<string name="poi_payment_v_pay_yes">V-Pay</string>
<string name="poi_payment_v_pay_no">V-Pay-Karten nicht akzeptiert</string>
<string name="poi_payment_dogecoin_yes">Dogecoin Ɖ</string>
<string name="poi_payment_dogecoin_yes">Dogecoin</string>
<string name="poi_payment_dogecoin_no">Dogecoin nicht akzeptiert</string>
<string name="poi_payment_cibus_yes">Cibus</string>
<string name="poi_payment_cibus_no">Cibus-Karten nicht akzeptiert</string>
@ -1705,7 +1705,7 @@
<string name="poi_payment_ep_cash_no">Geldkarte nicht akzeptiert</string>
<string name="poi_payment_ep_proton_yes">Proton</string>
<string name="poi_payment_ep_proton_no">Proton-Karten nicht akzeptiert</string>
<string name="poi_payment_ep_avant_yes">Avant Karte</string>
<string name="poi_payment_ep_avant_yes">Avantcard</string>
<string name="poi_payment_ep_avant_no">Avantcard nicht akzeptiert</string>
<string name="poi_payment_ep_mep_yes">MEP</string>
<string name="poi_payment_ep_mep_no">MEP nicht akzeptiert</string>
@ -1719,7 +1719,7 @@
<string name="poi_payment_ep_monedero4b_no">Monedero 4B nicht akzeptiert</string>
<string name="poi_payment_ep_monedero_yes">Monedero</string>
<string name="poi_payment_ep_monedero_no">Monedero nicht akzeptiert</string>
<string name="poi_payment_bankaxess_yes">BankAxes</string>
<string name="poi_payment_bankaxess_yes">BankAxess</string>
<string name="poi_payment_bankaxess_no">BankAxess nicht akzeptiert</string>
<string name="poi_payment_coinkite_yes">Coinkite</string>
<string name="poi_payment_coinkite_no">Coinkite nicht akzeptiert</string>
@ -1727,8 +1727,8 @@
<string name="poi_payment_roadrunner_no">Roadrunner-Karten nicht akzeptiert</string>
<string name="poi_payment_svg_yes">SVG</string>
<string name="poi_payment_svg_no">SVG nicht akzeptiert</string>
<string name="poi_payment_sms_yes">SMS Zahlungen</string>
<string name="poi_payment_sms_no">SMS-Zahlung nicht akzeptiert</string>
<string name="poi_payment_sms_yes">SMS-Zahlungen</string>
<string name="poi_payment_sms_no">SMS-Zahlungen nicht akzeptiert</string>
<string name="poi_payment_ov_chipkaart_yes">OV-Chipkaart</string>
<string name="poi_payment_ov_chipkaart_no">OV-Chipkaart nicht akzeptiert</string>
<string name="poi_payment_oyster_yes">Oyster</string>
@ -1751,7 +1751,7 @@
<string name="poi_payment_golden_crown_no">Golden Crown-Karten nicht akzeptiert</string>
<string name="poi_payment_pro100_yes">PRO100</string>
<string name="poi_payment_pro100_no">PRO100-Karten nicht akzeptiert</string>
<string name="poi_payment_union_card_yes">Union Karte</string>
<string name="poi_payment_union_card_yes">Union-Karte</string>
<string name="poi_payment_union_card_no">Union-Karte nicht akzeptiert</string>
<string name="poi_payment_mtsmoney_yes">MTS-Money</string>
<string name="poi_payment_mtsmoney_no">MTS-Money nicht akzeptiert</string>
@ -1762,19 +1762,19 @@
<string name="poi_internet_access_fee_no">Internetzugang: kostenlos</string>
<string name="poi_events_venue">Veranstaltungsort</string>
<string name="poi_diet_vegetarian_only">Nur vegetarisch</string>
<string name="poi_diet_vegetarian_yes">Vegetarische</string>
<string name="poi_diet_vegetarian_yes">Vegetarisch</string>
<string name="poi_diet_vegetarian_no">Vegetarisch: nein</string>
<string name="poi_diet_vegetarian_few">vegetarisch (wenige)</string>
<string name="poi_diet_vegetarian_few">Vegetarisch (wenige)</string>
<string name="poi_diet_vegan_only">Nur vegan</string>
<string name="poi_diet_vegan_yes">Vegan</string>
<string name="poi_diet_vegan_no">Vegan: nein</string>
<string name="poi_diet_gluten_free_only">Nur glutenfreie</string>
<string name="poi_diet_gluten_free_yes">glutenfrei</string>
<string name="poi_diet_gluten_free_only">Nur glutenfrei</string>
<string name="poi_diet_gluten_free_yes">Glutenfrei</string>
<string name="poi_diet_gluten_free_no">Glutenfrei: nein</string>
<string name="poi_diet_kosher_only">Nur koscher</string>
<string name="poi_diet_kosher_yes">Koscher</string>
<string name="poi_diet_kosher_no">Koscher: nein</string>
<string name="poi_diet_halal_only">Nur Halal</string>
<string name="poi_diet_halal_only">Nur halal</string>
<string name="poi_diet_halal_yes">Halal</string>
<string name="poi_diet_halal_no">Halal: nein</string>
<string name="poi_diet_lactose_free_only">Nur laktosefrei</string>
@ -1799,7 +1799,7 @@
<string name="poi_full_service_yes">Rundumservice</string>
<string name="poi_aeroway_fuel">Flugzeugtankstelle</string>
<string name="poi_public_bath">Öffentliches Bad</string>
<string name="poi_indoor_no">im Freien</string>
<string name="poi_indoor_no">Im Freien</string>
<string name="poi_indoor_yes">Innen</string>
<string name="poi_toilets_wheelchair_yes">Rollstuhlgerechte Toilette: ja</string>
<string name="poi_toilets_wheelchair_no">Rollstuhlgerechte Toilette: nein</string>
@ -1817,7 +1817,7 @@
<string name="poi_vending_public_transport_tickets">Fahrscheine</string>
<string name="poi_vending_drinks">Getränke</string>
<string name="poi_vending_sweets">Süßigkeiten</string>
<string name="poi_vending_parcel_pickup_mail_in">Paketausgabe und -annahmestelle</string>
<string name="poi_vending_parcel_pickup_mail_in">Paketausgabe- und -annahmestelle</string>
<string name="poi_vending_condoms">Kondome</string>
<string name="poi_vending_stamps">Briefmarken</string>
<string name="poi_vending_food">Essen</string>
@ -1850,7 +1850,7 @@
<string name="poi_memorial_stele">Stele</string>
<string name="poi_memorial_bust">Büste</string>
<string name="poi_memorial_koshinto">Koshinto</string>
<string name="poi_memorial_blue_plaque">blaue Plakette</string>
<string name="poi_memorial_blue_plaque">Blaue Plakette</string>
<string name="poi_memorial_jizo">Jizo</string>
<string name="poi_memorial_cross">Kreuzförmig</string>
<string name="poi_memorial_vehicle">Fahrzeug</string>
@ -1905,8 +1905,8 @@
<string name="poi_shelter_type_rock_shelter">Felsüberhang</string>
<string name="poi_shelter_type_sun_shelter">Sonnenschutz</string>
<string name="poi_shelter_type_field_shelter">Feldhütte</string>
<string name="poi_shelter_type_tent">Unterstand-Typ: Zelt</string>
<string name="poi_shelter_type_abandoned">Unterstand-Typ: verlassen</string>
<string name="poi_shelter_type_tent">Unterstandtyp: Zelt</string>
<string name="poi_shelter_type_abandoned">Unterstandtyp: verlassen</string>
<string name="poi_memorial_prasat">Tempelturm</string>
<string name="poi_resource_barite">Baryt</string>
<string name="poi_wetland_string_bog">Strangmoor</string>
@ -1924,7 +1924,7 @@
<string name="poi_artwork_type_stele">Kunstart: Stele</string>
<string name="poi_artwork_type_fountain">Kunstart: Brunnen</string>
<string name="poi_architecture_stalinist_neoclassicism">Architektur: Stalinistischer Neoklassizismus</string>
<string name="poi_architecture_eclectic">Architektur: Eklektisch</string>
<string name="poi_architecture_eclectic">Architektur: eklektisch</string>
<string name="poi_architecture_new_objectivity">Architektur: Neue Sachlichkeit</string>
<string name="poi_architecture_contemporary">Architektur: Zeitgenössisch</string>
<string name="poi_architecture_constructivism">Architektur: Konstruktivismus</string>
@ -1932,7 +1932,7 @@
<string name="poi_architecture_timber_frame">Architektur: Holzrahmen</string>
<string name="poi_architecture_art_nouveau">Architektur: Jugendstil</string>
<string name="poi_architecture_neoclassicism">Architektur: Neoklassizismus</string>
<string name="poi_architecture_victorian">Architektur: Viktorianisch</string>
<string name="poi_architecture_victorian">Architektur: viktorianisch</string>
<string name="poi_architecture_brutalism">Architektur: Brutalismus</string>
<string name="poi_architecture_classicism">Architektur: Klassizismus</string>
<string name="poi_architecture_gothic">Architektur: Gotik</string>
@ -1943,12 +1943,12 @@
<string name="poi_architecture_romanesque">Architektur: Romanik</string>
<string name="poi_tunnel_waterway">Wassertunnel</string>
<string name="poi_bridge_waterway">Wasserbrücke</string>
<string name="poi_bridge_structure_beam">Brückenkonstruktion: Strahl</string>
<string name="poi_bridge_structure_beam">Brückenkonstruktion: Balken</string>
<string name="poi_bridge_structure_simple_suspension">Brückenkonstruktion: einfache Aufhängung</string>
<string name="poi_bridge_structure_suspension">Brückenkonstruktion: Aufhängung</string>
<string name="poi_bridge_structure_arch">Brückenkonstruktion: Bogen</string>
<string name="poi_bridge_structure_truss">Brückenkonstruktion: Fachwerk</string>
<string name="poi_bridge_structure_floating">Brückenkonstruktion: Schwimmend</string>
<string name="poi_bridge_structure_floating">Brückenkonstruktion: schwimmend</string>
<string name="poi_bridge_structure_humpback">Brückenkonstruktion: Buckel</string>
<string name="poi_bridge_structure_cable_stayed">Brückenkonstruktion: Schrägseil</string>
<string name="poi_bridge_structure_boardwalk">Brückenkonstruktion: Promenade</string>
@ -1966,7 +1966,7 @@
<string name="poi_bridge_movable_retractable">Beweglicher Brückentyp: Schubbrücke</string>
<string name="poi_lit_yes">Beleuchtung: ja</string>
<string name="poi_lit_no">Beleuchtung: nein</string>
<string name="poi_surface_unpaved">Oberfläche: unbefestigte</string>
<string name="poi_surface_unpaved">Oberfläche: unbefestigt</string>
<string name="poi_surface_paved">Oberfläche: befestigt</string>
<string name="poi_surface_asphalt">Oberfläche: Asphalt</string>
<string name="poi_surface_concrete">Oberfläche: Beton</string>
@ -1990,7 +1990,7 @@
<string name="poi_surface_salt">Oberfläche: Salz</string>
<string name="poi_surface_snow">Oberfläche: Schnee</string>
<string name="poi_route_bus_ref">Bus</string>
<string name="poi_route_share_taxi_ref">geteiltes Taxi</string>
<string name="poi_route_share_taxi_ref">Geteiltes Taxi</string>
<string name="poi_route_trolleybus_ref">Oberleitungsbus</string>
<string name="poi_route_tram_ref">Straßenbahn</string>
<string name="poi_route_train_ref">Zug</string>
@ -2012,7 +2012,7 @@
<string name="poi_service_bicycle_pump_no">Fahrradpumpe: nein</string>
<string name="poi_service_bicycle_diy_no">Fahrradwerkzeuge für Eigenreparatur: nein</string>
<string name="poi_service_bicycle_diy_yes">Werkzeuge für Eigenreparatur</string>
<string name="poi_service_bicycle_cleaning_yes">Reinigung</string>
<string name="poi_service_bicycle_cleaning_yes">Fahrradreinigung</string>
<string name="poi_service_bicycle_cleaning_no">Fahrradreinigung: nein</string>
<string name="poi_service_bicycle_chaintool_yes">Fahrradkettenwerkzeug</string>
<string name="poi_service_bicycle_chaintool_no">Fahrradkettenwerkzeug: nein</string>
@ -2055,7 +2055,7 @@
<string name="poi_animal_boarding_horse">Beförderungstyp: Pferd</string>
<string name="poi_honey">Honiggeschäft</string>
<string name="poi_technical_monument">Technisches Denkmal</string>
<string name="poi_office_camping">Camping-Büro</string>
<string name="poi_office_camping">Campingbüro</string>
<string name="poi_model_aerodrome">Modellflugplatz</string>
<string name="poi_guide">Fremdenführerbüro</string>
<string name="poi_quango">Mittlerorganisation</string>
@ -2105,7 +2105,7 @@
<string name="poi_castle_type_palace">Burgtyp: Palast</string>
<string name="poi_castle_type_defensive_stately">Burgtyp: Verteidigung, stattlich</string>
<string name="poi_massage_thai">Thailändisch</string>
<string name="poi_massage_sexual">Sexuelle</string>
<string name="poi_massage_sexual">Sexuell</string>
<string name="poi_massage_yes">Massagen</string>
<string name="poi_massage_therapeutic">Therapeutisch</string>
<string name="poi_sauna_yes">Sauna</string>
@ -2237,9 +2237,9 @@
<string name="poi_stone_type_conciliation_cross">Typ: Steinkreuz</string>
<string name="poi_site_type_hut_circle">Hüttenkreis</string>
<string name="poi_site_type_petroglyph">Petroglyphe</string>
<string name="poi_megalith_type_nuraghe">Megalith-Typ: Nuraghe</string>
<string name="poi_megalith_type_stone_circle">Megalith-Typ: Steinkreis</string>
<string name="poi_megalith_type_passage_grave">Megalith-Typ: Ganggrab</string>
<string name="poi_megalith_type_nuraghe">Megalithtyp: Nuraghe</string>
<string name="poi_megalith_type_stone_circle">Megalithtyp: Steinkreis</string>
<string name="poi_megalith_type_passage_grave">Megalithtyp: Ganggrab</string>
<string name="poi_summit_cross">Gipfelkreuz: ja</string>
<string name="poi_conveying_yes">Vermittlung: ja</string>
<string name="poi_wiki_lang_af">Afrikanisches Wiki</string>
@ -2248,7 +2248,7 @@
<string name="poi_wiki_lang_bpy">Bishnupriyaisches Wiki</string>
<string name="poi_wiki_lang_br">Bretonisches Wiki</string>
<string name="poi_wiki_lang_cy">Walisisches Wiki</string>
<string name="poi_wiki_lang_eo">Esperantoisches Wiki</string>
<string name="poi_wiki_lang_eo">Esperanto-Wiki</string>
<string name="poi_wiki_lang_eu">Baskisches Wiki</string>
<string name="poi_wiki_lang_fa">Farsisches Wiki</string>
<string name="poi_wiki_lang_ml">Malayalamisches Wiki</string>
@ -2257,7 +2257,7 @@
<string name="poi_wiki_lang_war">Warayisches Wiki</string>
<string name="poi_wiki_lang_min">Minangkabauisches Wiki</string>
<string name="poi_wiki_lang_zhminnan">Minnanisches Wiki</string>
<string name="poi_wiki_lang_mg">Malagasisches Wiki</string>
<string name="poi_wiki_lang_mg">Madagassisches Wiki</string>
<string name="poi_wiki_lang_tt">Tatarisches Wiki</string>
<string name="poi_wiki_lang_ky">Kirgisisches Wiki</string>
<string name="poi_wiki_lang_tg">Tadschikisches Wiki</string>
@ -2270,7 +2270,7 @@
<string name="poi_wiki_lang_an">Aragonesisches Wiki</string>
<string name="poi_wiki_lang_gu">Gujaratisches Wiki</string>
<string name="poi_wetland_palsa_bog">Palsamoor</string>
<string name="poi_payment_icsf_yes">IC gespeicherte Fährfahrkarten</string>
<string name="poi_payment_icsf_yes">IC-gespeicherte Fährfahrkarten</string>
<string name="poi_payment_icsf_no">IC-gespeicherte Fährfahrkarten nicht akzeptiert</string>
<string name="poi_health_specialty_general_yes">Allgemeinmediziner</string>
<string name="poi_health_specialty_ophthalmology_yes">Augenheilkunde</string>
@ -2460,7 +2460,7 @@
<string name="poi_free_flying_paragliding_no">Paragleiten: nein</string>
<string name="poi_free_flying_hanggliding_yes">Drachenfliegen</string>
<string name="poi_free_flying_hanggliding_no">Drachenfliegen: nein</string>
<string name="poi_free_flying_rigid_yes">Strikt</string>
<string name="poi_free_flying_rigid_yes">Freeflying starr</string>
<string name="poi_free_flying_rigid_no">Freeflying starr: nein</string>
<string name="poi_free_flying_site_orientation_n">Freeflying Ausrichtung: N</string>
<string name="poi_free_flying_site_orientation_ne">Freeflying-Platzausrichtung: NO</string>

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

@ -1802,7 +1802,7 @@ Lon %2$s</string>
<string name="dashboard_or_drawer_title">Übersichtsseite oder Menüsteuerung</string>
<string name="dashboard_or_drawer_description">Es besteht die Möglichkeit, die App primär über die flexible Übersichtsseite oder ein statisches Menü zu steuern. Ihre Wahl kann jederzeit in den Übersichtsseiten-Einstellungen geändert werden.</string>
<string name="access_from_map">Aufruf von der Karte aus</string>
<string name="favorite_category_add_new">Neu erstellen</string>
<string name="favorite_category_add_new">Neue Katagorie erstellen</string>
<string name="next_proceed">Weiter</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="please_specify_poi_type_only_from_list">Bitte einen gültigen POI-Typ angeben oder überspringen.</string>
@ -3426,4 +3426,5 @@ Lon %2$s</string>
<string name="reset_all_profile_settings_descr">Alle Profil-Einstellungen werden auf den Ausgangszustand nach App-Installation zurückgesetzt.</string>
<string name="reset_all_profile_settings">Alle Profil-Einstellungen auf den Standard zurücksetzen\?</string>
<string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
<string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
</resources>

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

@ -3412,4 +3412,5 @@
<string name="reset_all_profile_settings_descr">כל הגדרות הפרופיל יאופסו למצב כמו שלאחר ההתקנה.</string>
<string name="reset_all_profile_settings">לאפס את הגדרות הפרופיל לבררת המחדל\?</string>
<string name="ltr_or_rtl_combine_via_colon">%1$s:‏ %2$s</string>
<string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
</resources>

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

@ -3642,4 +3642,7 @@
<string name="poi_cuisine_buschenschank">Бушеншанк (изысканные австрийские вина)</string>
<string name="poi_cuisine_fine_dining">Изысканная кухня</string>
<string name="poi_network">Сеть</string>
<string name="poi_parking_space">Парковочное место</string>
</resources>

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

@ -4157,4 +4157,8 @@
<string name="poi_grave">Grave</string>
<string name="poi_parking_space">Parking space</string>
<string name="poi_url">URL</string>
</resources>

9
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -2290,6 +2290,7 @@ public class OsmandSettings {
public static final String LAST_KNOWN_MAP_LAT = "last_known_map_lat"; //$NON-NLS-1$
public static final String LAST_KNOWN_MAP_LON = "last_known_map_lon"; //$NON-NLS-1$
public static final String LAST_KNOWN_MAP_ZOOM = "last_known_map_zoom"; //$NON-NLS-1$
public static final String LAST_KNOWN_MAP_ELEVATION = "last_known_map_elevation"; //$NON-NLS-1$
public static final String MAP_LABEL_TO_SHOW = "map_label_to_show"; //$NON-NLS-1$
public static final String MAP_LAT_TO_SHOW = "map_lat_to_show"; //$NON-NLS-1$
@ -2403,6 +2404,14 @@ public class OsmandSettings {
settingsAPI.edit(globalPreferences).putInt(LAST_KNOWN_MAP_ZOOM, zoom).commit();
}
public float getLastKnownMapElevation() {
return settingsAPI.getFloat(globalPreferences, LAST_KNOWN_MAP_ELEVATION, 90);
}
public void setLastKnownMapElevation(float elevation) {
settingsAPI.edit(globalPreferences).putFloat(LAST_KNOWN_MAP_ELEVATION, elevation).commit();
}
public final static String POINT_NAVIGATE_LAT = "point_navigate_lat"; //$NON-NLS-1$
public final static String POINT_NAVIGATE_LON = "point_navigate_lon"; //$NON-NLS-1$
public final static String POINT_NAVIGATE_ROUTE = "point_navigate_route_integer"; //$NON-NLS-1$

9
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -474,7 +474,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
OsmAndMapLayersView ml = (OsmAndMapLayersView) findViewById(R.id.MapLayersView);
ml.setVisibility(View.VISIBLE);
atlasMapRendererView.setAzimuth(0);
atlasMapRendererView.setElevationAngle(90);
atlasMapRendererView.setElevationAngle(app.getSettings().getLastKnownMapElevation());
NativeCoreContext.getMapRendererContext().setMapRendererView(atlasMapRendererView);
ml.setMapView(mapView);
mapViewTrackingUtilities.setMapView(mapView);
@ -488,6 +488,12 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
}
}
public void setMapElevation(float angle) {
if (atlasMapRendererView != null) {
atlasMapRendererView.setElevationAngle(angle);
}
}
private void createProgressBarForRouting() {
final ProgressBar pb = (ProgressBar) findViewById(R.id.map_horizontal_progress);
@ -1490,6 +1496,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
}
settings.setLastKnownMapZoom(mapView.getZoom());
settings.setLastKnownMapElevation(mapView.getElevationAngle());
settings.MAP_ACTIVITY_ENABLED.set(false);
app.getResourceManager().interruptRendering();
OsmandPlugin.onMapActivityPause(this);

4
OsmAnd/src/net/osmand/plus/routepreparationmenu/AddPointBottomSheetDialog.java
View file

@ -319,8 +319,8 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
final View switchStartAndEndView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.bottom_sheet_item_simple_56dp, null);
TextView title = (TextView) switchStartAndEndView.findViewById(R.id.title);
String start = getString(R.string.route_start_point).toLowerCase();
String destination = getString(R.string.route_descr_destination).toLowerCase();
String start = getString(R.string.route_start_point);
String destination = getString(R.string.route_descr_destination);
String titleS = getString(R.string.swap_two_places, start, destination);
SpannableString titleSpan = new SpannableString(titleS);
int startIndex = titleS.indexOf(start);

74
OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java
View file

@ -5,6 +5,8 @@ import android.graphics.PointF;
import android.view.MotionEvent;
import net.osmand.PlatformUtil;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.views.corenative.NativeCoreContext;
import net.osmand.util.MapUtils;
import org.apache.commons.logging.Log;
@ -36,6 +38,10 @@ public class MultiTouchSupport {
public void onActionPointerUp();
public void onActionCancel();
public void onChangingViewAngle(float angle);
public void onChangeViewAngleStarted();
}
private boolean multiTouchAPISupported = false;
@ -62,6 +68,14 @@ public class MultiTouchSupport {
return inZoomMode;
}
public boolean isInTiltMode() {
return inTiltMode;
}
private boolean isTiltSupported() {
return ((OsmandApplication) ctx.getApplicationContext()).getSettings().USE_OPENGL_RENDER.get() && NativeCoreContext.isInit();
}
private void initMethods(){
try {
getPointerCount = MotionEvent.class.getMethod("getPointerCount"); //$NON-NLS-1$
@ -76,9 +90,15 @@ public class MultiTouchSupport {
}
private boolean inZoomMode = false;
private boolean inTiltMode = false;
private double zoomStartedDistance = 100;
private double zoomRelative = 1;
private PointF centerPoint = new PointF();
private PointF firstFingerStart = new PointF();
private PointF secondFingerStart = new PointF();
private static final int TILT_X_THRESHOLD_PX = 40;
private static final int TILT_Y_THRESHOLD_PX = 40;
private static final int TILT_DY_THRESHOLD_PX = 40;
public boolean onTouchEvent(MotionEvent event){
if(!isMultiTouchSupported()){
@ -91,10 +111,13 @@ public class MultiTouchSupport {
}
Integer pointCount = (Integer) getPointerCount.invoke(event);
if(pointCount < 2){
if(inZoomMode){
if (inZoomMode) {
listener.onZoomOrRotationEnded(zoomRelative, angleRelative);
inZoomMode = false;
return true;
} else if (inTiltMode) {
inTiltMode = false;
return true;
}
return false;
}
@ -114,27 +137,58 @@ public class MultiTouchSupport {
}
if (actionCode == ACTION_POINTER_DOWN) {
centerPoint = new PointF((x1 + x2) / 2, (y1 + y2) / 2);
firstFingerStart = new PointF(x1, y1);
secondFingerStart = new PointF(x2, y2);
listener.onGestureInit(x1, y1, x2, y2);
listener.onZoomStarted(centerPoint);
zoomStartedDistance = distance;
angleStarted = angle;
inZoomMode = true;
return true;
} else if(actionCode == ACTION_POINTER_UP){
if(inZoomMode){
if (inZoomMode) {
listener.onZoomOrRotationEnded(zoomRelative, angleRelative);
inZoomMode = false;
} else if (inTiltMode) {
inTiltMode = false;
}
return true;
} else if(inZoomMode && actionCode == MotionEvent.ACTION_MOVE){
// Keep zoom center fixed or flexible
centerPoint = new PointF((x1 + x2) / 2, (y1 + y2) / 2);
} else if (actionCode == MotionEvent.ACTION_MOVE) {
if (inZoomMode) {
if(angleDefined) {
angleRelative = MapUtils.unifyRotationTo360(angle - angleStarted);
// Keep zoom center fixed or flexible
centerPoint = new PointF((x1 + x2) / 2, (y1 + y2) / 2);
if (angleDefined) {
angleRelative = MapUtils.unifyRotationTo360(angle - angleStarted);
}
zoomRelative = distance / zoomStartedDistance;
listener.onZoomingOrRotating(zoomRelative, angleRelative);
} else if (inTiltMode) {
float dy2 = secondFingerStart.y - y2;
float viewAngle = dy2 / 8f;
listener.onChangingViewAngle(viewAngle);
} else if (isTiltSupported()) {
float dx1 = Math.abs(firstFingerStart.x - x1);
float dx2 = Math.abs(secondFingerStart.x - x2);
float dy1 = Math.abs(firstFingerStart.y - y1);
float dy2 = Math.abs(secondFingerStart.y - y2);
float startDy = Math.abs(secondFingerStart.y - firstFingerStart.y);
if (dx1 < TILT_X_THRESHOLD_PX && dx2 < TILT_X_THRESHOLD_PX
&& dy1 > TILT_Y_THRESHOLD_PX && dy2 > TILT_Y_THRESHOLD_PX
&& startDy < TILT_Y_THRESHOLD_PX * 6
&& Math.abs(dy2 - dy1) < TILT_DY_THRESHOLD_PX) {
listener.onChangeViewAngleStarted();
inTiltMode = true;
} else if (dx1 > TILT_X_THRESHOLD_PX || dx2 > TILT_X_THRESHOLD_PX
|| Math.abs(dy2 - dy1) > TILT_DY_THRESHOLD_PX
|| Math.abs(dy1 - dy2) > TILT_DY_THRESHOLD_PX) {
angleRelative = 0;
zoomRelative = 0;
inZoomMode = true;
}
} else {
inZoomMode = true;
}
zoomRelative = distance / zoomStartedDistance;
listener.onZoomingOrRotating(zoomRelative, angleRelative);
return true;
}
} catch (Exception e) {

31
OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
View file

@ -186,6 +186,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
private long multiTouchStartTime;
private long multiTouchEndTime;
private boolean wasZoomInMultiTouch;
private float elevationAngle;
public OsmandMapTileView(MapActivity activity, int w, int h) {
this.activity = activity;
@ -257,6 +258,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
}
}
};
elevationAngle = settings.getLastKnownMapElevation();
}
public void setView(View view) {
@ -439,6 +441,10 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
return currentViewport.getZoom();
}
public float getElevationAngle() {
return elevationAngle;
}
public double getZoomFractionalPart() {
return currentViewport.getZoomFloatPart();
}
@ -1127,6 +1133,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
private LatLon initialCenterLatLon;
private boolean startRotating = false;
private static final float ANGLE_THRESHOLD = 30;
private float initialElevation;
@Override
public void onZoomOrRotationEnded(double relativeToStart, float angleRelative) {
@ -1199,6 +1206,16 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
multiTouch = false;
}
@Override
public void onChangingViewAngle(float angle) {
setElevationAngle(initialElevation - angle);
}
@Override
public void onChangeViewAngleStarted() {
initialElevation = elevationAngle;
}
@Override
public void onZoomStarted(PointF centerPoint) {
initialMultiTouchCenterPoint = centerPoint;
@ -1287,6 +1304,16 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
}
private void setElevationAngle(float angle) {
if (angle < 35f) {
angle = 35f;
} else if (angle > 90f) {
angle = 90f;
}
this.elevationAngle = angle;
((MapActivity) activity).setMapElevation(angle);
}
private boolean isZoomingAllowed(int baseZoom, float dz) {
if (baseZoom > getMaxZoom()) {
return false;
@ -1346,7 +1373,9 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
@Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
dragToAnimate(e2.getX() + distanceX, e2.getY() + distanceY, e2.getX(), e2.getY(), true);
if (!multiTouchSupport.isInTiltMode()) {
dragToAnimate(e2.getX() + distanceX, e2.getY() + distanceY, e2.getX(), e2.getY(), true);
}
return true;
}