forked from organicmaps/organicmaps
[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>
This commit is contained in:
David Martinez
Viktor Havaka
parent
0694b7b0c1
commit
db73f6bae0
10 changed files with 74 additions and 0 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
Can't render this file because it contains an unexpected character in line 7 and column 16.
|
|
|
@ -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
|
||||
|
|
|
|||
5
data/styles/default/dark/symbols/drinking-water-no-m.svg
Normal file
5
data/styles/default/dark/symbols/drinking-water-no-m.svg
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="m9 1.125c-0.48327 0.64426-1.3499 1.7966-2.252 3.1465l7.6758 7.6758c0.017408-0.17226 0.027344-0.34669 0.027344-0.52344 0-3.0627-4.1387-8.5489-5.4512-10.299zm-4.1133 6.2383c-0.77413 1.4766-1.3379 2.9334-1.3379 4.0605 0 3.0288 2.626 5.4512 5.4512 5.4512 1.4181 0 2.7859-0.6104 3.7969-1.6016l-7.9102-7.9102z" fill="#536966"/>
|
||||
<path d="m3.5 3.5 12 12" fill="none" stroke="#536966" stroke-linecap="round" stroke-width="1.5"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 575 B |
5
data/styles/default/dark/symbols/drinking-water-no-s.svg
Normal file
5
data/styles/default/dark/symbols/drinking-water-no-s.svg
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="12" height="12" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="m6 1.5c-0.26873 0.32248-0.79561 0.96524-1.3594 1.7266l4.7969 4.7969c0.040305-0.20986 0.0625-0.43378 0.0625-0.67383 0-1.575-2.75-4.9496-3.5-5.8496zm-2.5059 3.4082c-0.56428 0.91908-0.99414 1.8201-0.99414 2.4414 0 2.25 1.8856 3.1504 3.5 3.1504 0.8072 0 1.6823-0.22422 2.3555-0.73047l-4.8613-4.8613z" fill="#536966"/>
|
||||
<path d="m3 3 6.5 6.5" fill="#fff" stroke="#536966" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 570 B |
|
|
@ -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],
|
||||
|
|
|
|||
|
|
@ -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-)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="m9 1.125c-0.48327 0.64426-1.3499 1.7966-2.252 3.1465l7.6758 7.6758c0.017408-0.17226 0.027344-0.34669 0.027344-0.52344 0-3.0627-4.1387-8.5489-5.4512-10.299zm-4.1133 6.2383c-0.77413 1.4766-1.3379 2.9334-1.3379 4.0605 0 3.0288 2.626 5.4512 5.4512 5.4512 1.4181 0 2.7859-0.6104 3.7969-1.6016l-7.9102-7.9102z" fill="#53a397"/>
|
||||
<path d="m3.5 3.5 12 12" fill="none" stroke="#53a397" stroke-linecap="round" stroke-width="1.5"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 575 B |
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="12" height="12" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="m6 1.5c-0.26873 0.32248-0.79561 0.96524-1.3594 1.7266l4.7969 4.7969c0.040305-0.20986 0.0625-0.43378 0.0625-0.67383 0-1.575-2.75-4.9496-3.5-5.8496zm-2.5059 3.4082c-0.56428 0.91908-0.99414 1.8201-0.99414 2.4414 0 2.25 1.8856 3.1504 3.5 3.1504 0.8072 0 1.6823-0.22422 2.3555-0.73047l-4.8613-4.8613z" fill="#53a397"/>
|
||||
<path d="m3 3 6.5 6.5" fill="#fff" stroke="#53a397" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 570 B |
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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-)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue