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

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

Browse source
This commit is contained in:
GaidamakUA 2015-10-16 12:10:48 +03:00
commit 93fbc49fb3
36 changed files with 281 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,7 @@
<string name="poi_boutique">Буцік</string> <string name="poi_boutique">Буцік</string>
<string name="poi_chemist">Аптэка</string> <string name="poi_chemist">Аптэка</string>
<string name="poi_clothes">Крама адзеньня</string> <string name="poi_clothes">Крама адзеньня</string>
<string name="poi_child_clothes">Дзіцячае адзеньне</string> <string name="poi_clothes_children">Дзіцячае адзеньне</string>
<string name="poi_shoes">Крама абутку</string> <string name="poi_shoes">Крама абутку</string>
<string name="poi_computer">Кампутары</string> <string name="poi_computer">Кампутары</string>
<string name="poi_copyshop">Капіявальныя паслугі</string> <string name="poi_copyshop">Капіявальныя паслугі</string>

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

@ -74,7 +74,7 @@
<string name="poi_charity">Благотворителност</string> <string name="poi_charity">Благотворителност</string>
<string name="poi_chemist">Аптека</string> <string name="poi_chemist">Аптека</string>
<string name="poi_clothes">Магазин за дрехи</string> <string name="poi_clothes">Магазин за дрехи</string>
<string name="poi_child_clothes">Детско облекло</string> <string name="poi_clothes_children">Детско облекло</string>
<string name="poi_shoes">Магазин за обувки</string> <string name="poi_shoes">Магазин за обувки</string>
<string name="poi_computer">Магазин за компютри</string> <string name="poi_computer">Магазин за компютри</string>
<string name="poi_copyshop">Копирен център</string> <string name="poi_copyshop">Копирен център</string>

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

@ -115,7 +115,7 @@
<string name="poi_tobacco">Venda de tabac</string> <string name="poi_tobacco">Venda de tabac</string>
<string name="poi_carpet">Botiga de catifes</string> <string name="poi_carpet">Botiga de catifes</string>
<string name="poi_clothes">Magatzem de roba</string> <string name="poi_clothes">Magatzem de roba</string>
<string name="poi_child_clothes">Roba infantil</string> <string name="poi_clothes_children">Roba infantil</string>
<string name="poi_curtain">Pelleteria</string> <string name="poi_curtain">Pelleteria</string>
<string name="poi_fabric">Botiga de teixits</string> <string name="poi_fabric">Botiga de teixits</string>
<string name="poi_public_transport_platform">Parada de transport públic</string> <string name="poi_public_transport_platform">Parada de transport públic</string>

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

@ -18,7 +18,7 @@
<string name="poi_bed">Vybavení ložnic</string> <string name="poi_bed">Vybavení ložnic</string>
<string name="poi_boutique">Módní butik</string> <string name="poi_boutique">Módní butik</string>
<string name="poi_chemist">Drogerie</string> <string name="poi_chemist">Drogerie</string>
<string name="poi_child_clothes">Dětské oblečení</string> <string name="poi_clothes_children">Dětské oblečení</string>
<string name="poi_shoes">Obuv</string> <string name="poi_shoes">Obuv</string>
<string name="poi_hardware">Železářství</string> <string name="poi_hardware">Železářství</string>
<string name="poi_tobacco">Tabák</string> <string name="poi_tobacco">Tabák</string>

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

@ -669,7 +669,7 @@
<string name="poi_user_defined_other">Brugerdefineret</string> <string name="poi_user_defined_other">Brugerdefineret</string>
<string name="poi_military_landuse">Militærzone</string> <string name="poi_military_landuse">Militærzone</string>
<string name="poi_child_clothes">Børnetøj</string> <string name="poi_clothes_children">Børnetøj</string>
<string name="poi_apartment">Lejlighed</string> <string name="poi_apartment">Lejlighed</string>
<string name="poi_public_transport_stop_position">Offentlig transport stoppested</string> <string name="poi_public_transport_stop_position">Offentlig transport stoppested</string>
@ -2086,4 +2086,50 @@
<string name="poi_escape_lane">Nødstopsspor</string> <string name="poi_escape_lane">Nødstopsspor</string>
</resources> <string name="poi_surveillance_indoor">Overvågning: indendørs</string>
<string name="poi_surveillance_outdoor">Overvågning: udendørs</string>
<string name="poi_surveillance_public">Overvågning: offentlig</string>
<string name="poi_clothes_women">Dametøj</string>
<string name="poi_clothes_underwear">Undertøj</string>
<string name="poi_clothes_men">Herretøj</string>
<string name="poi_clothes_wedding">Brudekjoler</string>
<string name="poi_clothes_sports">Sportstøj</string>
<string name="poi_clothes_babies">Babytøj</string>
<string name="poi_clothes_denim">Denimtøj</string>
<string name="poi_clothes_workwear">Arbejdstøj</string>
<string name="poi_clothes_hats">Hatte</string>
<string name="poi_clothes_fur">Pels</string>
<string name="poi_clothes_leather">Læder</string>
<string name="poi_clothes_costumes">Kostumer</string>
<string name="poi_clothes_traditional">Traditionel beklædning</string>
<string name="poi_clothes_suits">Jakkesæt</string>
<string name="poi_clothes_maternity">Barselstøj</string>
<string name="poi_clothes_vintage">Vintagetøj</string>
<string name="poi_clothes_oversize">Oversize tøj</string>
<string name="poi_clothes_schoolwear">Skoleuniform</string>
<string name="poi_clothes_swimwear">Badetøj</string>
<string name="poi_clothes_socks">Sokker</string>
<string name="poi_clothes_shirts">Skjorter</string>
<string name="poi_clothes_dance">Dansekostume</string>
<string name="poi_clothes_military">Militærtøj</string>
<string name="poi_historic_milestone">Historisk milepæl</string>
<string name="poi_shoes_children">Børnesko</string>
<string name="poi_shoes_women">Damesko</string>
<string name="poi_shoes_sport">Sportssko</string>
<string name="poi_shoes_men">Herresko</string>
<string name="poi_shoes_orthopedic">Ortopædisksko</string>
<string name="poi_historic_manor">Historisk herregård</string>
<string name="poi_castle_type_stately">Slotstype: majestætisk</string>
<string name="poi_castle_type_defensive">Slotstype: forsvar</string>
<string name="poi_castle_type_fortress">Slotstype: fæstning</string>
<string name="poi_castle_type_palace">Slotstype: palads</string>
<string name="poi_castle_type_kremlin">Slotstype: kreml</string>
<string name="poi_castle_type_defensive_stately">Slotstype: forsvar, majestætisk</string>
<string name="poi_castle_type_castrum">Slotstype: castrum</string>
<string name="poi_castle_type_shiro">Slotstype: shiro</string>
</resources>

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

@ -2180,7 +2180,8 @@
<string name="favorite_category_dublicate_message">Kategorinavnet findes allerede. Angiv et andet navn.</string> <string name="favorite_category_dublicate_message">Kategorinavnet findes allerede. Angiv et andet navn.</string>
<string name="favorite_category_name">Kategorinavn</string> <string name="favorite_category_name">Kategorinavn</string>
<string name="favorite_category_add_new_title">Tilføj ny kategori</string> <string name="favorite_category_add_new_title">Tilføj ny kategori</string>
<string name="confirm_download_roadmaps">Hent kort kun med veje, selv om komplet kort er hentet?</string> <string name="confirm_download_roadmaps">Hent kort kun med veje, selv om et komplet kort allerede er hentet?</string>
<string name="value_downloaded_from_max">%1$.1f fra %2$.1f MB</string> <string name="value_downloaded_from_max">%1$.1f af %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string> <string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Opdater alle (%1$s Mb)</string>
</resources> </resources>

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

@ -111,7 +111,7 @@
<string name="poi_charging_station">Ladestation</string> <string name="poi_charging_station">Ladestation</string>
<string name="poi_chemist">Drogerie</string> <string name="poi_chemist">Drogerie</string>
<string name="poi_chess">Schach</string> <string name="poi_chess">Schach</string>
<string name="poi_child_clothes">Kinderbekleidungsgeschäft</string> <string name="poi_clothes_children">Kinderbekleidungsgeschäft</string>
<string name="poi_cinema">Kino</string> <string name="poi_cinema">Kino</string>
<string name="poi_circus">Zirkus</string> <string name="poi_circus">Zirkus</string>
<string name="poi_city">Stadt</string> <string name="poi_city">Stadt</string>

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

@ -74,7 +74,7 @@
<string name="poi_charity">Negocio benéfico</string> <string name="poi_charity">Negocio benéfico</string>
<string name="poi_chemist">Higiene personal y del hogar</string> <string name="poi_chemist">Higiene personal y del hogar</string>
<string name="poi_clothes">Negocio de ropa</string> <string name="poi_clothes">Negocio de ropa</string>
<string name="poi_child_clothes">Ropa infantil</string> <string name="poi_clothes_children">Ropa infantil</string>
<string name="poi_shoes">Zapatería</string> <string name="poi_shoes">Zapatería</string>
<string name="poi_computer">Computadoras</string> <string name="poi_computer">Computadoras</string>
<string name="poi_copyshop">Fotocopiadora</string> <string name="poi_copyshop">Fotocopiadora</string>
@ -125,7 +125,7 @@
<string name="poi_toys">Juguetería</string> <string name="poi_toys">Juguetería</string>
<string name="poi_trade">Corralón</string> <string name="poi_trade">Corralón</string>
<string name="poi_vacuum_cleaner">Aspiradoras</string> <string name="poi_vacuum_cleaner">Aspiradoras</string>
<string name="poi_variety_store">Bazar</string> <string name="poi_variety_store">Todo por $2</string>
<string name="poi_video">Videoclub</string> <string name="poi_video">Videoclub</string>
<string name="poi_window_blind">Tienda de persianas</string> <string name="poi_window_blind">Tienda de persianas</string>
<string name="poi_department_store">Grandes almacenes</string> <string name="poi_department_store">Grandes almacenes</string>
@ -2012,7 +2012,7 @@
<string name="poi_office_camping">Oficina del campamento</string> <string name="poi_office_camping">Oficina del campamento</string>
<string name="poi_model_aerodrome">Aeródromo a escala</string> <string name="poi_model_aerodrome">Aeródromo a escala</string>
<string name="poi_guide">Oficina del guía</string> <string name="poi_guide">Oficina del guía</string>
<string name="poi_quango">ONG dependiente</string> <string name="poi_quango">ONG casi autónoma</string>
<string name="poi_consulting">Oficina de consultoría</string> <string name="poi_consulting">Oficina de consultoría</string>
<string name="poi_cooperative">Oficina de cooperativa</string> <string name="poi_cooperative">Oficina de cooperativa</string>
<string name="poi_office_forestry">Oficina forestal</string> <string name="poi_office_forestry">Oficina forestal</string>
@ -2064,4 +2064,32 @@
<string name="poi_crop_flowers">Cultivo de flores</string> <string name="poi_crop_flowers">Cultivo de flores</string>
<string name="poi_crop_poultry">Granja avícola</string> <string name="poi_crop_poultry">Granja avícola</string>
<string name="poi_surveillance_indoor">Vigilancia interior</string>
<string name="poi_surveillance_outdoor">Vigilancia exterior</string>
<string name="poi_surveillance_public">Vigilancia pública</string>
<string name="poi_clothes_women">Ropa de mujer</string>
<string name="poi_clothes_underwear">Ropa interior</string>
<string name="poi_clothes_men">Ropa de hombre</string>
<string name="poi_clothes_wedding">Vestidos de novia</string>
<string name="poi_clothes_sports">Ropa deportiva</string>
<string name="poi_clothes_babies">Ropa de bebes</string>
<string name="poi_clothes_workwear">Ropa de trabajo</string>
<string name="poi_clothes_hats">Sombreros</string>
<string name="poi_clothes_fur">Ropa de piel</string>
<string name="poi_clothes_leather">Ropa de cuero</string>
<string name="poi_clothes_costumes">Disfraces</string>
<string name="poi_clothes_traditional">Ropa tradicional</string>
<string name="poi_clothes_suits">Trajes</string>
<string name="poi_clothes_maternity">Ropa de maternidad</string>
<string name="poi_clothes_vintage">Ropa antigua</string>
<string name="poi_clothes_oversize">Ropa de grandes tamaños</string>
<string name="poi_clothes_schoolwear">Ropa escolar</string>
<string name="poi_clothes_swimwear">Trajes de baño</string>
<string name="poi_clothes_socks">Medias / Calcetines</string>
<string name="poi_clothes_shirts">Camisas</string>
<string name="poi_clothes_dance">Ropa de baile</string>
<string name="poi_clothes_military">Ropa militar</string>
<string name="poi_clothes_denim">Ropa de mezclilla</string>
</resources> </resources>

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

@ -389,7 +389,7 @@
<string name="poi_charity">Negocio benéfico</string> <string name="poi_charity">Negocio benéfico</string>
<string name="poi_confectionery">Dulcería</string> <string name="poi_confectionery">Dulcería</string>
<string name="poi_clothes">Negocio de ropa</string> <string name="poi_clothes">Negocio de ropa</string>
<string name="poi_child_clothes">Ropa infantil</string> <string name="poi_clothes_children">Ropa infantil</string>
<string name="poi_shoes">Zapatería</string> <string name="poi_shoes">Zapatería</string>
<string name="poi_copyshop">Fotocopiadora</string> <string name="poi_copyshop">Fotocopiadora</string>
<string name="poi_curtain">Blanquería</string> <string name="poi_curtain">Blanquería</string>

2
OsmAnd/res/values-fa/phrases.xml
View file

@ -33,7 +33,7 @@
<string name="poi_carpet">فروشگاه فرش</string> <string name="poi_carpet">فروشگاه فرش</string>
<string name="poi_chemist">فروشگاه مواد مخدر</string> <string name="poi_chemist">فروشگاه مواد مخدر</string>
<string name="poi_clothes">فروشگاه پوشاک</string> <string name="poi_clothes">فروشگاه پوشاک</string>
<string name="poi_child_clothes">\فروشگاه پوشاک کودکان</string> <string name="poi_clothes_children">\فروشگاه پوشاک کودکان</string>
<string name="poi_shoes">کفش فروشی</string> <string name="poi_shoes">کفش فروشی</string>
<string name="poi_computer">فروشگاه کامپیوتر</string> <string name="poi_computer">فروشگاه کامپیوتر</string>
<string name="poi_copyshop">فروشگاه چاپ و تکثیر</string> <string name="poi_copyshop">فروشگاه چاپ و تکثیر</string>

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

@ -533,7 +533,7 @@
<string name="poi_frame">Magasin d\'encadrement</string> <string name="poi_frame">Magasin d\'encadrement</string>
<string name="poi_bathroom_furnishing">Magasin d\'équipement pour la salle de bain</string> <string name="poi_bathroom_furnishing">Magasin d\'équipement pour la salle de bain</string>
<string name="poi_bed">Magasin d\'équipement pour la chambre</string> <string name="poi_bed">Magasin d\'équipement pour la chambre</string>
<string name="poi_child_clothes">Vêtements pour enfants</string> <string name="poi_clothes_children">Vêtements pour enfants</string>
<string name="poi_curtain">Boutique de rideaux</string> <string name="poi_curtain">Boutique de rideaux</string>
<string name="poi_dairy">Crèmerie</string> <string name="poi_dairy">Crèmerie</string>
<string name="poi_baby_goods">Articles pour bébé</string> <string name="poi_baby_goods">Articles pour bébé</string>

2
OsmAnd/res/values-gl/phrases.xml
View file

@ -17,7 +17,7 @@
<string name="poi_art">Tenda de arte</string> <string name="poi_art">Tenda de arte</string>
<string name="poi_boutique">Tenda de moda</string> <string name="poi_boutique">Tenda de moda</string>
<string name="poi_carpet">Tenda de alfombras</string> <string name="poi_carpet">Tenda de alfombras</string>
<string name="poi_child_clothes">Roupa infantil</string> <string name="poi_clothes_children">Roupa infantil</string>
<string name="poi_shoes">Zapataría</string> <string name="poi_shoes">Zapataría</string>
<string name="poi_computer">Tenda de informática</string> <string name="poi_computer">Tenda de informática</string>
<string name="poi_copyshop">Copistaría</string> <string name="poi_copyshop">Copistaría</string>

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

@ -29,7 +29,7 @@
<string name="poi_carpet">Negozio tappeti</string> <string name="poi_carpet">Negozio tappeti</string>
<string name="poi_chemist">Farmacia</string> <string name="poi_chemist">Farmacia</string>
<string name="poi_clothes">Abbigliamento</string> <string name="poi_clothes">Abbigliamento</string>
<string name="poi_child_clothes">Abbigliamento bambini</string> <string name="poi_clothes_children">Abbigliamento bambini</string>
<string name="poi_shoes">Negozio calzature</string> <string name="poi_shoes">Negozio calzature</string>
<string name="poi_computer">Negozio di computer</string> <string name="poi_computer">Negozio di computer</string>
<string name="poi_copyshop">Copisteria</string> <string name="poi_copyshop">Copisteria</string>

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

@ -2227,4 +2227,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="confirm_download_roadmaps">Sei sicuro di volere scaricare mappe solo stradali anche se disponi di mappe complete?</string> <string name="confirm_download_roadmaps">Sei sicuro di volere scaricare mappe solo stradali anche se disponi di mappe complete?</string>
<string name="value_downloaded_from_max">%1$.1f da %2$.1f MB</string> <string name="value_downloaded_from_max">%1$.1f da %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string> <string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Aggiorna tutto (%1$s Mb)</string>
</resources> </resources>

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

@ -94,7 +94,7 @@
<string name="poi_carpet">敷物店(Carpet shop)</string> <string name="poi_carpet">敷物店(Carpet shop)</string>
<string name="poi_chemist">ドラッグストア・薬局(Drug store)</string> <string name="poi_chemist">ドラッグストア・薬局(Drug store)</string>
<string name="poi_clothes">衣料品店(Apparel store)</string> <string name="poi_clothes">衣料品店(Apparel store)</string>
<string name="poi_child_clothes">子供用衣料品店(Childrens apparel)</string> <string name="poi_clothes_children">子供用衣料品店(Childrens apparel)</string>
<string name="poi_shoes">靴屋(Shoe store)</string> <string name="poi_shoes">靴屋(Shoe store)</string>
<string name="poi_computer">パソコンショップ(Computer store)</string> <string name="poi_computer">パソコンショップ(Computer store)</string>
<string name="poi_copyshop">印刷、現像店(Copy shop)</string> <string name="poi_copyshop">印刷、現像店(Copy shop)</string>

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

