Merge
This commit is contained in:
GaidamakUA
commit
adcda61a63
15 changed files with 423 additions and 49 deletions
|
|
@ -18,7 +18,7 @@ public class PoiType extends AbstractPoiType {
|
|||
private boolean text;
|
||||
private boolean nameOnly;
|
||||
private boolean relation;
|
||||
private int order;
|
||||
private int order = 90;
|
||||
|
||||
|
||||
public PoiType(MapPoiTypes poiTypes, PoiCategory category, String name) {
|
||||
|
|
|
|||
|
|
@ -2409,7 +2409,7 @@
|
|||
<string name="poi_sculptor">Billedhugger</string>
|
||||
|
||||
<string name="poi_cross">Kors</string>
|
||||
<string name="poi_summit_cross">Topkors: ja</string>
|
||||
<string name="poi_summit_cross">Kors på toppen: ja</string>
|
||||
|
||||
<string name="poi_prison_camp">Tidligere fangelejr</string>
|
||||
<string name="poi_concentration_camp">Type: koncentrationslejr</string>
|
||||
|
|
@ -2429,7 +2429,7 @@
|
|||
<string name="poi_boat_storage">Bådopbevaring</string>
|
||||
|
||||
|
||||
<string name="poi_conveying_yes">Flytning: ja</string>
|
||||
<string name="poi_conveying_yes">Transportør: ja</string>
|
||||
|
||||
|
||||
<string name="poi_bridge_ref">Bro ref</string>
|
||||
|
|
@ -2517,4 +2517,76 @@
|
|||
|
||||
<string name="poi_internet_access_type_yes">Med internetadgang</string>
|
||||
|
||||
<string name="poi_health_specialty_general_yes">Sundhedsspeciale: alment praktiserende læge</string>
|
||||
<string name="poi_health_specialty_ophthalmology_yes">Sundhedsspeciale: oftalmologi</string>
|
||||
<string name="poi_health_specialty_gynaecology_yes">Sundhedsspeciale: gynækologi</string>
|
||||
<string name="poi_health_specialty_internal_medicine_yes">Sundhedsspeciale: intern medicin</string>
|
||||
<string name="poi_health_specialty_orthopaedics_yes">Sundhedsspeciale: ortopædi</string>
|
||||
<string name="poi_health_specialty_otolaryngology_yes">oto-rhino-laryngolog: oto-rhino-laryngolog</string>
|
||||
<string name="poi_health_specialty_paediatrics_yes">Sundhedsspeciale: pædiatri</string>
|
||||
<string name="poi_health_specialty_paediatrics_no">Sundhedsspeciale: pædiatri: nej</string>
|
||||
<string name="poi_health_specialty_dermatology_yes">Sundhedsspeciale: dermatologi</string>
|
||||
<string name="poi_health_specialty_urology_yes">Sundhedsspeciale: urologi</string>
|
||||
<string name="poi_health_specialty_surgery_yes">Sundhedsspeciale: almen kirurgi</string>
|
||||
<string name="poi_health_specialty_radiology_yes">Sundhedsspeciale: radiologi</string>
|
||||
<string name="poi_health_specialty_psychiatry_yes">Sundhedsspeciale: psykiatri</string>
|
||||
<string name="poi_health_specialty_neurology_yes">Sundhedsspeciale: neurologi</string>
|
||||
<string name="poi_health_specialty_dermatovenereology_yes">Sundhedsspeciale: dermato-venerologi</string>
|
||||
<string name="poi_health_specialty_cardiology_yes">Sundhedsspeciale: kardiologi</string>
|
||||
<string name="poi_health_specialty_trauma_yes">Sundhedsspeciale: traumatologi</string>
|
||||
<string name="poi_health_specialty_biology_yes">Sundhedsspeciale: klinisk biologi</string>
|
||||
<string name="poi_health_specialty_osteopathy_yes">Sundhedsspeciale: osteopati</string>
|
||||
<string name="poi_health_specialty_anaesthetics_yes">Sundhedsspeciale: anæstetika</string>
|
||||
<string name="poi_health_specialty_pulmonology_yes">Sundhedsspeciale: respiratory medicine</string>
|
||||
<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Sundhedsspeciale: tand-, mund- og kæbe ansigtskirurgi</string>
|
||||
<string name="poi_health_specialty_maternity_yes">Sundhedsspeciale: barsel</string>
|
||||
<string name="poi_health_specialty_emergency_medicine_yes">Sundhedsspeciale: ulykkes- og katastrofemedicin</string>
|
||||
<string name="poi_health_specialty_emergency_medicine_no">Sundhedsspeciale: ulykkes- og katastrofemedicin: nej</string>
|
||||
<string name="poi_health_specialty_plastic_surgery_yes">Sundhedsspeciale: plastikkirurgi</string>
|
||||
<string name="poi_health_specialty_orthodontics_yes">Sundhedsspeciale: ortodonti</string>
|
||||
<string name="poi_health_specialty_physiotherapy_yes">Sundhedsspeciale: fysioterapi</string>
|
||||
<string name="poi_health_specialty_biochemistry_yes">Sundhedsspeciale: biokemi</string>
|
||||
<string name="poi_health_specialty_occupational_yes">Sundhedsspeciale: ergoterapi</string>
|
||||
<string name="poi_health_specialty_child_psychiatry_yes">Sundhedsspeciale: børnepsykiatri</string>
|
||||
<string name="poi_health_specialty_physiatry_yes">Sundhedsspeciale: fysisk medicin og rehabilitering</string>
|
||||
<string name="poi_health_specialty_maxillofacial_surgery_yes">Sundhedsspeciale:-ansigtskirurgi</string>
|
||||
<string name="poi_health_specialty_diagnostic_radiology_yes">Sundhedsspeciale: diagnostisk radiologi</string>
|
||||
<string name="poi_health_specialty_gastroenterology_yes">Sundhedsspeciale: gastroenterologi</string>
|
||||
<string name="poi_health_specialty_dentistry_yes">Sundhedsspeciale: tandpleje</string>
|
||||
<string name="poi_health_specialty_nephrology_yes">Sundhedsspeciale: nefrologi (nyre sygdomme)</string>
|
||||
<string name="poi_health_specialty_neurosurgery_yes">Sundhedsspeciale: neurokirurgi</string>
|
||||
<string name="poi_health_specialty_neuropsychiatry_yes">Sundhedsspeciale: neuropsykiatri</string>
|
||||
<string name="poi_health_specialty_endocrinology_yes">Sundhedsspeciale: endokrinologi</string>
|
||||
<string name="poi_health_specialty_nuclear_medicine_yes">Sundhedsspeciale: nuklear medicin</string>
|
||||
<string name="poi_health_specialty_pathology_yes">Sundhedsspeciale: patologisk anatomi</string>
|
||||
<string name="poi_health_specialty_oncology_yes">Sundhedsspeciale: onkologi</string>
|
||||
<string name="poi_health_specialty_tropical_medicine_yes">Sundhedsspeciale: tropemedicin</string>
|
||||
<string name="poi_health_specialty_tropical_medicine_no">Sundhedsspeciale: tropemedicin: nej</string>
|
||||
<string name="poi_health_specialty_obstetrics_postnatal_yes">Sundhedsspeciale: obstetrik (postnatal)</string>
|
||||
<string name="poi_health_specialty_obstetrics_postnatal_no">Sundhedsspeciale: obstetrik (postnatal): nej</string>
|
||||
<string name="poi_health_specialty_obstetrics_antenatal_yes">Sundhedsspeciale: obstetrik (før fødslen)</string>
|
||||
<string name="poi_health_specialty_obstetrics_antenatal_no">Sundhedsspeciale: obstetrik (før fødslen): nej</string>
|
||||
<string name="poi_health_specialty_social_paediatrics_yes">Sundhedsspeciale: socialpædiatri</string>
|
||||
<string name="poi_health_specialty_social_paediatrics_no">Sundhedspeciale: socialpædiatri: nej</string>
|
||||
<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Sundhedsspeciale: obstetrik (kejsersnit)</string>
|
||||
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Sundhedsspeciale: obstetrik (kejsersnit): nej</string>
|
||||
<string name="poi_health_specialty_addiction_medicine_yes">Sundhedsspeciale: afhængighed af medicin</string>
|
||||
<string name="poi_health_specialty_optometry_yes">Sundhedsspeciale: optometry</string>
|
||||
<string name="poi_health_specialty_clinical_pathology_yes">Sundhedspeciale: klinisk patologi</string>
|
||||
<string name="poi_health_specialty_speech_therapy_yes">Sundhedsspeciale: taleterapi</string>
|
||||
<string name="poi_health_specialty_manual_therapy_yes">Sundhedsspeciale: manuel terapi</string>
|
||||
<string name="poi_health_specialty_sports_medicine_yes">Sundhedsspeciale: sportsmedicin</string>
|
||||
<string name="poi_health_specialty_podology_yes">Sundhedsspeciale: podology</string>
|
||||
<string name="poi_health_specialty_adult_psychiatry_yes">Sundhedsspeciale: voksenpsykiatri</string>
|
||||
<string name="poi_health_specialty_acupuncture_yes">Sundhedsspeciale: akupunktur</string>
|
||||
<string name="poi_health_specialty_homeopathy_yes">Sundhedsspeciale: homøopati</string>
|
||||
<string name="poi_health_specialty_traditional_chinese_medicine_yes">Sundhedsspeciale: traditionel kinesiskmedicin</string>
|
||||
<string name="poi_health_specialty_reiki_yes">Sundhedsspeciale: reiki</string>
|
||||
<string name="poi_health_specialty_herbalism_yes">Sundhedsspeciale: naturmedicin</string>
|
||||
<string name="poi_health_specialty_chiropractic_yes">Sundhedspeciale: kiropraktik</string>
|
||||
<string name="poi_health_specialty_naturopathy_yes">Sundhesspeciale: naturopati</string>
|
||||
<string name="poi_health_specialty_depth_psychology_yes">Sundhedsspeciale: dybde psykologi</string>
|
||||
<string name="poi_health_specialty_behavior_yes">Sundhedsspeciale: adfærd</string>
|
||||
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2444,4 +2444,76 @@
|
|||
<string name="poi_wetland_palsa_bog">Palsamoor</string>
|
||||
<string name="poi_payment_icsf_yes">IC gespeicherte Fährfahrkarten akzeptiert</string>
|
||||
<string name="poi_payment_icsf_no">IC gespeicherte Fährfahrkarten nicht akzeptiert</string>
|
||||
<string name="poi_health_specialty_general_yes">Hausarzt</string>
|
||||
<string name="poi_health_specialty_ophthalmology_yes">Augenheilkunde</string>
|
||||
<string name="poi_health_specialty_gynaecology_yes">Gynäkologie</string>
|
||||
<string name="poi_health_specialty_internal_medicine_yes">Innere Medizin</string>
|
||||
<string name="poi_health_specialty_orthopaedics_yes">Orthopädie</string>
|
||||
<string name="poi_health_specialty_otolaryngology_yes">Hals-Nasen-Ohrenheilkunde</string>
|
||||
<string name="poi_health_specialty_paediatrics_yes">Kinderheilkunde</string>
|
||||
<string name="poi_health_specialty_paediatrics_no">Kinderheilkunde: nein</string>
|
||||
<string name="poi_health_specialty_dermatology_yes">Dermatologie</string>
|
||||
<string name="poi_health_specialty_urology_yes">Urologie</string>
|
||||
<string name="poi_health_specialty_surgery_yes">(Allgemeine) Chirurgie</string>
|
||||
<string name="poi_health_specialty_radiology_yes">Radiologie</string>
|
||||
<string name="poi_health_specialty_psychiatry_yes">Psychiatrie und Psychotherapie</string>
|
||||
<string name="poi_health_specialty_neurology_yes">Neurologie</string>
|
||||
<string name="poi_health_specialty_dermatovenereology_yes">Haut- und Geschlechtskrankheiten</string>
|
||||
<string name="poi_health_specialty_cardiology_yes">Innere Medizin und Schwerpunkt Kardiologie</string>
|
||||
<string name="poi_health_specialty_trauma_yes">Traumatologie</string>
|
||||
<string name="poi_health_specialty_biology_yes">Klinische Biologie</string>
|
||||
<string name="poi_health_specialty_osteopathy_yes">Osteopathie (Alternativmedizin)</string>
|
||||
<string name="poi_health_specialty_anaesthetics_yes">Anästhesiologie</string>
|
||||
<string name="poi_health_specialty_pulmonology_yes">Pneumologie</string>
|
||||
<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Zahn-, Mund-, Kiefer- und Gesichtschirurgie</string>
|
||||
<string name="poi_health_specialty_maternity_yes">Mutterschaft</string>
|
||||
<string name="poi_health_specialty_emergency_medicine_yes">Unfall- und Notfallmedizin</string>
|
||||
<string name="poi_health_specialty_emergency_medicine_no">Unfall- und Notfallmedizin: Nein</string>
|
||||
<string name="poi_health_specialty_plastic_surgery_yes">Plastische Chirurgie</string>
|
||||
<string name="poi_health_specialty_orthodontics_yes">Kieferorthopädie</string>
|
||||
<string name="poi_health_specialty_physiotherapy_yes">Krankengymnastik</string>
|
||||
<string name="poi_health_specialty_biochemistry_yes">Biologische Chemie</string>
|
||||
<string name="poi_health_specialty_occupational_yes">Ergotherapie</string>
|
||||
<string name="poi_health_specialty_child_psychiatry_yes">Kinderpsychiatrie</string>
|
||||
<string name="poi_health_specialty_physiatry_yes">Physikalische Medizin und Rehabilitation</string>
|
||||
<string name="poi_health_specialty_maxillofacial_surgery_yes">Kiefer- und Gesichtschirurgie</string>
|
||||
<string name="poi_health_specialty_diagnostic_radiology_yes">diagnostische Radiologie</string>
|
||||
<string name="poi_health_specialty_gastroenterology_yes">Innere Medizin und Schwerpunkt Gastroenterologie</string>
|
||||
<string name="poi_health_specialty_dentistry_yes">Zahnheilkunde</string>
|
||||
<string name="poi_health_specialty_nephrology_yes">Nephrologie (Nierenerkrankungen)</string>
|
||||
<string name="poi_health_specialty_neurosurgery_yes">Neurochirurgie</string>
|
||||
<string name="poi_health_specialty_neuropsychiatry_yes">Nervenheilkunde (Neurologie und Psychiatrie)</string>
|
||||
<string name="poi_health_specialty_endocrinology_yes">Innere Medizin und Schwerpunkt Endokrinologie und Diabetologie</string>
|
||||
<string name="poi_health_specialty_nuclear_medicine_yes">Nuklearmedizin</string>
|
||||
<string name="poi_health_specialty_pathology_yes">Pathologie</string>
|
||||
<string name="poi_health_specialty_oncology_yes">Onkologie</string>
|
||||
<string name="poi_health_specialty_tropical_medicine_yes">Tropenmedizin</string>
|
||||
<string name="poi_health_specialty_tropical_medicine_no">Tropenmedizin: Nein</string>
|
||||
<string name="poi_health_specialty_obstetrics_postnatal_yes">Geburtshilfe (postnatal)</string>
|
||||
<string name="poi_health_specialty_obstetrics_postnatal_no">Geburtshilfe (nachgeburtlich): Nein</string>
|
||||
<string name="poi_health_specialty_obstetrics_antenatal_yes">Geburtshilfe (vorgeburtliche)</string>
|
||||
<string name="poi_health_specialty_obstetrics_antenatal_no">Geburtshilfe (vorgeburtliche): Nein</string>
|
||||
<string name="poi_health_specialty_social_paediatrics_yes">Sozialpädiatrie</string>
|
||||
<string name="poi_health_specialty_social_paediatrics_no">Sozialpädiatrie: Nein</string>
|
||||
<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Geburtshilfe (Kaiserschnitt)</string>
|
||||
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Geburtshilfe (Kaiserschnitt): Nein</string>
|
||||
<string name="poi_health_specialty_addiction_medicine_yes">Suchtmedizin</string>
|
||||
<string name="poi_health_specialty_optometry_yes">praktische Augenheilkunde</string>
|
||||
<string name="poi_health_specialty_clinical_pathology_yes">Klinische Pathologie</string>
|
||||
<string name="poi_health_specialty_speech_therapy_yes">Logopädie (Sprachtherapie)</string>
|
||||
<string name="poi_health_specialty_manual_therapy_yes">Physiotherapie</string>
|
||||
<string name="poi_health_specialty_sports_medicine_yes">Sportmedizin</string>
|
||||
<string name="poi_health_specialty_podology_yes">Podologie</string>
|
||||
<string name="poi_health_specialty_adult_psychiatry_yes">Erwachsenenpsychiatrie</string>
|
||||
<string name="poi_health_specialty_acupuncture_yes">Akupunktur</string>
|
||||
<string name="poi_health_specialty_homeopathy_yes">Homöopathie</string>
|
||||
<string name="poi_health_specialty_traditional_chinese_medicine_yes">Traditionelle chinesische Medizin</string>
|
||||
<string name="poi_health_specialty_reiki_yes">Reiki</string>
|
||||
<string name="poi_health_specialty_herbalism_yes">Kräuterkunde</string>
|
||||
<string name="poi_health_specialty_chiropractic_yes">Chiropraktik</string>
|
||||
<string name="poi_health_specialty_naturopathy_yes">Naturheilkunde</string>
|
||||
<string name="poi_health_specialty_depth_psychology_yes">Tiefenpsychologie</string>
|
||||
<string name="poi_health_specialty_behavior_yes">Verhalten</string>
|
||||
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1907,7 +1907,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
|
|||
<string name="confirmation_to_clear_history">Soll der Verlauf gelöscht werden?</string>
|
||||
<string name="osmand_parking_hour">h</string>
|
||||
<string name="osmand_parking_minute">min</string>
|
||||
<string name="osmand_parking_time_left">bleibt</string>
|
||||
<string name="osmand_parking_time_left">verbleibend</string>
|
||||
<string name="osm_changes_added_to_local_edits">Die Änderungen an den OSM-Daten wurden dem lokalen Änderungssatz hinzugefügt</string>
|
||||
<string name="shared_string_go">Los</string>
|
||||
<string name="osmand_parking_overdue">überfällig</string>
|
||||
|
|
|
|||
|
|
@ -1873,4 +1873,67 @@
|
|||
<string name="poi_architecture_oldrussian">Arquitetura: russa antiga</string>
|
||||
<string name="poi_architecture_baroque">Arquitetura: barroca</string>
|
||||
<string name="poi_architecture_postconstructivism">Arquitetura: pós-construtivismo</string>
|
||||
<string name="poi_architecture_wilhelminian_style">Arquitetura: estilo guilhermina</string>
|
||||
<string name="poi_architecture_renaissance">Arquitetura: renascentista</string>
|
||||
<string name="poi_architecture_romanesque">Arquitetura: românica</string>
|
||||
|
||||
<string name="poi_tunnel_waterway">Túnel fluvial</string>
|
||||
<string name="poi_tunnel_car">Túnel rodoviário</string>
|
||||
<string name="poi_tunnel_pedestrian">Túnel para pedestre</string>
|
||||
<string name="poi_tunnel_railway">Túnel ferroviário</string>
|
||||
<string name="poi_bridge_car">Ponte rodoviária</string>
|
||||
<string name="poi_bridge_pedestrian">Ponte para pedestre</string>
|
||||
<string name="poi_bridge_bicycle">Ponte para ciclista</string>
|
||||
<string name="poi_bridge_railway">Ponte ferroviária</string>
|
||||
<string name="poi_bridge_waterway">Ponte fluvial</string>
|
||||
<string name="poi_bridge_structure_beam">Estrutura de ponte: viga</string>
|
||||
<string name="poi_bridge_structure_simple_suspension">Estrutura de ponte: suspensão simples</string>
|
||||
<string name="poi_bridge_structure_suspension">Estrutura de ponte: suspensão</string>
|
||||
<string name="poi_bridge_structure_arch">Estrutura de ponte: arco</string>
|
||||
<string name="poi_bridge_structure_truss">Estrutura de ponte: treliça</string>
|
||||
<string name="poi_bridge_structure_floating">Estrutura de ponte: flutuante</string>
|
||||
<string name="poi_bridge_structure_humpback">Estrutura de ponte: corcunda</string>
|
||||
<string name="poi_bridge_structure_cable_stayed">Estrutura de ponte: estaiada</string>
|
||||
<string name="poi_bridge_structure_boardwalk">Estrutura de ponte: passarela</string>
|
||||
<string name="poi_bridge_structure_simple_wooden">Estrutura de ponte: madeira simples</string>
|
||||
<string name="poi_bridge_structure_viaduct">Estrutura de ponte: viaduto</string>
|
||||
<string name="poi_bridge_structure_aqueduct">Estrutura de ponte: aqueduto</string>
|
||||
<string name="poi_bridge_structure_log">Estrutura de ponte: tronco</string>
|
||||
<string name="poi_bridge_type_movable">Tipo de ponte: móvel</string>
|
||||
<string name="poi_bridge_movable_bascule">Tipo de ponte móvel: basculante</string>
|
||||
<string name="poi_bridge_movable_swing">Tipo de ponte móvel: giratória</string>
|
||||
<string name="poi_bridge_movable_lift">Tipo de ponte móvel: elevatória</string>
|
||||
<string name="poi_bridge_movable_drawbridge">Tipo de ponte móvel: ponte levadiça</string>
|
||||
<string name="poi_bridge_movable_submersible">Tipo de ponte móvel: submersível</string>
|
||||
<string name="poi_bridge_movable_transporter">Tipo de ponte móvel: transportadora</string>
|
||||
<string name="poi_bridge_movable_retractable">Tipo de ponte móvel: retrátil</string>
|
||||
|
||||
<string name="poi_lit_yes">Iluminado: sim</string>
|
||||
<string name="poi_lit_no">Iluminado: não</string>
|
||||
|
||||
<string name="poi_surface_unpaved">Superfície: não pavimentada</string>
|
||||
<string name="poi_surface_paved">Superfície: pavimentada</string>
|
||||
<string name="poi_surface_asphalt">Superfície: asfalto</string>
|
||||
<string name="poi_surface_concrete">Superfície: concreto</string>
|
||||
<string name="poi_surface_sett">Superfície: paralelepípedo</string>
|
||||
<string name="poi_surface_cobblestone">Superfície: piso de seixos</string>
|
||||
<string name="poi_surface_paving_stones">Superfície: piso intertravado</string>
|
||||
<string name="poi_surface_pebblestone">Superfície: cascalho</string>
|
||||
<string name="poi_surface_stone">Superfície: pedra</string>
|
||||
<string name="poi_surface_metal">Superfície: metal</string>
|
||||
<string name="poi_surface_wood">Superfície: madeira</string>
|
||||
<string name="poi_surface_gravel">Superfície: brita</string>
|
||||
<string name="poi_surface_fine_gravel">Superfície: brita fina</string>
|
||||
<string name="poi_surface_compacted">Superfície: solo compactado</string>
|
||||
<string name="poi_surface_sand">Superfície: areia</string>
|
||||
<string name="poi_surface_grass">Superfície: grama</string>
|
||||
<string name="poi_surface_grass_paver">Superfície: piso grama</string>
|
||||
<string name="poi_surface_ground">Superfície: chão</string>
|
||||
<string name="poi_surface_dirt">Superfície: solo</string>
|
||||
<string name="poi_surface_mud">Superfície: lama</string>
|
||||
<string name="poi_surface_ice">Superfície: gelo</string>
|
||||
<string name="poi_surface_salt">Superfície: sal</string>
|
||||
<string name="poi_surface_snow">Superfície: neve</string>
|
||||
|
||||
<string name="poi_route_bus_ref">Ônibus</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2466,4 +2466,76 @@
|
|||
<string name="poi_fireworks">Магазин фейерверков</string>
|
||||
|
||||
<string name="poi_aerialway_length">Протяжённость</string>
|
||||
|
||||
<string name="poi_health_specialty_general_yes">Специализация: семейная медицина</string>
|
||||
<string name="poi_health_specialty_ophthalmology_yes">Специализация: офтальмология</string>
|
||||
<string name="poi_health_specialty_gynaecology_yes">Специализация: гинекология</string>
|
||||
<string name="poi_health_specialty_internal_medicine_yes">Специализация: внутренние болезни</string>
|
||||
<string name="poi_health_specialty_orthopaedics_yes">Специализация: ортопедия</string>
|
||||
<string name="poi_health_specialty_otolaryngology_yes">Специализация: отоларингология (ЛОР)</string>
|
||||
<string name="poi_health_specialty_paediatrics_yes">Специализация: педиатрия</string>
|
||||
<string name="poi_health_specialty_paediatrics_no">Специализация: педиатрия: отсутствует</string>
|
||||
<string name="poi_health_specialty_dermatology_yes">Специализация: дерматология</string>
|
||||
<string name="poi_health_specialty_urology_yes">Специализация: урология</string>
|
||||
<string name="poi_health_specialty_surgery_yes">Специализация: общая хирургия</string>
|
||||
<string name="poi_health_specialty_radiology_yes">Специализация: радиология</string>
|
||||
<string name="poi_health_specialty_psychiatry_yes">Специализация: психиатрия</string>
|
||||
<string name="poi_health_specialty_neurology_yes">Специализация: неврология</string>
|
||||
<string name="poi_health_specialty_dermatovenereology_yes">Специализация: дерматовенерология</string>
|
||||
<string name="poi_health_specialty_cardiology_yes">Специализация: кардиология</string>
|
||||
<string name="poi_health_specialty_trauma_yes">Специализация: травматология</string>
|
||||
<string name="poi_health_specialty_biology_yes">Специализация: лабораторная медицина</string>
|
||||
<string name="poi_health_specialty_osteopathy_yes">Специализация: остеопатия</string>
|
||||
<string name="poi_health_specialty_anaesthetics_yes">Специализация: анестезиология и реанимация</string>
|
||||
<string name="poi_health_specialty_pulmonology_yes">Специализация: пульмонология</string>
|
||||
<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Специализация: челюстно-лицевая, зубная хирургия</string>
|
||||
<string name="poi_health_specialty_maternity_yes">Специализация: материнство</string>
|
||||
<string name="poi_health_specialty_emergency_medicine_yes">Специализация: скорая и неотложная помощь</string>
|
||||
<string name="poi_health_specialty_emergency_medicine_no">Специализация: скорая и неотложная помощь: отсутствует</string>
|
||||
<string name="poi_health_specialty_plastic_surgery_yes">Специализация: пластическая хирургия</string>
|
||||
<string name="poi_health_specialty_orthodontics_yes">Специализация: ортодонтия</string>
|
||||
<string name="poi_health_specialty_physiotherapy_yes">Специализация: физиотерапия (лечебная физическая культура)</string>
|
||||
<string name="poi_health_specialty_biochemistry_yes">Специализация: биохимия</string>
|
||||
<string name="poi_health_specialty_occupational_yes">Специализация: профессиональные болезни</string>
|
||||
<string name="poi_health_specialty_child_psychiatry_yes">Специализация: детская психиатрия</string>
|
||||
<string name="poi_health_specialty_physiatry_yes">Специализация: реабилитация</string>
|
||||
<string name="poi_health_specialty_maxillofacial_surgery_yes">Специализация: челюстно-лицевая хирургия</string>
|
||||
<string name="poi_health_specialty_diagnostic_radiology_yes">Специализация: лучевая диагностика</string>
|
||||
<string name="poi_health_specialty_gastroenterology_yes">Специализация: гастроэнтерология</string>
|
||||
<string name="poi_health_specialty_dentistry_yes">Специализация: стоматология</string>
|
||||
<string name="poi_health_specialty_nephrology_yes">Специализация: нефрология (почечные заболевания)</string>
|
||||
<string name="poi_health_specialty_neurosurgery_yes">Специализация: нейрохирургия</string>
|
||||
<string name="poi_health_specialty_neuropsychiatry_yes">Специализация: нейропсихиатрия</string>
|
||||
<string name="poi_health_specialty_endocrinology_yes">Специализация: эндокринология</string>
|
||||
<string name="poi_health_specialty_nuclear_medicine_yes">Специализация: ядерная медицина</string>
|
||||
<string name="poi_health_specialty_pathology_yes">Специализация: патанатомия</string>
|
||||
<string name="poi_health_specialty_oncology_yes">Специализация: онкология</string>
|
||||
<string name="poi_health_specialty_tropical_medicine_yes">Специализация: тропическая медицина</string>
|
||||
<string name="poi_health_specialty_tropical_medicine_no">Специализация: тропическая медицина: отсутствует</string>
|
||||
<string name="poi_health_specialty_obstetrics_postnatal_yes">Специализация: акушерство (послеродовое)</string>
|
||||
<string name="poi_health_specialty_obstetrics_postnatal_no">Специализация: акушерство (послеродовое): отсутствует</string>
|
||||
<string name="poi_health_specialty_obstetrics_antenatal_yes">Специализация: акушерство (дородовое)</string>
|
||||
<string name="poi_health_specialty_obstetrics_antenatal_no">Специализация: акушерство (дородовое): отсутствует</string>
|
||||
<string name="poi_health_specialty_social_paediatrics_yes">Специализация: social paediatrics</string>
|
||||
<string name="poi_health_specialty_social_paediatrics_no">Специализация: social paediatrics: no</string>
|
||||
<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Специализация: акушерство (кесарево сечение)</string>
|
||||
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Специализация: акушерство (кесарево сечение): отсутствует</string>
|
||||
<string name="poi_health_specialty_addiction_medicine_yes">Специализация: наркология</string>
|
||||
<string name="poi_health_specialty_optometry_yes">Специализация: оптометрия</string>
|
||||
<string name="poi_health_specialty_clinical_pathology_yes">Специализация: клиническая патология</string>
|
||||
<string name="poi_health_specialty_speech_therapy_yes">Специализация: логопед</string>
|
||||
<string name="poi_health_specialty_manual_therapy_yes">Специализация: мануальная терапия</string>
|
||||
<string name="poi_health_specialty_sports_medicine_yes">Специализация: спортивная медицина</string>
|
||||
<string name="poi_health_specialty_podology_yes">Специализация: подология</string>
|
||||
<string name="poi_health_specialty_adult_psychiatry_yes">Специализация: психиатрия для взрослых</string>
|
||||
<string name="poi_health_specialty_acupuncture_yes">Специализация: акупунктура</string>
|
||||
<string name="poi_health_specialty_homeopathy_yes">Специализация: гомеопатия</string>
|
||||
<string name="poi_health_specialty_traditional_chinese_medicine_yes">Специализация: традиционная китайская медицина</string>
|
||||
<string name="poi_health_specialty_reiki_yes">Специализация: рейки</string>
|
||||
<string name="poi_health_specialty_herbalism_yes">Специализация: травничество</string>
|
||||
<string name="poi_health_specialty_chiropractic_yes">Специализация: хиропрактика</string>
|
||||
<string name="poi_health_specialty_naturopathy_yes">Специализация: натуропатия</string>
|
||||
<string name="poi_health_specialty_depth_psychology_yes">Специализация: глубинная психология</string>
|
||||
<string name="poi_health_specialty_behavior_yes">Специализация: бихевиоральная (поведенческая) психотерапия</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2358,4 +2358,18 @@
|
|||
<string name="poi_wiki_lang_tg">塔吉克語維基</string>
|
||||
<string name="poi_wiki_lang_ba">巴什基爾語維基</string>
|
||||
<string name="poi_wiki_lang_sco">低地蘇格蘭語維基</string>
|
||||
<string name="poi_wiki_lang_pnb">旁遮普語維基</string>
|
||||
<string name="poi_wiki_lang_cv">楚瓦什語維基</string>
|
||||
<string name="poi_wiki_lang_lmo">倫巴底語維基</string>
|
||||
<string name="poi_wiki_lang_my">緬甸語維基</string>
|
||||
<string name="poi_wiki_lang_yo">約魯巴語維基</string>
|
||||
<string name="poi_wiki_lang_an">亞拉岡語維基</string>
|
||||
<string name="poi_wiki_lang_ne">尼泊爾語維基</string>
|
||||
<string name="poi_wiki_lang_gu">古吉拉特語維基</string>
|
||||
<string name="poi_wiki_lang_scn">西西里語維基</string>
|
||||
<string name="poi_wiki_lang_bar">巴伐利亞語維基</string>
|
||||
<string name="poi_wiki_lang_mn">蒙古語維基</string>
|
||||
<string name="poi_wiki_lang_nap">那不勒斯語維基</string>
|
||||
|
||||
<string name="poi_craft_electronics">3C產品維修</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2461,4 +2461,76 @@
|
|||
|
||||
<string name="poi_aerialway_length">Length</string>
|
||||
|
||||
<string name="poi_health_specialty_general_yes">Health specialty: general practitioner</string>
|
||||
<string name="poi_health_specialty_ophthalmology_yes">Health specialty: ophthalmology</string>
|
||||
<string name="poi_health_specialty_gynaecology_yes">Health specialty: gynaecology</string>
|
||||
<string name="poi_health_specialty_internal_medicine_yes">Health specialty: internal medicine</string>
|
||||
<string name="poi_health_specialty_orthopaedics_yes">Health specialty: orthopaedics</string>
|
||||
<string name="poi_health_specialty_otolaryngology_yes">Health specialty: otolaryngology</string>
|
||||
<string name="poi_health_specialty_paediatrics_yes">Health specialty: paediatrics</string>
|
||||
<string name="poi_health_specialty_paediatrics_no">Health specialty: paediatrics: no</string>
|
||||
<string name="poi_health_specialty_dermatology_yes">Health specialty: dermatology</string>
|
||||
<string name="poi_health_specialty_urology_yes">Health specialty: urology</string>
|
||||
<string name="poi_health_specialty_surgery_yes">Health specialty: general surgery</string>
|
||||
<string name="poi_health_specialty_radiology_yes">Health specialty: radiology</string>
|
||||
<string name="poi_health_specialty_psychiatry_yes">Health specialty: psychiatry</string>
|
||||
<string name="poi_health_specialty_neurology_yes">Health specialty: neurology</string>
|
||||
<string name="poi_health_specialty_dermatovenereology_yes">Health specialty: dermato-venereology</string>
|
||||
<string name="poi_health_specialty_cardiology_yes">Health specialty: cardiology</string>
|
||||
<string name="poi_health_specialty_trauma_yes">Health specialty: traumatology</string>
|
||||
<string name="poi_health_specialty_biology_yes">Health specialty: clinical biology</string>
|
||||
<string name="poi_health_specialty_osteopathy_yes">Health specialty: osteopathy</string>
|
||||
<string name="poi_health_specialty_anaesthetics_yes">Health specialty: anaesthetics</string>
|
||||
<string name="poi_health_specialty_pulmonology_yes">Health specialty: respiratory medicine</string>
|
||||
<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Health specialty: dental, oral and maxillo-facial surgery</string>
|
||||
<string name="poi_health_specialty_maternity_yes">Health specialty: maternity</string>
|
||||
<string name="poi_health_specialty_emergency_medicine_yes">Health specialty: accident and emergency medicine</string>
|
||||
<string name="poi_health_specialty_emergency_medicine_no">Health specialty: accident and emergency medicine: no</string>
|
||||
<string name="poi_health_specialty_plastic_surgery_yes">Health specialty: plastic surgery</string>
|
||||
<string name="poi_health_specialty_orthodontics_yes">Health specialty: orthodontics</string>
|
||||
<string name="poi_health_specialty_physiotherapy_yes">Health specialty: physiotherapy</string>
|
||||
<string name="poi_health_specialty_biochemistry_yes">Health specialty: biological chemistry</string>
|
||||
<string name="poi_health_specialty_occupational_yes">Health specialty: occupational therapy</string>
|
||||
<string name="poi_health_specialty_child_psychiatry_yes">Health specialty: child psychiatry</string>
|
||||
<string name="poi_health_specialty_physiatry_yes">Health specialty: physical medicine and rehabilitation</string>
|
||||
<string name="poi_health_specialty_maxillofacial_surgery_yes">Health specialty: maxillo-facial surgery</string>
|
||||
<string name="poi_health_specialty_diagnostic_radiology_yes">Health specialty: diagnostic radiology</string>
|
||||
<string name="poi_health_specialty_gastroenterology_yes">Health specialty: gastroenterology</string>
|
||||
<string name="poi_health_specialty_dentistry_yes">Health specialty: dentistry</string>
|
||||
<string name="poi_health_specialty_nephrology_yes">Health specialty: nephrology (renal diseases)</string>
|
||||
<string name="poi_health_specialty_neurosurgery_yes">Health specialty: neurological surgery</string>
|
||||
<string name="poi_health_specialty_neuropsychiatry_yes">Health specialty: neuropsychiatry</string>
|
||||
<string name="poi_health_specialty_endocrinology_yes">Health specialty: endocrinology</string>
|
||||
<string name="poi_health_specialty_nuclear_medicine_yes">Health specialty: nuclear medicine</string>
|
||||
<string name="poi_health_specialty_pathology_yes">Health specialty: pathological anatomy</string>
|
||||
<string name="poi_health_specialty_oncology_yes">Health specialty: oncology</string>
|
||||
<string name="poi_health_specialty_tropical_medicine_yes">Health specialty: tropical medicine</string>
|
||||
<string name="poi_health_specialty_tropical_medicine_no">Health specialty: tropical medicine: no</string>
|
||||
<string name="poi_health_specialty_obstetrics_postnatal_yes">Health specialty: obstetrics (postnatal)</string>
|
||||
<string name="poi_health_specialty_obstetrics_postnatal_no">Health specialty: obstetrics (postnatal): no</string>
|
||||
<string name="poi_health_specialty_obstetrics_antenatal_yes">Health specialty: obstetrics (antenatal)</string>
|
||||
<string name="poi_health_specialty_obstetrics_antenatal_no">Health specialty: obstetrics (antenatal): no</string>
|
||||
<string name="poi_health_specialty_social_paediatrics_yes">Health specialty: social paediatrics</string>
|
||||
<string name="poi_health_specialty_social_paediatrics_no">Health specialty: social paediatrics: no</string>
|
||||
<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Health specialty: obstetrics (caesarean section)</string>
|
||||
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Health specialty: obstetrics (caesarean section): no</string>
|
||||
<string name="poi_health_specialty_addiction_medicine_yes">Health specialty: addiction medicine</string>
|
||||
<string name="poi_health_specialty_optometry_yes">Health specialty: optometry</string>
|
||||
<string name="poi_health_specialty_clinical_pathology_yes">Health specialty: clinical pathology</string>
|
||||
<string name="poi_health_specialty_speech_therapy_yes">Health specialty: speech therapy</string>
|
||||
<string name="poi_health_specialty_manual_therapy_yes">Health specialty: manual therapy</string>
|
||||
<string name="poi_health_specialty_sports_medicine_yes">Health specialty: sports medicine</string>
|
||||
<string name="poi_health_specialty_podology_yes">Health specialty: podology</string>
|
||||
<string name="poi_health_specialty_adult_psychiatry_yes">Health specialty: adult psychiatry</string>
|
||||
<string name="poi_health_specialty_acupuncture_yes">Health specialty: acupuncture</string>
|
||||
<string name="poi_health_specialty_homeopathy_yes">Health specialty: homeopathy</string>
|
||||
<string name="poi_health_specialty_traditional_chinese_medicine_yes">Health specialty: traditional chinese medicine</string>
|
||||
<string name="poi_health_specialty_reiki_yes">Health specialty: reiki</string>
|
||||
<string name="poi_health_specialty_herbalism_yes">Health specialty: herbalism</string>
|
||||
<string name="poi_health_specialty_chiropractic_yes">Health specialty: chiropractic</string>
|
||||
<string name="poi_health_specialty_naturopathy_yes">Health specialty: naturopathy</string>
|
||||
<string name="poi_health_specialty_depth_psychology_yes">Health specialty: depth psychology</string>
|
||||
<string name="poi_health_specialty_behavior_yes">Health specialty: behavior</string>
|
||||
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -399,7 +399,7 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {
|
|||
} else {
|
||||
if (ErrorBottomSheetDialog.shouldShow(settings, this)) {
|
||||
new ErrorBottomSheetDialog().show(getSupportFragmentManager(), "dialog");
|
||||
} else if (RateUsBottomSheetDialog.shouldShow(settings)) {
|
||||
} else if (RateUsBottomSheetDialog.shouldShow(app)) {
|
||||
new RateUsBottomSheetDialog().show(getSupportFragmentManager(), "dialog");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import android.view.View;
|
|||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.plus.OsmandSettings;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.Version;
|
||||
|
|
@ -84,6 +83,7 @@ public class DashRateUsFragment extends DashBaseFragment {
|
|||
positiveButton.setText(getResources().getString(R.string.shared_string_ok));
|
||||
negativeButton.setText(getResources().getString(R.string.shared_string_no_thanks));
|
||||
return;
|
||||
<<<<<<< HEAD
|
||||
case USER_LIKES_APP:
|
||||
settings.RATE_US_STATE.set(RateUsBottomSheetDialog.RateUsState.LIKED);
|
||||
Uri uri = Uri.parse(Version.marketPrefix(getMyApplication()) + getActivity().getPackageName());
|
||||
|
|
|
|||
|
|
@ -133,15 +133,13 @@ public abstract class MenuController extends BaseMenuController {
|
|||
}
|
||||
|
||||
public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) {
|
||||
addMyLocationToPlainItems(pointDescription, latLon);
|
||||
addMyLocationToPlainItems(latLon);
|
||||
}
|
||||
|
||||
protected void addMyLocationToPlainItems(PointDescription pointDescription, LatLon latLon) {
|
||||
if (pointDescription != null) {
|
||||
protected void addMyLocationToPlainItems(LatLon latLon) {
|
||||
addPlainMenuItem(R.drawable.ic_action_get_my_location, PointDescription.getLocationName(getMapActivity(),
|
||||
latLon.getLatitude(), latLon.getLongitude(), true).replaceAll("\n", ""), false);
|
||||
}
|
||||
}
|
||||
|
||||
public PointDescription getPointDescription() {
|
||||
return pointDescription;
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import android.widget.LinearLayout;
|
|||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.Amenity;
|
||||
import net.osmand.data.PointDescription;
|
||||
import net.osmand.osm.AbstractPoiType;
|
||||
import net.osmand.osm.MapPoiTypes;
|
||||
import net.osmand.osm.PoiType;
|
||||
|
|
@ -23,7 +24,6 @@ import net.osmand.util.Algorithms;
|
|||
import net.osmand.util.OpeningHoursParser;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.LinkedList;
|
||||
|
|
@ -164,7 +164,8 @@ public class AmenityMenuBuilder extends MenuBuilder {
|
|||
boolean isWiki = false;
|
||||
boolean isText = false;
|
||||
boolean needLinks = !"population".equals(key);
|
||||
int order = 0;
|
||||
int poiTypeOrder = 0;
|
||||
String poiTypeKeyName = "";
|
||||
|
||||
if (amenity.getType().isWiki()) {
|
||||
if (!hasWiki) {
|
||||
|
|
@ -216,7 +217,8 @@ public class AmenityMenuBuilder extends MenuBuilder {
|
|||
AbstractPoiType pt = poiTypes.getAnyPoiAdditionalTypeByKey(key);
|
||||
if (pt != null) {
|
||||
PoiType pType = (PoiType) pt;
|
||||
order = pType.getOrder();
|
||||
poiTypeOrder = pType.getOrder();
|
||||
poiTypeKeyName = pType.getKeyName();
|
||||
if (pType.getParentType() != null && pType.getParentType() instanceof PoiType) {
|
||||
icon = getRowIcon(view.getContext(), ((PoiType) pType.getParentType()).getOsmTag() + "_" + pType.getOsmTag().replace(':', '_') + "_" + pType.getOsmValue());
|
||||
}
|
||||
|
|
@ -235,18 +237,27 @@ public class AmenityMenuBuilder extends MenuBuilder {
|
|||
}
|
||||
|
||||
if (isText && iconId == R.drawable.ic_action_note_dark) {
|
||||
descriptions.add(new AmenityInfoRow(key, R.drawable.ic_action_note_dark, textPrefix, vl, 0, false, true, true, 0));
|
||||
descriptions.add(new AmenityInfoRow(key, R.drawable.ic_action_note_dark, textPrefix,
|
||||
vl, 0, false, true, true, 0, ""));
|
||||
} else if (icon != null) {
|
||||
infoRows.add(new AmenityInfoRow(key, icon, textPrefix, vl, textColor, isWiki, isText, needLinks, order));
|
||||
infoRows.add(new AmenityInfoRow(key, icon, textPrefix, vl, textColor, isWiki, isText,
|
||||
needLinks, poiTypeOrder, poiTypeKeyName));
|
||||
} else {
|
||||
infoRows.add(new AmenityInfoRow(key, iconId, textPrefix, vl, textColor, isWiki, isText, needLinks, order));
|
||||
infoRows.add(new AmenityInfoRow(key, iconId, textPrefix, vl, textColor, isWiki, isText,
|
||||
needLinks, poiTypeOrder, poiTypeKeyName));
|
||||
}
|
||||
}
|
||||
|
||||
Collections.sort(infoRows, new Comparator<AmenityInfoRow>() {
|
||||
@Override
|
||||
public int compare(AmenityInfoRow row1, AmenityInfoRow row2) {
|
||||
return row1.order < row2.order ? -1 : (row1.order == row2.order ? 0 : 1);
|
||||
if (row1.order < row2.order) {
|
||||
return -1;
|
||||
} else if (row1.order == row2.order) {
|
||||
return row1.name.compareTo(row2.name);
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -271,6 +282,10 @@ public class AmenityMenuBuilder extends MenuBuilder {
|
|||
for (AmenityInfoRow info : descriptions) {
|
||||
buildAmenityRow(view, info);
|
||||
}
|
||||
|
||||
buildRow(view, R.drawable.ic_action_get_my_location, PointDescription.getLocationName(app,
|
||||
amenity.getLocation().getLatitude(), amenity.getLocation().getLongitude(), true)
|
||||
.replaceAll("\n", ""), 0, false, 0);
|
||||
}
|
||||
|
||||
public void buildAmenityRow(View view, AmenityInfoRow info) {
|
||||
|
|
@ -292,9 +307,11 @@ public class AmenityMenuBuilder extends MenuBuilder {
|
|||
private boolean isText;
|
||||
private boolean needLinks;
|
||||
private int order;
|
||||
private String name;
|
||||
|
||||
public AmenityInfoRow(String key, Drawable icon, String textPrefix, String text,
|
||||
int textColor, boolean isWiki, boolean isText, boolean needLinks, int order) {
|
||||
int textColor, boolean isWiki, boolean isText, boolean needLinks,
|
||||
int order, String name) {
|
||||
this.key = key;
|
||||
this.icon = icon;
|
||||
this.textPrefix = textPrefix;
|
||||
|
|
@ -304,10 +321,12 @@ public class AmenityMenuBuilder extends MenuBuilder {
|
|||
this.isText = isText;
|
||||
this.needLinks = needLinks;
|
||||
this.order = order;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public AmenityInfoRow(String key, int iconId, String textPrefix, String text,
|
||||
int textColor, boolean isWiki, boolean isText, boolean needLinks, int order) {
|
||||
int textColor, boolean isWiki, boolean isText, boolean needLinks,
|
||||
int order, String name) {
|
||||
this.key = key;
|
||||
this.iconId = iconId;
|
||||
this.textPrefix = textPrefix;
|
||||
|
|
@ -317,6 +336,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
|
|||
this.isText = isText;
|
||||
this.needLinks = needLinks;
|
||||
this.order = order;
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,6 +99,5 @@ public class AmenityMenuController extends MenuController {
|
|||
}
|
||||
addPlainMenuItem(resId, typeStr, false);
|
||||
}
|
||||
addMyLocationToPlainItems(pointDescription, amenity.getLocation());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
package net.osmand.plus.osmedit;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.app.Activity;
|
||||
import android.app.Dialog;
|
||||
import android.app.ProgressDialog;
|
||||
|
|
@ -125,7 +123,6 @@ public class EditPoiDialogFragment extends DialogFragment {
|
|||
.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
|
||||
}
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,7 @@
|
|||
package net.osmand.plus.views;
|
||||
|
||||
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Paint;
|
||||
import android.graphics.Paint.Style;
|
||||
import android.graphics.PointF;
|
||||
import android.graphics.RectF;
|
||||
import java.util.List;
|
||||
|
||||
import net.osmand.Location;
|
||||
import net.osmand.PlatformUtil;
|
||||
|
|
@ -21,7 +15,13 @@ import net.osmand.plus.base.MapViewTrackingUtilities;
|
|||
|
||||
import org.apache.commons.logging.Log;
|
||||
|
||||
import java.util.List;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Paint;
|
||||
import android.graphics.Paint.Style;
|
||||
import android.graphics.PointF;
|
||||
import android.graphics.RectF;
|
||||
|
||||
public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider {
|
||||
private static final Log LOG = PlatformUtil.getLog(PointLocationLayer.class);
|
||||
|
|
@ -68,7 +68,7 @@ public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLay
|
|||
headingPaint.setAntiAlias(true);
|
||||
headingPaint.setStyle(Style.FILL);
|
||||
|
||||
checkAppMode(view.getSettings().getApplicationMode(), false, false);
|
||||
updateIcons(view.getSettings().getApplicationMode(), false);
|
||||
locationProvider = view.getApplication().getLocationProvider();
|
||||
}
|
||||
|
||||
|
|
@ -92,14 +92,7 @@ public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLay
|
|||
}
|
||||
// draw
|
||||
boolean nm = nightMode != null && nightMode.isNightMode();
|
||||
boolean shouldForceUpdate = false;
|
||||
if(nm != this.nm) {
|
||||
this.nm = nm;
|
||||
area.setColor(view.getResources().getColor(!nm?R.color.pos_area : R.color.pos_area_night));
|
||||
headingPaint.setColor(view.getResources().getColor(!nm?R.color.pos_heading :R.color.pos_heading_night));
|
||||
shouldForceUpdate = true;
|
||||
}
|
||||
checkAppMode(view.getSettings().getApplicationMode(), nm, shouldForceUpdate);
|
||||
updateIcons(view.getSettings().getApplicationMode(), nm);
|
||||
Location lastKnownLocation = locationProvider.getLastKnownLocation();
|
||||
if(lastKnownLocation == null || view == null){
|
||||
return;
|
||||
|
|
@ -146,10 +139,10 @@ public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLay
|
|||
public void destroyLayer() {
|
||||
|
||||
}
|
||||
public void checkAppMode(ApplicationMode appMode, boolean nighMode, boolean force) {
|
||||
if (appMode != this.appMode || force) {
|
||||
public void updateIcons(ApplicationMode appMode, boolean nighMode) {
|
||||
if (appMode != this.appMode || this.nm != nighMode) {
|
||||
this.appMode = appMode;
|
||||
|
||||
this.nm = nighMode;
|
||||
final int resourceBearingDay = appMode.getResourceBearingDay();
|
||||
final int resourceBearingNight = appMode.getResourceBearingNight();
|
||||
final int resourceBearing = nighMode ? resourceBearingNight : resourceBearingDay;
|
||||
|
|
@ -159,6 +152,8 @@ public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLay
|
|||
final int resourceLocationNight = appMode.getResourceLocationNight();
|
||||
final int resourceLocation = nighMode ? resourceLocationNight : resourceLocationDay;
|
||||
locationIcon = BitmapFactory.decodeResource(view.getResources(), resourceLocation);
|
||||
area.setColor(view.getResources().getColor(!nm ? R.color.pos_area : R.color.pos_area_night));
|
||||
headingPaint.setColor(view.getResources().getColor(!nm ? R.color.pos_heading : R.color.pos_heading_night));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue