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

Merge

Browse source
This commit is contained in:
GaidamakUA 2015-12-01 14:29:23 +02:00
commit 28e513b434
10 changed files with 1523 additions and 1490 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java
View file

@ -37,7 +37,6 @@ public class GeocodingUtilities {
public static final float THRESHOLD_MULTIPLIER_SKIP_STREETS_AFTER = 3;
public static final float DISTANCE_STREET_NAME_PROXIMITY_BY_NAME = 20000;
public static final float DISTANCE_BULDING_PROXIMITY = 100;
public static final float THRESHOLD_STREET_CHANGE_CONNECTION_POINT = 400; // not important
public static final Comparator<GeocodingResult> DISTANCE_COMPARATOR = new Comparator<GeocodingResult>() {
@Override
@ -138,7 +137,6 @@ public class GeocodingUtilities {
sr.searchPoint = new LatLon(lat, lon);
sr.streetName = Algorithms.isEmpty(road.getName())? road.getRef() : road.getName();
sr.point = p;
sr.connectionPoint = new LatLon(MapUtils.get31LatitudeY(p.preciseY), MapUtils.get31LongitudeX(p.preciseX));
sr.regionFP = road.region.getFilePointer();
sr.regionLen = road.region.getLength();
@ -172,9 +170,6 @@ public class GeocodingUtilities {
GeocodingResult rs = new GeocodingResult(r);
rs.street = (Street) object;
rs.city = rs.street.getCity();
if(d < THRESHOLD_STREET_CHANGE_CONNECTION_POINT) {
rs.connectionPoint = rs.street.getLocation();
}
streetsList.add(rs);
return true;
}

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

File diff suppressed because one or more lines are too long

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

@ -2000,4 +2000,19 @@
<string name="poi_historic_period_first_intermediate_period">Període històric: primer període intermedi (2181-2055 aC)</string>
<string name="poi_historic_period_second_intermediate_period">Període històric: segon període intermedi (1650 – 1550 aC)</string>
<string name="poi_clothes_socks">Mitjons</string>
<string name="poi_historic_period_first_persian_period">Període històric: primer període persa</string>
<string name="poi_historic_period_late_period">Període històric: període tardà (664-332 aC)</string>
<string name="poi_historic_period_second_persian_period">Període històric: segon període persa</string>
<string name="poi_historic_period_alexander_the_great">Període històric: Alexandre el Gran</string>
<string name="poi_historic_period_ptolemaic_egypt">Període històric: Egipte ptolemaic (305 aC-30 aC)</string>
<string name="poi_historic_period_christian_egypt">Període històric: Egipte cristià</string>
<string name="poi_historic_period_byzantine_egypt">Període històric: Egipte bizantí (30 aC - 641 dC)</string>
<string name="poi_historic_period_persian_occupation">Període històric: ocupació persa</string>
<string name="poi_historic_period_greek_dark_ages">Període històric: l\'edat fosca grega (1100-800 aC)</string>
<string name="poi_historic_period_roman_greece">Període històric: greco-romà (146 aC-330 DC)</string>
<string name="poi_historic_period_roman_kingdom">Període històric: Regne romà (753 - 509 aC)</string>
<string name="poi_historic_period_urban">Període històric: urbà (època III, 133 dC - 374 dC)</string>
<string name="poi_historic_period_classical">Període històric: clàssic (època IV, 374 dC - 900 dC)</string>
<string name="poi_historic_period_imperial">Període històric: imperial (època V, 900 dC - 1200 dC)</string>
</resources>

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

@ -1425,7 +1425,7 @@
<string name="poi_aerialway_summer_access_exit">Sommeradgang: kun udgang</string>
<string name="poi_aerialway_summer_access_both">Sommeradgang: ind- og udgang</string>
<string name="poi_wheelchair_no">Kørestol: ikke tilladt</string>
<string name="poi_wheelchair_no">Kørestol: ikke adgang</string>
<string name="poi_wheelchair_limited">Kørestol: begrænset</string>
<string name="poi_stars_1">Stjerner: 1 (Turist)</string>
<string name="poi_stars_1s">Stjerner: 1S (Superior Turist)</string>
@ -2522,7 +2522,7 @@
<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ædkirurgi</string>
<string name="poi_health_specialty_otolaryngology_yes">oto-rhino-laryngolog: oto-rhino-laryngolog</string>
<string name="poi_health_specialty_otolaryngology_yes">Sundhedsspeciale: 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>
@ -2536,12 +2536,12 @@
<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_anaesthetics_yes">Sundhedsspeciale: anæstesi</string>
<string name="poi_health_specialty_pulmonology_yes">Sundhedsspeciale: pneumologi</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_emergency_medicine_yes">Sundhedsspeciale: akutmedicin</string>
<string name="poi_health_specialty_emergency_medicine_no">Sundhedsspeciale: akutmedicin: 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>
@ -2549,11 +2549,11 @@
<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_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_nephrology_yes">Sundhedsspeciale: nefrologi (nyresygdomme)</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>
@ -2574,7 +2574,7 @@
<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_manual_therapy_yes">Sundhedsspeciale: manuelterapi</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>
@ -2582,10 +2582,10 @@
<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_herbalism_yes">Sundhedsspeciale: plantemedicin</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_naturopathy_yes">Sundhesspeciale: naturmedicin</string>
<string name="poi_health_specialty_depth_psychology_yes">Sundhedsspeciale: dybdepsykologi</string>
<string name="poi_health_specialty_behavior_yes">Sundhedsspeciale: adfærd</string>

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

@ -2490,4 +2490,76 @@
<string name="poi_internet_access_type_yes">Con acceso a Internet</string>
</resources>
<string name="poi_health_specialty_general_yes">Especialidad médica: Médico general</string>
<string name="poi_health_specialty_ophthalmology_yes">Especialidad médica: Oftalmología</string>
<string name="poi_health_specialty_gynaecology_yes">Especialidad médica: Ginecología</string>
<string name="poi_health_specialty_internal_medicine_yes">Especialidad médica: Medicina interna</string>
<string name="poi_health_specialty_orthopaedics_yes">Especialidad médica: Ortopedia</string>
<string name="poi_health_specialty_otolaryngology_yes">Especialidad médica: Otorrinolaringología</string>
<string name="poi_health_specialty_paediatrics_yes">Especialidad médica: Pediatría</string>
<string name="poi_health_specialty_paediatrics_no">Especialidad médica: Sin pediatría</string>
<string name="poi_health_specialty_dermatology_yes">Especialidad médica: Dermatología</string>
<string name="poi_health_specialty_urology_yes">Especialidad médica: Urología</string>
<string name="poi_health_specialty_surgery_yes">Especialidad médica: Cirugía general</string>
<string name="poi_health_specialty_radiology_yes">Especialidad médica: Radiología</string>
<string name="poi_health_specialty_psychiatry_yes">Especialidad médica: Psiquiatría</string>
<string name="poi_health_specialty_neurology_yes">Especialidad médica: Neurología</string>
<string name="poi_health_specialty_dermatovenereology_yes">Especialidad médica: Dermato-venereología</string>
<string name="poi_health_specialty_cardiology_yes">Especialidad médica: Cardiología</string>
<string name="poi_health_specialty_trauma_yes">Especialidad médica: Traumatología</string>
<string name="poi_health_specialty_biology_yes">Especialidad médica: Biología clínica</string>
<string name="poi_health_specialty_osteopathy_yes">Especialidad médica: Osteopatía</string>
<string name="poi_health_specialty_anaesthetics_yes">Especialidad médica: Anestésicos</string>
<string name="poi_health_specialty_pulmonology_yes">Especialidad médica: Neumología</string>
<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Especialidad médica: Cirugía dental, oral y maxilofacial</string>
<string name="poi_health_specialty_maternity_yes">Especialidad médica: Maternidad</string>
<string name="poi_health_specialty_emergency_medicine_yes">Especialidad médica: Medicina de urgencia</string>
<string name="poi_health_specialty_emergency_medicine_no">Especialidad médica: Sin medicina de urgencia</string>
<string name="poi_health_specialty_plastic_surgery_yes">Especialidad médica: Cirugía plástica</string>
<string name="poi_health_specialty_orthodontics_yes">Especialidad médica: Ortodoncia</string>
<string name="poi_health_specialty_physiotherapy_yes">Especialidad médica: Psicoterapia</string>
<string name="poi_health_specialty_biochemistry_yes">Especialidad médica: Bioquímica</string>
<string name="poi_health_specialty_occupational_yes">Especialidad médica: Terapia ocupacional</string>
<string name="poi_health_specialty_child_psychiatry_yes">Especialidad médica: Psiquiatría infantil</string>
<string name="poi_health_specialty_physiatry_yes">Especialidad médica: Medicina física y rehabilitación</string>
<string name="poi_health_specialty_maxillofacial_surgery_yes">Especialidad médica: Cirugía maxilofacial</string>
<string name="poi_health_specialty_diagnostic_radiology_yes">Especialidad médica: Radiología diagnóstica</string>
<string name="poi_health_specialty_gastroenterology_yes">Especialidad médica: Gastroenterología</string>
<string name="poi_health_specialty_dentistry_yes">Especialidad médica: Odontología</string>
<string name="poi_health_specialty_nephrology_yes">Especialidad médica: Nefrología (enfermedades renales)</string>
<string name="poi_health_specialty_neurosurgery_yes">Especialidad médica: Neurocirugía</string>
<string name="poi_health_specialty_neuropsychiatry_yes">Especialidad médica: Neuropsiquiatría</string>
<string name="poi_health_specialty_endocrinology_yes">Especialidad médica: Endocrinología</string>
<string name="poi_health_specialty_nuclear_medicine_yes">Especialidad médica: Medicina nuclear</string>
<string name="poi_health_specialty_pathology_yes">Especialidad médica: Anatomía patológica</string>
<string name="poi_health_specialty_oncology_yes">Especialidad médica: Oncología</string>
<string name="poi_health_specialty_tropical_medicine_yes">Especialidad médica: Medicina tropical</string>
<string name="poi_health_specialty_tropical_medicine_no">Especialidad médica: Sin medicina tropical</string>
<string name="poi_health_specialty_obstetrics_postnatal_yes">Especialidad médica: Obstetricia (postnatal)</string>
<string name="poi_health_specialty_obstetrics_postnatal_no">Especialidad médica: Sin obstetricia (postnatal)</string>
<string name="poi_health_specialty_obstetrics_antenatal_yes">Especialidad médica: Obstetricia (prenatal)</string>
<string name="poi_health_specialty_obstetrics_antenatal_no">Especialidad médica: Sin obstetricia (prenatal)</string>
<string name="poi_health_specialty_social_paediatrics_yes">Especialidad médica: Pediatría social</string>
<string name="poi_health_specialty_social_paediatrics_no">Especialidad médica: Sin pediatría social</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Especialidad médica: Obstetricia (cesárea)</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Especialidad médica: Sin obstetricia (cesárea)</string>
<string name="poi_health_specialty_addiction_medicine_yes">Especialidad médica: Medicina adictiva</string>
<string name="poi_health_specialty_optometry_yes">Especialidad médica: Optometría</string>
<string name="poi_health_specialty_clinical_pathology_yes">Especialidad médica: Patología clínica</string>
<string name="poi_health_specialty_speech_therapy_yes">Especialidad médica: Terapia del habla</string>
<string name="poi_health_specialty_manual_therapy_yes">Especialidad médica: Terapia manual</string>
<string name="poi_health_specialty_sports_medicine_yes">Especialidad médica: Medicina deportiva</string>
<string name="poi_health_specialty_podology_yes">Especialidad médica: Podología</string>
<string name="poi_health_specialty_adult_psychiatry_yes">Especialidad médica: Psiquiatría adulta</string>
<string name="poi_health_specialty_acupuncture_yes">Especialidad médica: Acupuntura</string>
<string name="poi_health_specialty_homeopathy_yes">Especialidad médica: Homeopatía</string>
<string name="poi_health_specialty_traditional_chinese_medicine_yes">Especialidad médica: Medicina china tradicional</string>
<string name="poi_health_specialty_reiki_yes">Especialidad médica: Reiki</string>
<string name="poi_health_specialty_herbalism_yes">Especialidad médica: herbolaria</string>
<string name="poi_health_specialty_chiropractic_yes">Especialidad médica: Quiropráctica</string>
<string name="poi_health_specialty_naturopathy_yes">Especialidad médica: Naturopatía</string>
<string name="poi_health_specialty_depth_psychology_yes">Especialidad médica: Psicología profunda</string>
<string name="poi_health_specialty_behavior_yes">Especialidad médica: Conducta</string>
</resources>

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

@ -2494,4 +2494,76 @@
<string name="poi_internet_access_type_yes">Con acceso a Internet</string>
<string name="poi_health_specialty_general_yes">Especialidad médica: Médico general</string>
<string name="poi_health_specialty_ophthalmology_yes">Especialidad médica: Oftalmología</string>
<string name="poi_health_specialty_gynaecology_yes">Especialidad médica: Ginecología</string>
<string name="poi_health_specialty_internal_medicine_yes">Especialidad médica: Medicina interna</string>
<string name="poi_health_specialty_orthopaedics_yes">Especialidad médica: Ortopedia</string>
<string name="poi_health_specialty_otolaryngology_yes">Especialidad médica: Otorrinolaringología</string>
<string name="poi_health_specialty_paediatrics_yes">Especialidad médica: Pediatría</string>
<string name="poi_health_specialty_paediatrics_no">Especialidad médica: Sin pediatría</string>
<string name="poi_health_specialty_dermatology_yes">Especialidad médica: Dermatología</string>
<string name="poi_health_specialty_urology_yes">Especialidad médica: Urología</string>
<string name="poi_health_specialty_surgery_yes">Especialidad médica: Cirugía general</string>
<string name="poi_health_specialty_radiology_yes">Especialidad médica: Radiología</string>
<string name="poi_health_specialty_psychiatry_yes">Especialidad médica: Psiquiatría</string>
<string name="poi_health_specialty_neurology_yes">Especialidad médica: Neurología</string>
<string name="poi_health_specialty_dermatovenereology_yes">Especialidad médica: Dermato-venereología</string>
<string name="poi_health_specialty_cardiology_yes">Especialidad médica: Cardiología</string>
<string name="poi_health_specialty_trauma_yes">Especialidad médica: Traumatología</string>
<string name="poi_health_specialty_biology_yes">Especialidad médica: Biología clínica</string>
<string name="poi_health_specialty_osteopathy_yes">Especialidad médica: Osteopatía</string>
<string name="poi_health_specialty_anaesthetics_yes">Especialidad médica: Anestésicos</string>
<string name="poi_health_specialty_pulmonology_yes">Especialidad médica: Neumología</string>
<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Especialidad médica: Cirugía dental, oral y maxilofacial</string>
<string name="poi_health_specialty_maternity_yes">Especialidad médica: Maternidad</string>
<string name="poi_health_specialty_emergency_medicine_yes">Especialidad médica: Medicina de urgencia</string>
<string name="poi_health_specialty_emergency_medicine_no">Especialidad médica: Sin medicina de urgencia</string>
<string name="poi_health_specialty_plastic_surgery_yes">Especialidad médica: Cirugía plástica</string>
<string name="poi_health_specialty_orthodontics_yes">Especialidad médica: Ortodoncia</string>
<string name="poi_health_specialty_physiotherapy_yes">Especialidad médica: Psicoterapia</string>
<string name="poi_health_specialty_biochemistry_yes">Especialidad médica: Bioquímica</string>
<string name="poi_health_specialty_occupational_yes">Especialidad médica: Terapia ocupacional</string>
<string name="poi_health_specialty_child_psychiatry_yes">Especialidad médica: Psiquiatría infantil</string>
<string name="poi_health_specialty_physiatry_yes">Especialidad médica: Medicina física y rehabilitación</string>
<string name="poi_health_specialty_maxillofacial_surgery_yes">Especialidad médica: Cirugía maxilofacial</string>
<string name="poi_health_specialty_diagnostic_radiology_yes">Especialidad médica: Radiología diagnóstica</string>
<string name="poi_health_specialty_gastroenterology_yes">Especialidad médica: Gastroenterología</string>
<string name="poi_health_specialty_dentistry_yes">Especialidad médica: Odontología</string>
<string name="poi_health_specialty_nephrology_yes">Especialidad médica: Nefrología (enfermedades renales)</string>
<string name="poi_health_specialty_neurosurgery_yes">Especialidad médica: Neurocirugía</string>
<string name="poi_health_specialty_neuropsychiatry_yes">Especialidad médica: Neuropsiquiatría</string>
<string name="poi_health_specialty_endocrinology_yes">Especialidad médica: Endocrinología</string>
<string name="poi_health_specialty_nuclear_medicine_yes">Especialidad médica: Medicina nuclear</string>
<string name="poi_health_specialty_pathology_yes">Especialidad médica: Anatomía patológica</string>
<string name="poi_health_specialty_oncology_yes">Especialidad médica: Oncología</string>
<string name="poi_health_specialty_tropical_medicine_yes">Especialidad médica: Medicina tropical</string>
<string name="poi_health_specialty_tropical_medicine_no">Especialidad médica: Sin medicina tropical</string>
<string name="poi_health_specialty_obstetrics_postnatal_yes">Especialidad médica: Obstetricia (postnatal)</string>
<string name="poi_health_specialty_obstetrics_postnatal_no">Especialidad médica: Sin obstetricia (postnatal)</string>
<string name="poi_health_specialty_obstetrics_antenatal_yes">Especialidad médica: Obstetricia (prenatal)</string>
<string name="poi_health_specialty_obstetrics_antenatal_no">Especialidad médica: Sin obstetricia (prenatal)</string>
<string name="poi_health_specialty_social_paediatrics_yes">Especialidad médica: Pediatría social</string>
<string name="poi_health_specialty_social_paediatrics_no">Especialidad médica: Sin pediatría social</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Especialidad médica: Obstetricia (cesárea)</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Especialidad médica: Sin obstetricia (cesárea)</string>
<string name="poi_health_specialty_addiction_medicine_yes">Especialidad médica: Medicina adictiva</string>
<string name="poi_health_specialty_optometry_yes">Especialidad médica: Optometría</string>
<string name="poi_health_specialty_clinical_pathology_yes">Especialidad médica: Patología clínica</string>
<string name="poi_health_specialty_speech_therapy_yes">Especialidad médica: Terapia del habla</string>
<string name="poi_health_specialty_manual_therapy_yes">Especialidad médica: Terapia manual</string>
<string name="poi_health_specialty_sports_medicine_yes">Especialidad médica: Medicina deportiva</string>
<string name="poi_health_specialty_podology_yes">Especialidad médica: Podología</string>
<string name="poi_health_specialty_adult_psychiatry_yes">Especialidad médica: Psiquiatría adulta</string>
<string name="poi_health_specialty_acupuncture_yes">Especialidad médica: Acupuntura</string>
<string name="poi_health_specialty_homeopathy_yes">Especialidad médica: Homeopatía</string>
<string name="poi_health_specialty_traditional_chinese_medicine_yes">Especialidad médica: Medicina china tradicional</string>
<string name="poi_health_specialty_reiki_yes">Especialidad médica: Reiki</string>
<string name="poi_health_specialty_chiropractic_yes">Especialidad médica: Quiropráctica</string>
<string name="poi_health_specialty_naturopathy_yes">Especialidad médica: Naturopatía</string>
<string name="poi_health_specialty_depth_psychology_yes">Especialidad médica: Psicología profunda</string>
<string name="poi_health_specialty_behavior_yes">Especialidad médica: Conducta</string>
<string name="poi_health_specialty_herbalism_yes">Especialidad médica: herbolaria</string>
</resources>

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

@ -1349,8 +1349,8 @@
<string name="poi_internet_access_yes">Com acesso à Internet</string>
<string name="poi_internet_access_no">Sem acesso à Internet</string>
<string name="poi_wheelchair_no">Cadeira de rodas: não permitido</string>
<string name="poi_wheelchair_limited">Cadeira de rodas: limitado</string>
<string name="poi_wheelchair_no">Cadeirante: não acessível</string>
<string name="poi_wheelchair_limited">Cadeirante: limitado</string>
<string name="poi_pump_yes">Bomba</string>
<string name="poi_debris">Escombros</string>
@ -1936,4 +1936,66 @@
<string name="poi_surface_snow">Superfície: neve</string>
<string name="poi_route_bus_ref">Ônibus</string>
<string name="poi_route_share_taxi_ref">Táxi compartilhado</string>
<string name="poi_route_trolleybus_ref">Trólebus</string>
<string name="poi_route_tram_ref">Bonde</string>
<string name="poi_wheelchair_description">Descrição para usuários cadeirantes</string>
<string name="poi_ramp_wheelchair_yes">Rampa para cadeira de rodas: sim</string>
<string name="poi_ramp_wheelchair_no">Rampa para cadeira de rodas: não</string>
<string name="poi_route_ferry_ref">Balsa</string>
<string name="poi_route_railway_ref">Rota ferroviária</string>
<string name="poi_historic_yes">Objeto histórico</string>
<string name="poi_surveillance_yes">Vigilância: sim</string>
<string name="poi_shop_yes">Com loja</string>
<string name="poi_service_bicycle_retail_yes">Venda de bicicletas: sim</string>
<string name="poi_service_bicycle_retail_no">Venda de bicicletas: não</string>
<string name="poi_service_bicycle_repair_yes">Conserto de bicicletas: sim</string>
<string name="poi_service_bicycle_repair_no">Conserto de bicicletas: não</string>
<string name="poi_service_bicycle_rental_yes">Aluguel de bicicletas: sim</string>
<string name="poi_service_bicycle_rental_no">Aluguel de bicicletas: não</string>
<string name="poi_service_bicycle_pump_yes">Bomba de bicicleta: sim</string>
<string name="poi_service_bicycle_pump_no">Bomba de bicicleta: não</string>
<string name="poi_service_bicycle_diy_yes">Ferramentas para reparação de bicicleta DIY: sim</string>
<string name="poi_service_bicycle_diy_no">Ferramentas para reparação de bicicleta DIY: não</string>
<string name="poi_service_bicycle_cleaning_yes">Limpeza de bicicletas: sim</string>
<string name="poi_service_bicycle_cleaning_no">Limpeza de bicicletas: não</string>
<string name="poi_service_bicycle_chaintool_yes">Ferramenta para correia de bicicleta: sim</string>
<string name="poi_service_bicycle_chaintool_no">Ferramenta para correia de bicicleta: não</string>
<string name="poi_service_bicycle_second_hand_yes">Venda de bicicletas de segunda mão: sim</string>
<string name="poi_service_bicycle_second_hand_no">Venda de bicicletas de segunda mão: não</string>
<string name="poi_wildlife_hide">Observatório de vida selvagem</string>
<string name="poi_training_language">Treinamento: idioma</string>
<string name="poi_training_music">Treinamento: música</string>
<string name="poi_training_dance">Treinamento: dança</string>
<string name="poi_training_sport">Treinamento: esporte</string>
<string name="poi_training_art">Treinamento: arte</string>
<string name="poi_training_cooking">Treinamento: cozinhar</string>
<string name="poi_training_computer">Treinamento: computação</string>
<string name="poi_training_yoga">Treinamento: ioga</string>
<string name="poi_training_martial_art">Treinamento: arte marcial</string>
<string name="poi_training_aviation">Treinamento: aviação</string>
<string name="poi_training_hairdressing">Treinamento: cabeleireiro</string>
<string name="poi_monument_yes">Monumento</string>
<string name="poi_industrial_oil">Tipo: indústria petroleira</string>
<string name="poi_industrial_wellsite">Tipo: poço</string>
<string name="poi_industrial_factory">Tipo: fábrica</string>
<string name="poi_industrial_gas">Tipo: indústria de gás</string>
<string name="poi_industrial_timber">Tipo: madeira</string>
<string name="poi_industrial_refinery">Tipo: refinaria</string>
<string name="poi_industrial_warehouse">Tipo: armazém</string>
<string name="poi_industrial_agriculture">Tipo: agricultura</string>
<string name="poi_industrial_brewery">Tipo: cervejaria</string>
<string name="poi_industrial_brickyard">Tipo: olaria</string>
<string name="poi_industrial_sawmill">Tipo: serraria</string>
<string name="poi_industrial_water_purification">Tipo: purificação de água</string>
<string name="poi_industrial_port">Tipo: porto</string>
<string name="poi_industrial_depot">Tipo: depósito</string>
</resources>

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

@ -1400,7 +1400,7 @@
<string name="poi_aerialway_access_entry">入口</string>
<string name="poi_aerialway_access_exit">出口</string>
<string name="poi_aerialway_access_both">出入口</string>
<string name="poi_wheelchair_no">輪椅：不允許</string>
<string name="poi_wheelchair_no">輪椅：無法進入</string>
<string name="poi_wheelchair_limited">輪椅：有限的</string>
<string name="poi_aerialway_summer_access_entry">夏季通行：只能進入</string>
<string name="poi_aerialway_summer_access_exit">夏季通行：只能出去</string>
@ -2372,4 +2372,17 @@
<string name="poi_wiki_lang_nap">那不勒斯語維基</string>
<string name="poi_craft_electronics">3C產品維修</string>
<string name="poi_historic_period_nuragic">歷史時期：nuragic</string>
<string name="poi_historic_period_stone_bronze_undetermined">歷史時期：石器時代 / 青銅器時代 (未確定)</string>
<string name="poi_historic_period_bronze_age">歷史時期：青銅器時代</string>
<string name="poi_historic_period_principate">歷史時期：元首制 (西元前27年 - 西元284年)</string>
<string name="poi_historic_period_classical_greece">歷史時期：古希臘 (西元前5 - 4)</string>
<string name="poi_historic_period_archaic_greece">歷史時期：古希臘</string>
<string name="poi_historic_period_iron_age">歷史時期：鐵器時代</string>
<string name="poi_historic_period_roman_republic">歷史時期：羅馬共和國 (西元前508年 – 西元前27年)</string>
<string name="poi_historic_period_hellenistic_greece">歷史時期：希臘化時代的希臘</string>
<string name="poi_historic_period_new_kingdom">歷史時期：新王國 (西元前1550年 - 1069年)</string>
<string name="poi_historic_period_middle_kingdom">歷史時期：中王國 (西元前2055年 - 1650年)</string>
<string name="poi_historic_period_predynastic_egypt">歷史時期：前王朝時期埃及</string>
<string name="poi_historic_period_early_dynastic_period">歷史時期：早王朝時期 (西元前3100 - 2686年)</string>
</resources>

4
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>
<!-- categories -->
<string name="poi_shop">Shop</string>
@ -1121,7 +1121,7 @@
<string name="poi_crossing_unmarked">Unmarked</string>
<string name="poi_start_date">Start date</string>
<string name="poi_wheelchair">Wheelchair</string>
<string name="poi_wheelchair_no">Wheelchair: not allowed</string>
<string name="poi_wheelchair_no">Wheelchair: not accessible</string>
<string name="poi_wheelchair_limited">Wheelchair: limited</string>
<string name="poi_wholesale">Wholesale</string>

2
OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
View file

@ -333,7 +333,7 @@ public class EditPoiDialogFragment extends DialogFragment {
Node original = editPoiData.getEntity();
final boolean offlineEdit = mOpenstreetmapUtil instanceof OpenstreetmapLocalUtil;
Node node = new Node(original.getLatitude(), original.getLongitude(), original.getId());
OsmPoint.Action action = node.getId() == -1 ? OsmPoint.Action.CREATE : OsmPoint.Action.MODIFY;
OsmPoint.Action action = node.getId() < 0 ? OsmPoint.Action.CREATE : OsmPoint.Action.MODIFY;
for (Map.Entry<String, String> tag : editPoiData.getTagValues().entrySet()) {
if (tag.getKey().equals(EditPoiData.POI_TYPE_TAG)) {
final PoiType poiType = editPoiData.getAllTranslatedSubTypes().get(tag.getValue().trim().toLowerCase());