@ -31,7 +31,7 @@
<string name="poi_carpet">카펫 가게</string> <string name="poi_carpet">카펫 가게</string>
<string name="poi_chemist">약국</string> <string name="poi_chemist">약국</string>
<string name="poi_clothes">의류 매장</string> <string name="poi_clothes">의류 매장</string>
<string name="poi_child_clothes">어린이 의류</string> <string name="poi_clothes_children">어린이 의류</string>
<string name="poi_shoes">신발 가게</string> <string name="poi_shoes">신발 가게</string>
<string name="poi_computer">컴퓨터 가게</string> <string name="poi_computer">컴퓨터 가게</string>
<string name="poi_copyshop">복사 가게</string> <string name="poi_copyshop">복사 가게</string>

2
OsmAnd/res/values-ml/phrases.xml
View file

@ -78,7 +78,7 @@
<string name="poi_charity">"ചാരിറ്റി ഷോപ് "</string> <string name="poi_charity">"ചാരിറ്റി ഷോപ് "</string>
<string name="poi_chemist">"മരുന്നു കട "</string> <string name="poi_chemist">"മരുന്നു കട "</string>
<string name="poi_clothes">"തുണിക്കട "</string> <string name="poi_clothes">"തുണിക്കട "</string>
<string name="poi_child_clothes">കുട്ടികളുടെ വസ്ത്രങ്ങള്‍</string> <string name="poi_clothes_children">കുട്ടികളുടെ വസ്ത്രങ്ങള്‍</string>
<string name="poi_shoes">"ചെരിപ്പ് കട "</string> <string name="poi_shoes">"ചെരിപ്പ് കട "</string>
<string name="poi_candles">കാന്ഡില്‍ സ്ടോര്‍</string> <string name="poi_candles">കാന്ഡില്‍ സ്ടോര്‍</string>
<string name="poi_computer">കംപ്യൂട്ടര്‍ സ്ടോര്‍</string> <string name="poi_computer">കംപ്യൂട്ടര്‍ സ്ടോര്‍</string>

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

@ -31,7 +31,7 @@
<string name="poi_bicycle">सायकल दुकान</string> <string name="poi_bicycle">सायकल दुकान</string>
<string name="poi_clothes">कपड्याचे दुकान</string> <string name="poi_clothes">कपड्याचे दुकान</string>
<string name="poi_child_clothes">मुलांचे कपडे</string> <string name="poi_clothes_children">मुलांचे कपडे</string>
<string name="poi_computer">कॉम्प्युटर दुकान</string> <string name="poi_computer">कॉम्प्युटर दुकान</string>
<string name="poi_curtain">पडद्याचे दुकान</string> <string name="poi_curtain">पडद्याचे दुकान</string>
<string name="poi_florist">फुलांचे दुकान</string> <string name="poi_florist">फुलांचे दुकान</string>

2
OsmAnd/res/values-nl/phrases.xml
View file

@ -33,7 +33,7 @@
<string name="poi_carpet">Tapijtwinkel</string> <string name="poi_carpet">Tapijtwinkel</string>
<string name="poi_chemist">Drogisterij</string> <string name="poi_chemist">Drogisterij</string>
<string name="poi_clothes">Kledingwinkel</string> <string name="poi_clothes">Kledingwinkel</string>
<string name="poi_child_clothes">Kinderkledingwinkel</string> <string name="poi_clothes_children">Kinderkledingwinkel</string>
<string name="poi_shoes">Schoenenwinkel</string> <string name="poi_shoes">Schoenenwinkel</string>
<string name="poi_computer">Computerwinkel</string> <string name="poi_computer">Computerwinkel</string>
<string name="poi_copyshop">Kopieerzaak</string> <string name="poi_copyshop">Kopieerzaak</string>

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

@ -31,7 +31,7 @@
<string name="poi_carpet">Sklep z dywanami</string> <string name="poi_carpet">Sklep z dywanami</string>
<string name="poi_chemist">Apteka / Drogeria</string> <string name="poi_chemist">Apteka / Drogeria</string>
<string name="poi_clothes">Sklep odzieżowy</string> <string name="poi_clothes">Sklep odzieżowy</string>
<string name="poi_child_clothes">Sklep odzieżowy dla dzieci</string> <string name="poi_clothes_children">Sklep odzieżowy dla dzieci</string>
<string name="poi_shoes">Sklep obuwniczy</string> <string name="poi_shoes">Sklep obuwniczy</string>
<string name="poi_computer">Sklep komputerowy</string> <string name="poi_computer">Sklep komputerowy</string>
<string name="poi_curtain">Sklep z zasłonami</string> <string name="poi_curtain">Sklep z zasłonami</string>

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

@ -71,7 +71,7 @@
<string name="poi_charity">Brechó beneficente</string> <string name="poi_charity">Brechó beneficente</string>
<string name="poi_chemist">Drogaria</string> <string name="poi_chemist">Drogaria</string>
<string name="poi_clothes">Loja de roupas</string> <string name="poi_clothes">Loja de roupas</string>
<string name="poi_child_clothes">Vestuário infantil</string> <string name="poi_clothes_children">Vestuário infantil</string>
<string name="poi_shoes">Sapataria</string> <string name="poi_shoes">Sapataria</string>
<string name="poi_computer">Loja de informática</string> <string name="poi_computer">Loja de informática</string>
<string name="poi_copyshop">Reprografia</string> <string name="poi_copyshop">Reprografia</string>

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

@ -38,7 +38,7 @@
<string name="poi_charity">Благотворительный магазин</string> <string name="poi_charity">Благотворительный магазин</string>
<string name="poi_chemist">Бытовая химия, косметика</string> <string name="poi_chemist">Бытовая химия, косметика</string>
<string name="poi_clothes">Одежда</string> <string name="poi_clothes">Одежда</string>
<string name="poi_child_clothes">Детская одежда</string> <string name="poi_clothes_children">Детская одежда</string>
<string name="poi_shoes">Обувь</string> <string name="poi_shoes">Обувь</string>
<string name="poi_computer">Компьютеры</string> <string name="poi_computer">Компьютеры</string>
<string name="poi_copyshop">Ксерокопия, полиграфия</string> <string name="poi_copyshop">Ксерокопия, полиграфия</string>
@ -2036,4 +2036,51 @@
<string name="poi_crop_asparagus">Выращиваемая культура: спаржа</string> <string name="poi_crop_asparagus">Выращиваемая культура: спаржа</string>
<string name="poi_crop_flowers">Выращиваемая культура: цветы</string> <string name="poi_crop_flowers">Выращиваемая культура: цветы</string>
<string name="poi_surveillance_indoor">Видеонаблюдение: внутри</string>
<string name="poi_surveillance_outdoor">Видеонаблюдение: снаружи</string>
<string name="poi_surveillance_public">Видеонаблюдение: в общественных местах</string>
<string name="poi_clothes_women">Женская одежда</string>
<string name="poi_clothes_underwear">Нижнее бельё</string>
<string name="poi_clothes_men">Мужская одежда</string>
<string name="poi_clothes_wedding">Свадебные платья</string>
<string name="poi_clothes_sports">Спортивная одежда</string>
<string name="poi_clothes_babies">Одежда для новорождённых</string>
<string name="poi_clothes_denim">Одежда из джинсовой ткани</string>
<string name="poi_clothes_workwear">Рабочая одежда</string>
<string name="poi_clothes_hats">Шляпы</string>
<string name="poi_clothes_fur">Меховая одежда</string>
<string name="poi_clothes_leather">Кожаная одежда</string>
<string name="poi_clothes_costumes">Карнавальные костюмы</string>
<string name="poi_clothes_traditional">Традиционная одежда</string>
<string name="poi_clothes_suits">Костюмы, смокинги</string>
<string name="poi_clothes_maternity">Одежда для беременных</string>
<string name="poi_clothes_vintage">Старинная одежда</string>
<string name="poi_clothes_oversize">Одежда для больших людей</string>
<string name="poi_clothes_schoolwear">Школьная форма</string>
<string name="poi_clothes_swimwear">Купальные костюмы</string>
<string name="poi_clothes_socks">Носки</string>
<string name="poi_clothes_shirts">Футболки</string>
<string name="poi_clothes_dance">Одежда для танцев</string>
<string name="poi_clothes_military">Военная одежда</string>
<string name="poi_historic_milestone">Исторический дистанционный столб</string>
<string name="poi_shoes_children">Детская обувь</string>
<string name="poi_shoes_women">Женская обувь</string>
<string name="poi_shoes_sport">Спортивная обувь</string>
<string name="poi_shoes_men">Мужская обувь</string>
<string name="poi_shoes_orthopedic">Ортопедическая обувь</string>
<string name="poi_historic_manor">Историческое поместье</string>
<string name="poi_castle_type_stately">Тип замка: величественный</string>
<string name="poi_castle_type_defensive">Тип замка: оборонительный</string>
<string name="poi_castle_type_fortress">Тип замка: крепость</string>
<string name="poi_castle_type_palace">Тип замка: дворец</string>
<string name="poi_castle_type_kremlin">Тип замка: кремль</string>
<string name="poi_castle_type_defensive_stately">Тип замка: защитный, величественный</string>
<string name="poi_castle_type_castrum">Тип замка: римский форт</string>
<string name="poi_castle_type_shiro">Тип замка: сиро</string>
</resources> </resources>

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

@ -2145,4 +2145,5 @@
<string name="confirm_download_roadmaps">Вы уверены, что хотите скачать карту автодорог, даже если у вас есть полная карта?</string> <string name="confirm_download_roadmaps">Вы уверены, что хотите скачать карту автодорог, даже если у вас есть полная карта?</string>
<string name="value_downloaded_from_max">%1$.1f из %2$.1f Мб</string> <string name="value_downloaded_from_max">%1$.1f из %2$.1f Мб</string>
<string name="file_size_in_mb">%.1f Мб</string> <string name="file_size_in_mb">%.1f Мб</string>
<string name="update_all">Обновить все (%1$s Мб)</string>
</resources> </resources>

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

@ -31,7 +31,7 @@
<string name="poi_carpet">Butega de tapetes</string> <string name="poi_carpet">Butega de tapetes</string>
<string name="poi_chemist">Potecaria</string> <string name="poi_chemist">Potecaria</string>
<string name="poi_clothes">Bestimenta</string> <string name="poi_clothes">Bestimenta</string>
<string name="poi_child_clothes">Bestimenta pro pitzinnos</string> <string name="poi_clothes_children">Bestimenta pro pitzinnos</string>
<string name="poi_shoes">Butega de iscarpas</string> <string name="poi_shoes">Butega de iscarpas</string>
<string name="poi_computer">Butega de informàtica</string> <string name="poi_computer">Butega de informàtica</string>
<string name="poi_copyshop">Copisteria</string> <string name="poi_copyshop">Copisteria</string>

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

@ -52,7 +52,7 @@
<string name="poi_carpet">Koberce</string> <string name="poi_carpet">Koberce</string>
<string name="poi_chemist">Drogéria</string> <string name="poi_chemist">Drogéria</string>
<string name="poi_clothes">Oblečenie/Konfekcia</string> <string name="poi_clothes">Oblečenie/Konfekcia</string>
<string name="poi_child_clothes">Detské oblečenie</string> <string name="poi_clothes_children">Detské oblečenie</string>
<string name="poi_shoes">Obuv</string> <string name="poi_shoes">Obuv</string>
<string name="poi_computer">Počítače</string> <string name="poi_computer">Počítače</string>
<string name="poi_copyshop">Kopírovanie</string> <string name="poi_copyshop">Kopírovanie</string>

2
OsmAnd/res/values-sl/phrases.xml
View file

@ -226,7 +226,7 @@
<string name="poi_boutique">Modni butik</string> <string name="poi_boutique">Modni butik</string>
<string name="poi_carpet">Trgovina s preprogami</string> <string name="poi_carpet">Trgovina s preprogami</string>
<string name="poi_clothes">Trgovina z oblačili</string> <string name="poi_clothes">Trgovina z oblačili</string>
<string name="poi_child_clothes">Trgovina z otroškimi oblačili</string> <string name="poi_clothes_children">Trgovina z otroškimi oblačili</string>
<string name="poi_shoes">Trgovina s čevlji</string> <string name="poi_shoes">Trgovina s čevlji</string>
<string name="poi_curtain">Trgovina z zavesami</string> <string name="poi_curtain">Trgovina z zavesami</string>
<string name="poi_dive">Trgovina s potapljaško opremo</string> <string name="poi_dive">Trgovina s potapljaško opremo</string>

2
OsmAnd/res/values-sq/phrases.xml
View file

@ -83,7 +83,7 @@
<string name="poi_charity">Dyqan bamirësie</string> <string name="poi_charity">Dyqan bamirësie</string>
<string name="poi_chemist">Farmaci</string> <string name="poi_chemist">Farmaci</string>
<string name="poi_clothes">Dyqan rrobash</string> <string name="poi_clothes">Dyqan rrobash</string>
<string name="poi_child_clothes">Rroba fëmijësh</string> <string name="poi_clothes_children">Rroba fëmijësh</string>
<string name="poi_shoes">Dyqan këpucësh</string> <string name="poi_shoes">Dyqan këpucësh</string>
<string name="poi_candles">Dyqan qirinjësh</string> <string name="poi_candles">Dyqan qirinjësh</string>
<string name="poi_computer">Dyqan kompjuterash</string> <string name="poi_computer">Dyqan kompjuterash</string>

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

@ -2045,4 +2045,5 @@
<string name="file_size_in_mb">%.1f MB</string> <string name="file_size_in_mb">%.1f MB</string>
<string name="confirm_download_roadmaps">Är du säker på att du vill hämta vägkartan trots att du redan har en fullständig karta?</string> <string name="confirm_download_roadmaps">Är du säker på att du vill hämta vägkartan trots att du redan har en fullständig karta?</string>
<string name="value_downloaded_from_max">%1$.1f av %2$.1f MB</string> <string name="value_downloaded_from_max">%1$.1f av %2$.1f MB</string>
</resources> <string name="update_all">Uppdatera alla (%1$s MB)</string>
</resources>

2
OsmAnd/res/values-tr/phrases.xml
View file

@ -83,7 +83,7 @@
<string name="poi_charity">Hayır evi</string> <string name="poi_charity">Hayır evi</string>
<string name="poi_chemist">İlaç deposu</string> <string name="poi_chemist">İlaç deposu</string>
<string name="poi_clothes">Giyim mağazası</string> <string name="poi_clothes">Giyim mağazası</string>
<string name="poi_child_clothes">Çocuk Giyim</string> <string name="poi_clothes_children">Çocuk Giyim</string>
<string name="poi_shoes">Ayakkabı mağazası</string> <string name="poi_shoes">Ayakkabı mağazası</string>
<string name="poi_candles">Mum mağaza</string> <string name="poi_candles">Mum mağaza</string>
<string name="poi_computer">Bilgisayar mağazası</string> <string name="poi_computer">Bilgisayar mağazası</string>

2
OsmAnd/res/values-uk/phrases.xml
View file

@ -31,7 +31,7 @@
<string name="poi_carpet">Килими</string> <string name="poi_carpet">Килими</string>
<string name="poi_chemist">Аптека</string> <string name="poi_chemist">Аптека</string>
<string name="poi_clothes">Магазин одягу</string> <string name="poi_clothes">Магазин одягу</string>
<string name="poi_child_clothes">Дитячий одяг</string> <string name="poi_clothes_children">Дитячий одяг</string>
<string name="poi_shoes">Магазин взуття</string> <string name="poi_shoes">Магазин взуття</string>
<string name="poi_computer">Комп’ютерний магазин</string> <string name="poi_computer">Комп’ютерний магазин</string>
<string name="poi_copyshop">Копіювальні послуги, полігрфафія</string> <string name="poi_copyshop">Копіювальні послуги, полігрфафія</string>

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

@ -74,7 +74,7 @@
<string name="poi_charity">慈善義賣店</string> <string name="poi_charity">慈善義賣店</string>
<string name="poi_chemist">藥局</string> <string name="poi_chemist">藥局</string>
<string name="poi_clothes">服飾店</string> <string name="poi_clothes">服飾店</string>
<string name="poi_child_clothes">兒童服飾</string> <string name="poi_clothes_children">兒童服飾</string>
<string name="poi_shoes">鞋店</string> <string name="poi_shoes">鞋店</string>
<string name="poi_computer">電腦商店</string> <string name="poi_computer">電腦商店</string>
<string name="poi_copyshop">複印店</string> <string name="poi_copyshop">複印店</string>
@ -1851,4 +1851,34 @@
<string name="poi_architect_name">建築師</string> <string name="poi_architect_name">建築師</string>
<string name="poi_architecture_modern">建築風格：現代化</string>
<string name="poi_architecture_stalinist_neoclassicism">建築風格：史達林式建築</string>
<string name="poi_architecture_eclectic">建築風格：不拘一格</string>
<string name="poi_architecture_new_objectivity">建築風格：新客觀主義</string>
<string name="poi_architecture_contemporary">建築風格：當代</string>
<string name="poi_architecture_constructivism">建築風格：構成主義</string>
<string name="poi_architecture_umgebinde">建築風格：umgebinde</string>
<string name="poi_architecture_timber_frame">建築風格：木結構</string>
<string name="poi_architecture_art_nouveau">建築風格：新藝術運動</string>
<string name="poi_architecture_neoclassicism">建築風格：新古典主義</string>
<string name="poi_architecture_victorian">建築風格：維多利亞</string>
<string name="poi_architecture_brutalism">建築風格：粗獷主義</string>
<string name="poi_architecture_classicism">建築風格：古典</string>
<string name="poi_architecture_gothic">建築風格：哥德式</string>
<string name="poi_architecture_oldrussian">建築風格：舊俄羅斯</string>
<string name="poi_architecture_baroque">建築風格：巴洛克式</string>
<string name="poi_architecture_postconstructivism">建築風格：postconstructivism</string>
<string name="poi_architecture_wilhelminian_style">建築風格：新藝術風格</string>
<string name="poi_architecture_renaissance">建築風格：文藝復興</string>
<string name="poi_architecture_romanesque">建築風格：羅馬式</string>
<string name="poi_tunnel_waterway">引水隧道</string>
<string name="poi_tunnel_car">道路隧道</string>
<string name="poi_tunnel_pedestrian">步行隧道</string>
<string name="poi_tunnel_railway">鐵路隧道</string>
<string name="poi_bridge_car">道路橋梁</string>
<string name="poi_bridge_pedestrian">人行天橋</string>
<string name="poi_bridge_bicycle">自行車橋梁</string>
<string name="poi_bridge_railway">鐵路橋梁</string>
<string name="poi_bridge_waterway">水路橋梁</string>
</resources> </resources>

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

