[styles] Add amenity=hydrant

Signed-off-by: pablogila <pablo.gila.herranz@gmail.com> Co-authored-by: pablogila <pablo.gila.herranz@gmail.com> Co-committed-by: pablogila <pablo.gila.herranz@gmail.com>
2025-12-19 04:53:36 +00:00 · 2025-12-16 10:40:18 +01:00
parent d56f9700f5
commit ce978d8ede
17 changed files with 70 additions and 26 deletions
--- 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",
--- 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",
--- 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é",
--- 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;
--- a/data/styles/default/dark/symbols/firehydrant-m.svg
+++ b/data/styles/default/dark/symbols/firehydrant-m.svg
@@ -1,12 +1,13 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>firehydrant-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="firehydrant-m" fill-rule="nonzero">
-   <g id="fire-hydrant" transform="translate(6 5)" fill="#983E44">
-    <path id="Shape" d="m5.7422 5.8857c-1.2062 0-2.1875 0.98131-2.1875 2.1875s0.98131 2.1875 2.1875 2.1875 2.1875-0.98131 2.1875-2.1875-0.98131-2.1875-2.1875-2.1875zm0 3.5547c-0.75387 0-1.3672-0.61332-1.3672-1.3672 0-0.75387 0.61332-1.3672 1.3672-1.3672s1.3672 0.61332 1.3672 1.3672c0 0.75387-0.61332 1.3672-1.3672 1.3672z"/>
-    <polygon id="Path" points="5.332 7.6631 6.1523 7.6631 6.1523 8.4834 5.332 8.4834"/>
-    <path id="Shape" d="m11.484 7.6631h-0.51953v-1.333h-1.7773v-1.5859h0.65458v-0.82031h-0.68764c-0.17522-1.0818-1.0316-1.9382-2.1134-2.1134v-0.51157c0-0.71616-0.58267-1.2988-1.2988-1.2988s-1.2988 0.58267-1.2988 1.2988v0.51157c-1.0818 0.17522-1.9382 1.0316-2.1134 2.1134h-0.68764v0.82031h0.65458v1.5859h-1.7773v1.333h-0.51953v0.82031h0.51953v1.333h1.7773v1.5859c-0.71616 0-1.2988 0.58267-1.2988 1.2988v1.2988h9.4883v-1.2988c0-0.71616-0.58267-1.2988-1.2988-1.2988v-1.5859h1.7773v-1.333h0.51953v-0.82031zm-6.2207-6.3643c0-0.26384 0.21468-0.47852 0.47852-0.47852s0.47852 0.21468 0.47852 0.47852v0.47852h-0.95703v-0.47852zm-0.41016 1.2988h1.7773c0.81613 0 1.5021 0.56612 1.6869 1.3262h-5.1512c0.18482-0.76005 0.87082-1.3262 1.6869-1.3262zm-3.5137 6.3984v-1.8457h0.95703v1.8457h-0.95703zm8.3262 3.7051v0.47852h-7.8477v-0.47852c0-0.26384 0.21468-0.47852 0.47852-0.47852h6.8906c0.26384 0 0.47852 0.21468 0.47852 0.47852zm-1.2988-1.2988h-5.25v-6.6582h5.25v6.6582zm1.7773-2.4063h-0.95703v-1.8457h0.95703v1.8457z"/>
-   </g>
-  </g>
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<title>firehydrant-m</title>
+<g transform="translate(.258 -1.5e-5)" fill="none" fill-rule="evenodd" opacity=".6">
+<g fill-rule="nonzero">
+<g transform="translate(6,5)" fill="#983e44">
+<path d="m5.7422 5.8857c-1.2062 0-2.1875 0.98131-2.1875 2.1875s0.98131 2.1875 2.1875 2.1875 2.1875-0.98131 2.1875-2.1875-0.98131-2.1875-2.1875-2.1875zm0 3.5547c-0.75387 0-1.3672-0.61332-1.3672-1.3672 0-0.75387 0.61332-1.3672 1.3672-1.3672s1.3672 0.61332 1.3672 1.3672c0 0.75387-0.61332 1.3672-1.3672 1.3672z"/>
+<polygon points="6.1523 8.4834 5.332 8.4834 5.332 7.6631 6.1523 7.6631"/>
+<path d="m11.484 7.6631h-0.51953v-1.333h-1.7773v-1.5859h0.65458v-0.82031h-0.68764c-0.17522-1.0818-1.0316-1.9382-2.1134-2.1134v-0.51157c0-0.71616-0.58267-1.2988-1.2988-1.2988s-1.2988 0.58267-1.2988 1.2988v0.51157c-1.0818 0.17522-1.9382 1.0316-2.1134 2.1134h-0.68764v0.82031h0.65458v1.5859h-1.7773v1.333h-0.51953v0.82031h0.51953v1.333h1.7773v1.5859c-0.71616 0-1.2988 0.58267-1.2988 1.2988v1.2988h9.4883v-1.2988c0-0.71616-0.58267-1.2988-1.2988-1.2988v-1.5859h1.7773v-1.333h0.51953v-0.82031zm-6.2207-6.3643c0-0.26384 0.21468-0.47852 0.47852-0.47852s0.47852 0.21468 0.47852 0.47852v0.47852h-0.95703v-0.47852zm-0.41016 1.2988h1.7773c0.81613 0 1.5021 0.56612 1.6869 1.3262h-5.1512c0.18482-0.76005 0.87082-1.3262 1.6869-1.3262zm-3.5137 6.3984v-1.8457h0.95703v1.8457zm8.3262 3.7051v0.47852h-7.8477v-0.47852c0-0.26384 0.21468-0.47852 0.47852-0.47852h6.8906c0.26384 0 0.47852 0.21468 0.47852 0.47852zm-1.2988-1.2988h-5.25v-6.6582h5.25zm1.7773-2.4063h-0.95703v-1.8457h0.95703z"/>
+</g>
+</g>
+</g>
 </svg>
--- a/data/styles/default/dark/symbols/hydrant-m.svg
+++ b/data/styles/default/dark/symbols/hydrant-m.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<title>hydrant-m</title>
+<g transform="translate(.25781 -.90528)" fill="none" fill-rule="evenodd">
+<g fill-rule="nonzero">
+<g transform="translate(6,5)" fill="#0a6074">
+<polygon points="6.1523 7.6631 6.1523 8.4834 5.332 8.4834 5.332 7.6631"/>
+<path d="m4.4427 2.5134c-1.0818 0.17522-1.9368 1.0328-2.112 2.1146h-0.6875v0.82031h0.65365l3.72e-5 1.0908h-1.5703v1.125h-0.51823v0.82031h0.51823v1.125h1.5703l-3.72e-5 1.0889c-0.71616 0-1.2995 0.58335-1.2995 1.2995v1.2995h9.4896v-1.2995c0-0.71616-0.58335-1.2995-1.2995-1.2995l3.72e-5 -1.0889h1.5677v-1.125h0.52083v-0.82031h-0.52083v-1.125h-1.5677l-3.72e-5 -1.0908h0.65365v-0.82031h-0.6875c-0.17522-1.0818-1.0302-1.9394-2.112-2.1146zm0.41146 0.78646h1.776c0.81613 0 1.5027 0.56804 1.6875 1.3281h-5.151c0.18482-0.76005 0.87142-1.3281 1.6875-1.3281zm-1.737 2.1484h5.25v5.25h-5.25zm-1.5703 1.9111h0.75v1.4271h-0.75zm7.6406 0h0.7474v1.4271h-0.7474zm-6.8907 4.1592h6.8906c0.26384 0 0.47917 0.21533 0.47917 0.47917v0.47917h-7.849v-0.47917c0-0.26384 0.21533-0.47917 0.47917-0.47917z"/>
+<path d="m5.7421 6.1696a1.8285 1.9033 0 0 0-1.8281 1.9036 1.8285 1.9033 0 0 0 1.8281 1.9036 1.8285 1.9033 0 0 0 1.8281-1.9036 1.8285 1.9033 0 0 0-1.8281-1.9036zm0 0.83073a1.0311 1.0732 0 0 1 1.0312 1.0729 1.0311 1.0732 0 0 1-1.0312 1.0729 1.0311 1.0732 0 0 1-1.0312-1.0729 1.0311 1.0732 0 0 1 1.0312-1.0729z"/>
+</g>
+</g>
+</g>
+</svg>
--- 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;}
--- 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-)
--- a/data/styles/default/light/symbols/firehydrant-m.svg
+++ b/data/styles/default/light/symbols/firehydrant-m.svg
@@ -1,12 +1,13 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>firehydrant-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="firehydrant-m" fill-rule="nonzero">
-   <g id="fire-hydrant" transform="translate(6 5)" fill="#D85961">
-    <path id="Shape" d="m5.7422 5.8857c-1.2062 0-2.1875 0.98131-2.1875 2.1875s0.98131 2.1875 2.1875 2.1875 2.1875-0.98131 2.1875-2.1875-0.98131-2.1875-2.1875-2.1875zm0 3.5547c-0.75387 0-1.3672-0.61332-1.3672-1.3672 0-0.75387 0.61332-1.3672 1.3672-1.3672s1.3672 0.61332 1.3672 1.3672c0 0.75387-0.61332 1.3672-1.3672 1.3672z"/>
-    <polygon id="Path" points="5.332 7.6631 6.1523 7.6631 6.1523 8.4834 5.332 8.4834"/>
-    <path id="Shape" d="m11.484 7.6631h-0.51953v-1.333h-1.7773v-1.5859h0.65458v-0.82031h-0.68764c-0.17522-1.0818-1.0316-1.9382-2.1134-2.1134v-0.51157c0-0.71616-0.58267-1.2988-1.2988-1.2988s-1.2988 0.58267-1.2988 1.2988v0.51157c-1.0818 0.17522-1.9382 1.0316-2.1134 2.1134h-0.68764v0.82031h0.65458v1.5859h-1.7773v1.333h-0.51953v0.82031h0.51953v1.333h1.7773v1.5859c-0.71616 0-1.2988 0.58267-1.2988 1.2988v1.2988h9.4883v-1.2988c0-0.71616-0.58267-1.2988-1.2988-1.2988v-1.5859h1.7773v-1.333h0.51953v-0.82031zm-6.2207-6.3643c0-0.26384 0.21468-0.47852 0.47852-0.47852s0.47852 0.21468 0.47852 0.47852v0.47852h-0.95703v-0.47852zm-0.41016 1.2988h1.7773c0.81613 0 1.5021 0.56612 1.6869 1.3262h-5.1512c0.18482-0.76005 0.87082-1.3262 1.6869-1.3262zm-3.5137 6.3984v-1.8457h0.95703v1.8457h-0.95703zm8.3262 3.7051v0.47852h-7.8477v-0.47852c0-0.26384 0.21468-0.47852 0.47852-0.47852h6.8906c0.26384 0 0.47852 0.21468 0.47852 0.47852zm-1.2988-1.2988h-5.25v-6.6582h5.25v6.6582zm1.7773-2.4063h-0.95703v-1.8457h0.95703v1.8457z"/>
-   </g>
-  </g>
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<title>firehydrant-m</title>
+<g transform="translate(.258 -1.5e-5)" fill="none" fill-rule="evenodd">
+<g fill-rule="nonzero">
+<g transform="translate(6,5)" fill="#d85961">
+<path d="m5.7422 5.8857c-1.2062 0-2.1875 0.98131-2.1875 2.1875s0.98131 2.1875 2.1875 2.1875 2.1875-0.98131 2.1875-2.1875-0.98131-2.1875-2.1875-2.1875zm0 3.5547c-0.75387 0-1.3672-0.61332-1.3672-1.3672 0-0.75387 0.61332-1.3672 1.3672-1.3672s1.3672 0.61332 1.3672 1.3672c0 0.75387-0.61332 1.3672-1.3672 1.3672z"/>
+<polygon points="6.1523 8.4834 5.332 8.4834 5.332 7.6631 6.1523 7.6631"/>
+<path d="m11.484 7.6631h-0.51953v-1.333h-1.7773v-1.5859h0.65458v-0.82031h-0.68764c-0.17522-1.0818-1.0316-1.9382-2.1134-2.1134v-0.51157c0-0.71616-0.58267-1.2988-1.2988-1.2988s-1.2988 0.58267-1.2988 1.2988v0.51157c-1.0818 0.17522-1.9382 1.0316-2.1134 2.1134h-0.68764v0.82031h0.65458v1.5859h-1.7773v1.333h-0.51953v0.82031h0.51953v1.333h1.7773v1.5859c-0.71616 0-1.2988 0.58267-1.2988 1.2988v1.2988h9.4883v-1.2988c0-0.71616-0.58267-1.2988-1.2988-1.2988v-1.5859h1.7773v-1.333h0.51953v-0.82031zm-6.2207-6.3643c0-0.26384 0.21468-0.47852 0.47852-0.47852s0.47852 0.21468 0.47852 0.47852v0.47852h-0.95703v-0.47852zm-0.41016 1.2988h1.7773c0.81613 0 1.5021 0.56612 1.6869 1.3262h-5.1512c0.18482-0.76005 0.87082-1.3262 1.6869-1.3262zm-3.5137 6.3984v-1.8457h0.95703v1.8457zm8.3262 3.7051v0.47852h-7.8477v-0.47852c0-0.26384 0.21468-0.47852 0.47852-0.47852h6.8906c0.26384 0 0.47852 0.21468 0.47852 0.47852zm-1.2988-1.2988h-5.25v-6.6582h5.25zm1.7773-2.4063h-0.95703v-1.8457h0.95703z"/>
+</g>
+</g>
+</g>
 </svg>
--- a/data/styles/default/light/symbols/hydrant-m.svg
+++ b/data/styles/default/light/symbols/hydrant-m.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<title>hydrant-m</title>
+<g transform="translate(.25781 -.90528)" fill="none" fill-rule="evenodd">
+<g fill-rule="nonzero">
+<g transform="translate(6,5)" fill="#0797b8">
+<polygon points="6.1523 7.6631 6.1523 8.4834 5.332 8.4834 5.332 7.6631"/>
+<path d="m4.4427 2.5134c-1.0818 0.17522-1.9368 1.0328-2.112 2.1146h-0.6875v0.82031h0.65365l3.72e-5 1.0908h-1.5703v1.125h-0.51823v0.82031h0.51823v1.125h1.5703l-3.72e-5 1.0889c-0.71616 0-1.2995 0.58335-1.2995 1.2995v1.2995h9.4896v-1.2995c0-0.71616-0.58335-1.2995-1.2995-1.2995l3.72e-5 -1.0889h1.5677v-1.125h0.52083v-0.82031h-0.52083v-1.125h-1.5677l-3.72e-5 -1.0908h0.65365v-0.82031h-0.6875c-0.17522-1.0818-1.0302-1.9394-2.112-2.1146zm0.41146 0.78646h1.776c0.81613 0 1.5027 0.56804 1.6875 1.3281h-5.151c0.18482-0.76005 0.87142-1.3281 1.6875-1.3281zm-1.737 2.1484h5.25v5.25h-5.25zm-1.5703 1.9111h0.75v1.4271h-0.75zm7.6406 0h0.7474v1.4271h-0.7474zm-6.8907 4.1592h6.8906c0.26384 0 0.47917 0.21533 0.47917 0.47917v0.47917h-7.849v-0.47917c0-0.26384 0.21533-0.47917 0.47917-0.47917z"/>
+<path d="m5.7421 6.1696a1.8285 1.9033 0 0 0-1.8281 1.9036 1.8285 1.9033 0 0 0 1.8281 1.9036 1.8285 1.9033 0 0 0 1.8281-1.9036 1.8285 1.9033 0 0 0-1.8281-1.9036zm0 0.83073a1.0311 1.0732 0 0 1 1.0312 1.0729 1.0311 1.0732 0 0 1-1.0312 1.0729 1.0311 1.0732 0 0 1-1.0312-1.0729 1.0311 1.0732 0 0 1 1.0312-1.0729z"/>
+</g>
+</g>
+</g>
+</svg>
--- 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-)