From db73f6bae07df4543757c9c1683cf5fd40da5e0f Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Fri, 4 Oct 2024 17:59:19 +0200 Subject: [PATCH] [styles] Add non-drinking-water icon [classificator] Add drinking_water=no subtypes for man_made=water_tap, man_made=water_well and natural=spring Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- data/mapcss-mapping.csv | 3 +++ data/strings/types_strings.txt | 9 +++++++++ .../default/dark/symbols/drinking-water-no-m.svg | 5 +++++ .../default/dark/symbols/drinking-water-no-s.svg | 5 +++++ data/styles/default/include/Icons.mapcss | 15 +++++++++++++++ .../include/priorities_4_overlays.prio.txt | 6 ++++++ .../default/light/symbols/drinking-water-no-m.svg | 5 +++++ .../default/light/symbols/drinking-water-no-s.svg | 5 +++++ data/styles/outdoors/include/Icons.mapcss | 15 +++++++++++++++ .../include/priorities_4_overlays.prio.txt | 6 ++++++ 10 files changed, 74 insertions(+) create mode 100644 data/styles/default/dark/symbols/drinking-water-no-m.svg create mode 100644 data/styles/default/dark/symbols/drinking-water-no-s.svg create mode 100644 data/styles/default/light/symbols/drinking-water-no-m.svg create mode 100644 data/styles/default/light/symbols/drinking-water-no-s.svg diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index effc987afd..02d97f000f 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1716,3 +1716,6 @@ craft;[craft?];;name;int_name;1600; emergency|emergency_ward_entrance;1601; amenity|dojo;1602; leisure|sports_hall;1603; +man_made|water_tap|drinking_water_no;[man_made=water_tap][drinking_water=not],[man_made=water_tap][drinking_water=no],[man_made=water_tap][drinking_water:legal=no];;;;1604; +man_made|water_well|drinking_water_no;[man_made=water_well][drinking_water=not],[man_made=water_well][drinking_water=no],[man_made=water_well][drinking_water:legal=no];;;;1605; +natural|spring|drinking_water_no;[natural=spring][drinking_water=not],[natural=spring][drinking_water=no];;;;1606; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 4b4054d892..a13e5d5cff 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -18462,6 +18462,9 @@ zh-Hans = 水龙头 zh-Hant = 水龍頭 + [type.man_made.water_tap.drinking_water_no] + ref = type.man_made.water_tap + [type.man_made.water_tower] en = Water Tower af = Watertoring @@ -18540,6 +18543,9 @@ zh-Hans = 水井 zh-Hant = 水井 + [type.man_made.water_well.drinking_water_no] + ref = type.man_made.water_well + [type.man_made.windmill] en = Windmill af = Windmeule @@ -20059,6 +20065,9 @@ zh-Hans = 泉水 zh-Hant = 泉水 + [type.natural.spring.drinking_water_no] + ref = type.natural.spring + [type.natural.strait] en = Strait af = Seestraat diff --git a/data/styles/default/dark/symbols/drinking-water-no-m.svg b/data/styles/default/dark/symbols/drinking-water-no-m.svg new file mode 100644 index 0000000000..0791bdf67a --- /dev/null +++ b/data/styles/default/dark/symbols/drinking-water-no-m.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/data/styles/default/dark/symbols/drinking-water-no-s.svg b/data/styles/default/dark/symbols/drinking-water-no-s.svg new file mode 100644 index 0000000000..1dbe8e9742 --- /dev/null +++ b/data/styles/default/dark/symbols/drinking-water-no-s.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 9881a726cc..f3c7723020 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -178,6 +178,11 @@ node|z17-[natural=spring], node|z17-[natural=hot_spring], {icon-image: drinking-water-m.svg; font-size: 11;} +node|z14-[natural=spring][drinking_water=not], +{icon-image: drinking-water-no-s.svg; font-size: 10;} +node|z17-[natural=spring][drinking_water=not], +{icon-image: drinking-water-no-m.svg; font-size: 11;} + node|z14[natural=geyser], {icon-image: geyser-s.svg;} node|z15-[natural=geyser], @@ -201,6 +206,16 @@ node|z19-[man_made=water_tap], node|z19-[man_made=water_well], {icon-image: drinking-water-m.svg;} +node|z16-[man_made=water_tap][drinking_water=not], +node|z16-[man_made=water_well][drinking_water=not], +{icon-image: none;} +node|z18-[man_made=water_tap][drinking_water=not], +node|z18-[man_made=water_well][drinking_water=not], +{icon-image: drinking-water-no-s.svg;} +node|z19-[man_made=water_tap][drinking_water=not], +node|z19-[man_made=water_well][drinking_water=not], +{icon-image: drinking-water-no-m.svg;} + /* 3. TRANSPORT */ node|z12-[railway=station], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 92d3540cde..1346fb788d 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1042,6 +1042,9 @@ amenity-vending_machine-parking_tickets # icon z17- (also has captio amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) highway-elevator # icon z17- leisure-picnic_table # icon z17- (also has caption(optional) z17-) +man_made-water_tap-drinking_water_no # icon z18- (also has caption(optional) z18-) +man_made-water_well-drinking_water_no # icon z18- (also has caption(optional) z18-) +natural-spring-drinking_water_no # icon z14- (also has caption(optional) z15-) === 1200 isoline-step_10 # pathtext z17- (also has line z15-) @@ -1950,6 +1953,9 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) # amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) # leisure-picnic_table # caption(optional) z17- (also has icon z17-) +# man_made-water_tap-drinking_water_no # caption(optional) z18- (also has icon z18-) +# man_made-water_well-drinking_water_no # caption(optional) z18- (also has icon z18-) +# natural-spring-drinking_water_no # caption(optional) z15- (also has icon z14-) # === -8800 # amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z14-) diff --git a/data/styles/default/light/symbols/drinking-water-no-m.svg b/data/styles/default/light/symbols/drinking-water-no-m.svg new file mode 100644 index 0000000000..9435d542f7 --- /dev/null +++ b/data/styles/default/light/symbols/drinking-water-no-m.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/data/styles/default/light/symbols/drinking-water-no-s.svg b/data/styles/default/light/symbols/drinking-water-no-s.svg new file mode 100644 index 0000000000..0e401c5351 --- /dev/null +++ b/data/styles/default/light/symbols/drinking-water-no-s.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index d061c46f80..bcc5be33dd 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -167,6 +167,21 @@ node|z15-[natural=hot_spring], area|z15-[natural=hot_spring], {icon-image: drinking-water-m.svg; font-size: 11;} +node|z12-[natural=spring][drinking_water=not], +{icon-image: drinking-water-no-s.svg;} +node|z15-[natural=spring][drinking_water=not], +{icon-image: drinking-water-no-m.svg; font-size: 11;} + +node|z12-[man_made=water_tap][drinking_water=not], +node|z12-[man_made=water_well][drinking_water=not], +{icon-image: none;} +node|z14-[man_made=water_tap][drinking_water=not], +node|z14-[man_made=water_well][drinking_water=not], +{icon-image: drinking-water-no-s.svg;} +node|z15-[man_made=water_tap][drinking_water=not], +node|z15-[man_made=water_well][drinking_water=not], +{icon-image: drinking-water-no-m.svg;} + /* 4.TOURISM */ /* 4.2 Apartament */ diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index d0006ca252..1c6ada8181 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1042,6 +1042,9 @@ amenity-vending_machine-parking_tickets # icon z17- (also has captio amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) highway-elevator # icon z17- leisure-picnic_table # icon z15- (also has caption(optional) z16-) +man_made-water_tap-drinking_water_no # icon z14- (also has caption(optional) z14-) +man_made-water_well-drinking_water_no # icon z14- (also has caption(optional) z14-) +natural-spring-drinking_water_no # icon z12- (also has caption(optional) z14-) === 1200 isoline-step_10 # pathtext z16- (also has line z15-) @@ -1950,6 +1953,9 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) # amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) # leisure-picnic_table # caption(optional) z16- (also has icon z15-) +# man_made-water_tap-drinking_water_no # caption(optional) z14- (also has icon z14-) +# man_made-water_well-drinking_water_no # caption(optional) z14- (also has icon z14-) +# natural-spring-drinking_water_no # caption(optional) z14- (also has icon z12-) # === -8800 # amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z14-)