@ -2162,4 +2162,5 @@
<string name="confirm_download_roadmaps">您確定要下載地圖的道路，即使您已擁有完整的地圖？</string> <string name="confirm_download_roadmaps">您確定要下載地圖的道路，即使您已擁有完整的地圖？</string>
<string name="value_downloaded_from_max">%1$.1f 從 %2$.1f MB</string> <string name="value_downloaded_from_max">%1$.1f 從 %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string> <string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">更新全部 (%1$s Mb)</string>
</resources> </resources>

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

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<resources> <resources>
<!-- categories --> <!-- categories -->
<string name="poi_shop">Shop</string> <string name="poi_shop">Shop</string>
@ -85,7 +85,7 @@
<string name="poi_charity">Charity shop</string> <string name="poi_charity">Charity shop</string>
<string name="poi_chemist">Drug store</string> <string name="poi_chemist">Drug store</string>
<string name="poi_clothes">Apparel store</string> <string name="poi_clothes">Apparel store</string>
<string name="poi_child_clothes">Childrens apparel</string> <string name="poi_clothes_children">Childrens apparel</string>
<string name="poi_shoes">Shoe store</string> <string name="poi_shoes">Shoe store</string>
<string name="poi_candles">Candles store</string> <string name="poi_candles">Candles store</string>
<string name="poi_computer">Computer store</string> <string name="poi_computer">Computer store</string>
@ -2041,4 +2041,50 @@
<string name="poi_crop_asparagus">Crop: asparagus</string> <string name="poi_crop_asparagus">Crop: asparagus</string>
<string name="poi_crop_flowers">Crop: flowers</string> <string name="poi_crop_flowers">Crop: flowers</string>
<string name="poi_surveillance_indoor">Surveillance: indoor</string>
<string name="poi_surveillance_outdoor">Surveillance: outdoor</string>
<string name="poi_surveillance_public">Surveillance: public</string>
<string name="poi_clothes_women">Women\'s clothes</string>
<string name="poi_clothes_underwear">Underwear</string>
<string name="poi_clothes_men">Men\'s clothing</string>
<string name="poi_clothes_wedding">Wedding dresses</string>
<string name="poi_clothes_sports">Sports wear</string>
<string name="poi_clothes_babies">Babies clothes</string>
<string name="poi_clothes_denim">Clothing from denim</string>
<string name="poi_clothes_workwear">Workwear</string>
<string name="poi_clothes_hats">Hats</string>
<string name="poi_clothes_fur">Fur</string>
<string name="poi_clothes_leather">Leather</string>
<string name="poi_clothes_costumes">Costumes</string>
<string name="poi_clothes_traditional">Traditional clothes</string>
<string name="poi_clothes_suits">Suits</string>
<string name="poi_clothes_maternity">Maternity clothes</string>
<string name="poi_clothes_vintage">Vintage clothes</string>
<string name="poi_clothes_oversize">Oversize clothes</string>
<string name="poi_clothes_schoolwear">School wear</string>
<string name="poi_clothes_swimwear">Swimwear</string>
<string name="poi_clothes_socks">Socks</string>
<string name="poi_clothes_shirts">Shirts</string>
<string name="poi_clothes_dance">Clothes for dancing</string>
<string name="poi_clothes_military">Military clothes</string>
<string name="poi_historic_milestone">Historic milestone</string>
<string name="poi_shoes_children">Children shoes</string>
<string name="poi_shoes_women">Women\'s shoes</string>
<string name="poi_shoes_sport">Sport shoes</string>
<string name="poi_shoes_men">Men\'s footwear</string>
<string name="poi_shoes_orthopedic">Orthopedic shoes</string>
<string name="poi_historic_manor">Historic manor</string>
<string name="poi_castle_type_stately">Castle type: stately</string>
<string name="poi_castle_type_defensive">Castle type: defensive</string>
<string name="poi_castle_type_fortress">Castle type: fortress</string>
<string name="poi_castle_type_palace">Castle type: palace</string>
<string name="poi_castle_type_kremlin">Castle type: kremlin</string>
<string name="poi_castle_type_defensive_stately">Castle type: defensive, stately</string>
<string name="poi_castle_type_castrum">Castle type: castrum</string>
<string name="poi_castle_type_shiro">Castle type: shiro</string>
</resources> </resources>

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

