diff --git a/android/sdk/src/main/res/values-es/types_strings.xml b/android/sdk/src/main/res/values-es/types_strings.xml index 30dd7269e..e5dfd7223 100644 --- a/android/sdk/src/main/res/values-es/types_strings.xml +++ b/android/sdk/src/main/res/values-es/types_strings.xml @@ -351,6 +351,7 @@ Punto de reunión de emergencia Desfibrilador Boca de incendio + Boca de riego Teléfono de emergencias Socorrista diff --git a/android/sdk/src/main/res/values-fr/types_strings.xml b/android/sdk/src/main/res/values-fr/types_strings.xml index 34e71b4a0..e8ac86767 100644 --- a/android/sdk/src/main/res/values-fr/types_strings.xml +++ b/android/sdk/src/main/res/values-fr/types_strings.xml @@ -337,6 +337,7 @@ Point de rassemblement d’urgence Défibrillateur Point d’eau incendie + Borne d’puisage Téléphone d’urgence Sauveteur diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index c96f7a6b9..7570bd104 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -379,6 +379,7 @@ Lifebuoy Defibrillator Fire Hydrant + Irrigation Hydrant Emergency Phone Lifeguard diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index 9db45c128..b2a91aab2 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -435,7 +435,8 @@ "emergency-assembly_point": "5Emergency assembly point", "emergency-life_ring": "5Lifebuoy|6Life Ring|life-ring|lifering|flotation device|floatation device", "emergency-defibrillator": "4Defibrillator|AED", -"emergency-fire_hydrant": "4Fire Hydrant|Fire Plug", +"emergency-fire_hydrant": "4Fire Hydrant|Fire Plug|Hydrant", +"amenity-hydrant": "Irrigation Hydrant|Water Hydrant|Cleaning Hydrant|Hydrant", "emergency-lifeguard": "Lifeguard|Lifesaver", "emergency-mountain_rescue": "Mountain Rescue Station|Search and Rescue|rescue", "leisure-fitness_station": "3Fitness Station|street workout|fitness|workout|4Exercise station|Exercise bench|outdoor gym|5Calisthenics park|trim trail", diff --git a/data/categories-strings/es.json/localize.json b/data/categories-strings/es.json/localize.json index dc339c433..d00ec50f0 100644 --- a/data/categories-strings/es.json/localize.json +++ b/data/categories-strings/es.json/localize.json @@ -405,7 +405,8 @@ "amenity-shower": "3Ducha|duchas|4Regadera|regaderas", "emergency-assembly_point": "Punto de reunión de emergencia|reunión de emergencia|emergencia", "emergency-defibrillator": "4Desfibrilador|defibrilador|socorro|primeros auxilios|auxilio|electroshock|schock|reanimar|reanimación|paro cardíaco|infarto|emergencia", -"emergency-fire_hydrant": "Boca de incendio|Hidrante", +"emergency-fire_hydrant": "Boca de incendio|Boca de incendios|Hidrante|Hidrante de incendio|Hidrante de incendios|Hidrante contra incendios|Hidrante de fuego", +"amenity-hydrant": "Boca de riego|Hidrante de riego|Hidrante de agua|Hidrante técnico|Hidrante de limpieza|Hidrante", "emergency-lifeguard": "Socorrista|Salvavidas", "emergency-mountain_rescue": "Puesto de rescate de montaña|Búsqueda y rescate|Rescate|rescatista|rescatistas", "leisure-fitness_station": "Aparatos de gimnasia|Aparatos de ejercicio|Estación de ejercicios|Gimnasio exterior|Calistenia|Ejercicio", diff --git a/data/categories-strings/fr.json/localize.json b/data/categories-strings/fr.json/localize.json index 8b1404b0e..dc5875531 100644 --- a/data/categories-strings/fr.json/localize.json +++ b/data/categories-strings/fr.json/localize.json @@ -399,7 +399,8 @@ "amenity-shower": "Douche", "emergency-assembly_point": "Point de rassemblement d'urgence", "emergency-defibrillator": "4Défibrillateur|DAE", -"emergency-fire_hydrant": "Bouche d’incendie|borne d'incendie", +"emergency-fire_hydrant": "Bouche d’incendie|bouche de incendie|borne d’incendie|borne de incendie|Borne hydratante|Poteau d’incendie|Hydrant|Hydrante", +"amenity-hydrant": "Bouche d’puisage|bouche de puisage|borne d’puisage|bourne de puisage|Hydrant|Hydrante", "emergency-lifeguard": "Sauveteur d’urgence|Sauveteur", "emergency-mountain_rescue": "Sauveteurs en montagne d’urgence", "leisure-fitness_station": "Station de fitness|Parcours de santé", diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index cf61afd3a..177f9bf8f 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1232,7 +1232,7 @@ shop|car_parts;1104; deprecated|deprecated;1105;x deprecated|deprecated;1106;x deprecated|deprecated;1107;x -deprecated|deprecated;1108;x +amenity|hydrant;1108; amenity|public_bookcase;1109; tourism|apartment;1110; leisure|resort;[leisure=resort],[tourism=resort],[leisure=summer_camp];;name;int_name;1111; diff --git a/data/styles/default/dark/symbols/firehydrant-m.svg b/data/styles/default/dark/symbols/firehydrant-m.svg index 8cab1d4b5..cf0ee1103 100644 --- a/data/styles/default/dark/symbols/firehydrant-m.svg +++ b/data/styles/default/dark/symbols/firehydrant-m.svg @@ -1,12 +1,13 @@ - - firehydrant-m - - - - - - - - - + + +firehydrant-m + + + + + + + + + diff --git a/data/styles/default/dark/symbols/hydrant-m.svg b/data/styles/default/dark/symbols/hydrant-m.svg new file mode 100644 index 000000000..8c0e21eb1 --- /dev/null +++ b/data/styles/default/dark/symbols/hydrant-m.svg @@ -0,0 +1,13 @@ + + +hydrant-m + + + + + + + + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index cfd326beb..696ad0dac 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1135,6 +1135,7 @@ node|z18-[man_made=survey_point], node|z18-[man_made=petroleum_well], node|z18-[man_made=flare], node|z19-[emergency=fire_hydrant], +node|z19-[amenity=hydrant], node|z19-[man_made=cairn], {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;} @@ -1699,6 +1700,8 @@ node|z18-[amenity=post_box], {icon-image: postbox-m.svg;text: none;} node|z19-[emergency=fire_hydrant], {icon-image: firehydrant-m.svg;font-size: 11;} +node|z19-[amenity=hydrant], +{icon-image: hydrant-m.svg;font-size: 11;} node|z18-[emergency=defibrillator], {icon-image: defibrillator-m.svg;font-size: 11;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 7c4768ba3..cb565f11b 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -2427,6 +2427,7 @@ emergency-phone # icon z17- (also has captio man_made-telescope # icon z18- (also has caption(optional) z18-) === -9980 +amenity-hydrant # icon z19- (also has caption(optional) z19-) amenity-waste_basket # icon z18- (also has caption(optional) z19-) emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) emergency-life_ring # icon z19- (also has caption(optional) z19-) @@ -2440,6 +2441,7 @@ natural-tree # icon z18- # amenity-bench-backless # caption(optional) z19- (also has icon z18-) # amenity-food_sharing # caption(optional) z18- (also has icon z18-) # amenity-give_box # caption(optional) z18- (also has icon z18-) +# amenity-hydrant # caption(optional) z19- (also has icon z19-) amenity-loading_dock # icon z19- (also has caption(optional) z19-) # amenity-loading_dock # caption(optional) z19- (also has icon z19-) # amenity-lounger # caption(optional) z19- (also has icon z18-) diff --git a/data/styles/default/light/symbols/firehydrant-m.svg b/data/styles/default/light/symbols/firehydrant-m.svg index 5ea038292..f39969fb8 100644 --- a/data/styles/default/light/symbols/firehydrant-m.svg +++ b/data/styles/default/light/symbols/firehydrant-m.svg @@ -1,12 +1,13 @@ - - firehydrant-m - - - - - - - - - + + +firehydrant-m + + + + + + + + + diff --git a/data/styles/default/light/symbols/hydrant-m.svg b/data/styles/default/light/symbols/hydrant-m.svg new file mode 100644 index 000000000..d6f34f0a7 --- /dev/null +++ b/data/styles/default/light/symbols/hydrant-m.svg @@ -0,0 +1,13 @@ + + +hydrant-m + + + + + + + + + + diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 0df6f546b..3ddc0a699 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -2433,6 +2433,7 @@ emergency-phone # icon z17- (also has captio man_made-telescope # icon z18- (also has caption(optional) z18-) === -9980 +amenity-hydrant # icon z19- (also has caption(optional) z19-) amenity-waste_basket # icon z18- (also has caption(optional) z19-) emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) emergency-life_ring # icon z19- (also has caption(optional) z19-) @@ -2446,6 +2447,7 @@ natural-tree # icon z18- # amenity-bench-backless # caption(optional) z19- (also has icon z18-) # amenity-food_sharing # caption(optional) z18- (also has icon z18-) # amenity-give_box # caption(optional) z18- (also has icon z18-) +# amenity-hydrant # caption(optional) z19- (also has icon z19-) amenity-loading_dock # icon z19- (also has caption(optional) z19-) # amenity-loading_dock # caption(optional) z19- (also has icon z19-) # amenity-lounger # caption(optional) z19- (also has icon z18-) diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 4307fa496..436f96b7a 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -394,6 +394,7 @@ "type.emergency.life_ring" = "Lifebuoy"; "type.emergency.defibrillator" = "Defibrillator"; "type.emergency.fire_hydrant" = "Fire Hydrant"; +"type.amenity.hydrant" = "Irrigation Hydrant"; "type.emergency.phone" = "Emergency Phone"; /* A place where a lifeguard is on duty. */ diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings index 80666c6f5..c0c8b363d 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings @@ -358,6 +358,7 @@ "type.emergency.assembly_point" = "Punto de reunión de emergencia"; "type.emergency.defibrillator" = "Desfibrilador"; "type.emergency.fire_hydrant" = "Boca de incendio"; +"type.amenity.hydrant" = "Boca de riego"; "type.emergency.phone" = "Teléfono de emergencias"; /* A place where a lifeguard is on duty. */ diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings index 3ecc0b592..fef55fe7e 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings @@ -358,6 +358,7 @@ "type.emergency.assembly_point" = "Point de rassemblement d’urgence"; "type.emergency.defibrillator" = "Défibrillateur"; "type.emergency.fire_hydrant" = "Point d’eau incendie"; +"type.amenity.hydrant" = "Borne d’puisage"; "type.emergency.phone" = "Téléphone d’urgence"; /* A place where a lifeguard is on duty. */