@ -186,7 +186,13 @@ public class MapActivityActions implements DialogProvider {
public void addWaypoint(final double latitude, final double longitude) { public void addWaypoint(final double latitude, final double longitude) {
String name = mapActivity.getContextMenu().getPointDescription().getFullPlainName(mapActivity); String name;
PointDescription pointDescription = mapActivity.getContextMenu().getPointDescription();
if (!pointDescription.isWpt() && !mapActivity.getContextMenu().isAddressUnknown()) {
name = mapActivity.getContextMenu().getTitleStr();
} else {
name = "";
}
enhance(dialogBundle,latitude,longitude, name); enhance(dialogBundle,latitude,longitude, name);
mapActivity.showDialog(DIALOG_ADD_WAYPOINT); mapActivity.showDialog(DIALOG_ADD_WAYPOINT);
} }
@ -587,6 +593,7 @@ public class MapActivityActions implements DialogProvider {
v.setPadding(5, 0, 5, 0); v.setPadding(5, 0, 5, 0);
if(args.getString(KEY_NAME) != null) { if(args.getString(KEY_NAME) != null) {
v.setText(args.getString(KEY_NAME)); v.setText(args.getString(KEY_NAME));
v.selectAll();
} else { } else {
v.setText(""); v.setText("");
} }

15
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
View file

@ -3,7 +3,6 @@ package net.osmand.plus.mapcontextmenu;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.util.Log;
import android.view.View; import android.view.View;
import net.osmand.Location; import net.osmand.Location;
@ -44,6 +43,7 @@ public class MapContextMenu {
private String typeStr; private String typeStr;
private Drawable secondLineIcon; private Drawable secondLineIcon;
private String streetStr; private String streetStr;
private boolean addressUnknown;
private int favActionIconId; private int favActionIconId;
@ -54,6 +54,7 @@ public class MapContextMenu {
private static final String KEY_CTX_MENU_NAME_STR = "key_ctx_menu_name_str"; private static final String KEY_CTX_MENU_NAME_STR = "key_ctx_menu_name_str";
private static final String KEY_CTX_MENU_TYPE_STR = "key_ctx_menu_type_str"; private static final String KEY_CTX_MENU_TYPE_STR = "key_ctx_menu_type_str";
private static final String KEY_CTX_MENU_STREET_STR = "key_ctx_menu_street_str"; private static final String KEY_CTX_MENU_STREET_STR = "key_ctx_menu_street_str";
private static final String KEY_CTX_MENU_ADDR_UNKNOWN = "key_ctx_menu_addr_unknown";
public boolean isActive() { public boolean isActive() {
return active; return active;
@ -114,6 +115,7 @@ public class MapContextMenu {
nameStr = ""; nameStr = "";
typeStr = ""; typeStr = "";
streetStr = ""; streetStr = "";
addressUnknown = false;
active = true; active = true;
@ -240,6 +242,10 @@ public class MapContextMenu {
return nameStr; return nameStr;
} }
public boolean isAddressUnknown() {
return addressUnknown;
}
public String getLocationStr() { public String getLocationStr() {
if (menuController != null && menuController.needTypeStr()) { if (menuController != null && menuController.needTypeStr()) {
return typeStr; return typeStr;
@ -255,10 +261,11 @@ public class MapContextMenu {
private void acquireIcons() { private void acquireIcons() {
leftIconId = 0; leftIconId = 0;
favActionIconId = 0;
leftIcon = null; leftIcon = null;
secondLineIcon = null; secondLineIcon = null;
favActionIconId = R.drawable.ic_action_fav_dark;
if (menuController != null) { if (menuController != null) {
leftIconId = menuController.getLeftIconId(); leftIconId = menuController.getLeftIconId();
leftIcon = menuController.getLeftIcon(); leftIcon = menuController.getLeftIcon();
@ -287,6 +294,7 @@ public class MapContextMenu {
typeStr = ""; typeStr = "";
} else { } else {
nameStr = app.getResources().getString(R.string.address_unknown); nameStr = app.getResources().getString(R.string.address_unknown);
addressUnknown = true;
} }
} }
} }
@ -306,6 +314,7 @@ public class MapContextMenu {
if (!Algorithms.isEmpty(streetStr)) { if (!Algorithms.isEmpty(streetStr)) {
if (getObject() == null) { if (getObject() == null) {
nameStr = streetStr; nameStr = streetStr;
addressUnknown = false;
streetStr = ""; streetStr = "";
} }
mapActivity.runOnUiThread(new Runnable() { mapActivity.runOnUiThread(new Runnable() {
@ -378,6 +387,7 @@ public class MapContextMenu {
bundle.putString(KEY_CTX_MENU_NAME_STR, nameStr); bundle.putString(KEY_CTX_MENU_NAME_STR, nameStr);
bundle.putString(KEY_CTX_MENU_TYPE_STR, typeStr); bundle.putString(KEY_CTX_MENU_TYPE_STR, typeStr);
bundle.putString(KEY_CTX_MENU_STREET_STR, streetStr); bundle.putString(KEY_CTX_MENU_STREET_STR, streetStr);
bundle.putString(KEY_CTX_MENU_ADDR_UNKNOWN, Boolean.toString(addressUnknown));
} }
public void restoreMenuState(Bundle bundle) { public void restoreMenuState(Bundle bundle) {
@ -399,6 +409,7 @@ public class MapContextMenu {
nameStr = bundle.getString(KEY_CTX_MENU_NAME_STR); nameStr = bundle.getString(KEY_CTX_MENU_NAME_STR);
typeStr = bundle.getString(KEY_CTX_MENU_TYPE_STR); typeStr = bundle.getString(KEY_CTX_MENU_TYPE_STR);
streetStr = bundle.getString(KEY_CTX_MENU_STREET_STR); streetStr = bundle.getString(KEY_CTX_MENU_STREET_STR);
addressUnknown = Boolean.parseBoolean(bundle.getString(KEY_CTX_MENU_ADDR_UNKNOWN));
acquireIcons(); acquireIcons();

23
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -37,6 +37,7 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.mapcontextmenu.details.MenuController; import net.osmand.plus.mapcontextmenu.details.MenuController;
import net.osmand.plus.views.AnimateDraggingMapThread; import net.osmand.plus.views.AnimateDraggingMapThread;
import net.osmand.plus.views.OsmandMapTileView;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -51,6 +52,7 @@ public class MapContextMenuFragment extends Fragment {
private static final Log LOG = PlatformUtil.getLog(MapContextMenuFragment.class); private static final Log LOG = PlatformUtil.getLog(MapContextMenuFragment.class);
private static final float FAB_PADDING_TOP = 10f; private static final float FAB_PADDING_TOP = 10f;
private static final float MARKER_PADDING_DP = 20f;
private View view; private View view;
private View mainView; private View mainView;
@ -66,6 +68,7 @@ public class MapContextMenuFragment extends Fragment {
private int menuFullHeightMax; private int menuFullHeightMax;
private int fabPaddingTopPx; private int fabPaddingTopPx;
private int markerPaddingPx;
private class SingleTapConfirm implements OnGestureListener { private class SingleTapConfirm implements OnGestureListener {
@ -114,6 +117,7 @@ public class MapContextMenuFragment extends Fragment {
Bundle savedInstanceState) { Bundle savedInstanceState) {
fabPaddingTopPx = dpToPx(FAB_PADDING_TOP); fabPaddingTopPx = dpToPx(FAB_PADDING_TOP);
markerPaddingPx = dpToPx(MARKER_PADDING_DP);
menu = getMapActivity().getContextMenu(); menu = getMapActivity().getContextMenu();
if (savedInstanceState != null) { if (savedInstanceState != null) {
@ -520,6 +524,25 @@ public class MapContextMenuFragment extends Fragment {
mainView.setPadding(0, y, 0, 0); mainView.setPadding(0, y, 0, 0);
fabView.setPadding(0, getFabY(y), 0, 0); fabView.setPadding(0, getFabY(y), 0, 0);
} }
//adjustMapPosition(y);
}
private void adjustMapPosition(int y) {
OsmandMapTileView map = getMapActivity().getMapView();
double markerLat = menu.getLatLon().getLatitude();
double markerLon = menu.getLatLon().getLongitude();
int markerX = (int)map.getCurrentRotatedTileBox().getPixXFromLatLon(markerLat, markerLon);
int markerY = (int)map.getCurrentRotatedTileBox().getPixYFromLatLon(markerLat, markerLon);
if (menu.isLandscapeLayout()) {
int menuX = dpToPx(menu.getLandscapeWidthDp());
} else {
int menuY = y;
if (markerY + markerPaddingPx > menuY) {
int dy = markerY - (menuY - markerPaddingPx);
map.moveTo(0, dy);
}
}
} }
private int getFabY(int y) { private int getFabY(int y) {