midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add more icons in question answers, tweak icon size

Browse source
This commit is contained in:
Midgard 2021-04-04 00:01:24 +02:00
parent 15a91e27ab
commit f98780fac4
Signed by untrusted user who does not match committer: midgard
GPG key ID: 511C112F1331BBB4
11 changed files with 263 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assets/layers/fire_hydrants/diameter.svg Normal file
View 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">
<circle cx="9" cy="9" r="7" fill="none" stroke="#000" stroke-dashoffset="2.3036" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
<path d="m1.5 16.5 15-15" fill="none" stroke="#000" stroke-width="2"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 404 B

139
assets/layers/fire_hydrants/fire_hydrants.json
View file

@ -4,7 +4,7 @@
"nl": "Hydranten",
"en": "Hydrants"
},
"minzoom": 14,
"minzoom": 15,
"source": {
"osmTags": {
"or": [
@ -21,8 +21,8 @@
"title": {
"render": {
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:1em;height:1em;display:inline' alt=''/> Hydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:1em;height:1em;display:inline' alt=''/> Hydrant"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:18px;height:18px;display:inline' alt=''/> Hydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:18px;height:18px;display:inline' alt=''/> Hydrant"
},
"mappings": [
@ -30,28 +30,28 @@
"disused:emergency=fire_hydrant",
"abandoned:emergency=fire_hydrant"
]}, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_disused.svg' style='width:1em;height:1em;display:inline' alt=''/> Onbruikbare hydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_disused.svg' style='width:1em;height:1em;display:inline' alt=''/> Unusable hydrant"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_disused.svg' style='width:18px;height:18px;display:inline' alt=''/> Onbruikbare hydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_disused.svg' style='width:18px;height:18px;display:inline' alt=''/> Unusable hydrant"
}},
{"if": {"and": ["removed:emergency=fire_hydrant", "has_marker=yes"]}, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_marker_only.svg' style='width:1em;height:1em;display:inline' alt=''/> Bordje bij verwijderde hydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_marker_only.svg' style='width:1em;height:1em;display:inline' alt=''/> Marker for removed hydrant"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_marker_only.svg' style='width:18px;height:18px;display:inline' alt=''/> Bordje bij verwijderde hydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_marker_only.svg' style='width:18px;height:18px;display:inline' alt=''/> Marker for removed hydrant"
}},
{"if": "removed:emergency=fire_hydrant", "then": {
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_disused.svg' style='width:1em;height:1em;display:inline' alt=''/> Verwijderde hydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_disused.svg' style='width:1em;height:1em;display:inline' alt=''/> Removed hydrant"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_disused.svg' style='width:18px;height:18px;display:inline' alt=''/> Verwijderde hydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_disused.svg' style='width:18px;height:18px;display:inline' alt=''/> Removed hydrant"
}},
{"if": "has_marker=no", "then": {
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_attention.svg' style='width:1em;height:1em;display:inline' alt=''/> Hydrant zonder bordje",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_attention.svg' style='width:1em;height:1em;display:inline' alt=''/> Hydrant without marker"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_attention.svg' style='width:18px;height:18px;display:inline' alt=''/> Hydrant zonder bordje",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_attention.svg' style='width:18px;height:18px;display:inline' alt=''/> Hydrant without marker"
}},
{"if": "ref~*", "then": {
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:1em;height:1em;display:inline' alt=''/> Hydrant {ref}",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:1em;height:1em;display:inline' alt=''/> Hydrant {ref}"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:18px;height:18px;display:inline' alt=''/> Hydrant {ref}",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:18px;height:18px;display:inline' alt=''/> Hydrant {ref}"
}}
]
},
@ -70,28 +70,28 @@
"mappings": [
{"if": {"and": ["fire_hydrant:type=underground"]}, "then": {
"nl": "Ondergrondse hydrant",
"en": "Underground hydrant"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_underground.svg' style='width:18px;height:18px;display:inline' alt=''/> Ondergrondse hydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_underground.svg' style='width:18px;height:18px;display:inline' alt=''/> Underground hydrant"
}},
{"if": {"and": ["fire_hydrant:type=pillar"]}, "then": {
"nl": "Bovengrondse pilaarachtige hydrant",
"en": "Overground pillar hydrant"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_pillar.svg' style='width:18px;height:18px;display:inline' alt=''/> Bovengrondse pilaarachtige hydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_pillar.svg' style='width:18px;height:18px;display:inline' alt=''/> Overground pillar hydrant"
}},
{"if": {"and": ["fire_hydrant:type=pipe"]}, "then": {
"nl": "Bovengrondse pijphydrant",
"en": "Overground pipe hydrant"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:18px;height:18px;display:inline' alt=''/> Bovengrondse pijphydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:18px;height:18px;display:inline' alt=''/> Overground pipe hydrant"
}},
{"if": {"and": ["fire_hydrant:type=wall"]}, "then": {
"nl": "Hydrant aan muur",
"en": "Wall-attached hydrant"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:18px;height:18px;display:inline' alt=''/> Hydrant aan muur",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:18px;height:18px;display:inline' alt=''/> Wall-attached hydrant"
}},
{"if": {"and": ["fire_hydrant:type~*"]}, "then": {
"nl": "Ander soort hydrant",
"en": "Other type of hydrant"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:18px;height:18px;display:inline' alt=''/> Ander soort hydrant",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_unknown.svg' style='width:18px;height:18px;display:inline' alt=''/> Other type of hydrant"
}, "hideInAnswer": true }
]
@ -137,17 +137,62 @@
"en": "What is the nominal diameter of the supply in millimeters?"
},
"render": {
"nl": "Nominale diameter van aanvoerleiding: {fire_hydrant:diameter}",
"en": "Nominal diameter of supply: {fire_hydrant:diameter}"
"nl": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominale diameter van aanvoerleiding: {fire_hydrant:diameter}",
"en": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominal diameter of supply: {fire_hydrant:diameter}"
},
"freeform": {
"key": "fire_hydrant:diameter",
"type": "pnat"
},
"mappings": [
{ "if": { "and": [ "fire_hydrant:diameter=75" ] }, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominale diameter van aanvoerleiding: 75&nbsp;mm",
"en": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominal diameter of supply: 75&nbsp;mm"
} },
{ "if": { "and": [ "fire_hydrant:diameter=80" ] }, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominale diameter van aanvoerleiding: 80&nbsp;mm",
"en": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominal diameter of supply: 80&nbsp;mm"
} },
{ "if": { "and": [ "fire_hydrant:diameter=90" ] }, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominale diameter van aanvoerleiding: 90&nbsp;mm",
"en": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominal diameter of supply: 90&nbsp;mm"
} },
{ "if": { "and": [ "fire_hydrant:diameter=100" ] }, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominale diameter van aanvoerleiding: 100&nbsp;mm",
"en": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominal diameter of supply: 100&nbsp;mm"
} },
{ "if": { "and": [ "fire_hydrant:diameter=110" ] }, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominale diameter van aanvoerleiding: 110&nbsp;mm",
"en": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominal diameter of supply: 110&nbsp;mm"
} },
{ "if": { "and": [ "fire_hydrant:diameter=160" ] }, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominale diameter van aanvoerleiding: 110&nbsp;mm",
"en": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominal diameter of supply: 110&nbsp;mm"
} },
{ "if": { "and": [ "fire_hydrant:diameter=200" ] }, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominale diameter van aanvoerleiding: 200&nbsp;mm",
"en": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominal diameter of supply: 200&nbsp;mm"
} },
{ "if": { "and": [ "fire_hydrant:diameter=225" ] }, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominale diameter van aanvoerleiding: 225&nbsp;mm",
"en": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominal diameter of supply: 225&nbsp;mm"
} },
{ "if": { "and": [ "fire_hydrant:diameter=250" ] }, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominale diameter van aanvoerleiding: 250&nbsp;mm",
"en": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominal diameter of supply: 250&nbsp;mm"
} },
{ "if": { "and": [ "fire_hydrant:diameter~^[0-9.]+$" ] }, "then": {
"nl": "Nominale diameter van aanvoerleiding: {fire_hydrant:diameter}&nbsp;mm",
"en": "Nominal diameter of supply: {fire_hydrant:diameter}&nbsp;mm"
"nl": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominale diameter van aanvoerleiding: {fire_hydrant:diameter}&nbsp;mm",
"en": "<img src='./assets/layers/fire_hydrants/diameter.svg' style='width:18px;height:18px;display:inline' alt=''/> Nominal diameter of supply: {fire_hydrant:diameter}&nbsp;mm"
}, "hideInAnswer": true }
],
"condition": {"or": [
@ -252,16 +297,16 @@
"condition": {"and": ["emergency=fire_hydrant"]},
"mappings": [
{"if": {"and": ["has_marker=no"]}, "then": {
"nl": "Een bordje ontbreekt!",
"en": "A marker is missing!"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_no.svg' style='width:18px;height:18px;display:inline' alt=''/> Een bordje ontbreekt!",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_no.svg' style='width:18px;height:18px;display:inline' alt=''/> A marker is missing!"
}},
{"if": {"and": ["has_marker="]}, "then": {
"nl": "Er is een bordje voor de hydrant.",
"en": "A marker is present."
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_yes.svg' style='width:18px;height:18px;display:inline' alt=''/> Er is een bordje voor de hydrant.",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_yes.svg' style='width:18px;height:18px;display:inline' alt=''/> A marker is present."
}},
{"if": {"and": ["has_marker=yes"]}, "then": {
"nl": "Er is een bordje voor de hydrant.",
"en": "A marker is present."
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_yes.svg' style='width:18px;height:18px;display:inline' alt=''/> Er is een bordje voor de hydrant.",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_yes.svg' style='width:18px;height:18px;display:inline' alt=''/> A marker is present."
}, "hideInAnswer": true }
]
},
@ -274,13 +319,17 @@
"condition": {"or": ["disused:emergency=fire_hydrant", "abandoned:emergency=fire_hydrant"]},
"mappings": [
{"if": {"and": ["has_marker=no"]}, "then": {
"nl": "Een bordje ontbreekt.",
"en": "A marker is missing."
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_no.svg' style='width:18px;height:18px;display:inline' alt=''/> Een bordje ontbreekt.",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_no.svg' style='width:18px;height:18px;display:inline' alt=''/> A marker is missing."
}},
{"if": {"and": ["has_marker="]}, "then": {
"nl": "Er is een bordje voor de hydrant.",
"en": "A marker is present."
}}
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_yes.svg' style='width:18px;height:18px;display:inline' alt=''/> Er is een bordje voor de hydrant.",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_yes.svg' style='width:18px;height:18px;display:inline' alt=''/> A marker is present."
}},
{"if": {"and": ["has_marker=yes"]}, "then": {
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_yes.svg' style='width:18px;height:18px;display:inline' alt=''/> Er is een bordje voor de hydrant.",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_yes.svg' style='width:18px;height:18px;display:inline' alt=''/> A marker is present."
}, "hideInAnswer": true }
]
},
{
@ -292,12 +341,12 @@
"condition": {"and": ["removed:emergency=fire_hydrant"]},
"mappings": [
{"if": {"and": ["has_marker=yes"]}, "then": {
"nl": "Er is ten onrechte een bordje!",
"en": "There's a marker here, but no hydrant!"
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_marker_only.svg' style='width:18px;height:18px;display:inline' alt=''/> Er is ten onrechte een bordje!",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_marker_only.svg' style='width:18px;height:18px;display:inline' alt=''/> There's a marker here, but no hydrant!"
}},
{"if": {"and": ["has_marker=no"]}, "then": {
"nl": "Het bordje is weggehaald.",
"en": "The marker is removed too."
"nl": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_no.svg' style='width:18px;height:18px;display:inline' alt=''/> Het bordje is weggehaald.",
"en": "<img src='./assets/layers/fire_hydrants/hydrant_hasmarker_no.svg' style='width:18px;height:18px;display:inline' alt=''/> The marker is removed too."
}}
]
},
@ -335,8 +384,8 @@
}},
{"if": {"and": ["fire_hydrant:position="]}, "then": {
"nl": "Anders / Onbekend",
"en": "Other / Unknown"
"nl": "Locatie: anders / onbekend",
"en": "Location: other / unknown"
}}
]
},
@ -382,7 +431,7 @@
{ "if": { "and": [
"emergency=fire_hydrant",
"fire_hydrant:type=pillar"
] }, "then": "./assets/layers/fire_hydrants/hydrant_pillar_without_h.svg" }
] }, "then": "./assets/layers/fire_hydrants/hydrant_pillar.svg" }
]
},

14
assets/layers/fire_hydrants/hydrant_hasmarker_no.svg Normal file
View file

@ -0,0 +1,14 @@
<?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">
<rect x="1.5" y="2.5" width="15" height="12" fill="#fff" stroke="#808080" stroke-width="3" style="paint-order:stroke fill markers"/>
<g fill="#808080">
<path d="m13.988 3.8762a1.1628 1.612 0 0 0-1.1504 1.6113 1.1628 1.612 0 0 0 1.1621 1.6113 1.1628 1.612 0 0 0 1.1621-1.6113 1.1628 1.612 0 0 0-1.1621-1.6113 1.1628 1.612 0 0 0-0.01172 0zm0.011719 0.85156a0.44051 0.7593 0 0 1 0.44141 0.75977 0.44051 0.7593 0 0 1-0.44141 0.75977 0.44051 0.7593 0 0 1-0.44141-0.75977 0.44051 0.7593 0 0 1 0.44141-0.75977z" style="paint-order:stroke fill markers"/>
<path d="m3 4v3h1v-1h1v1h1v-3h-1v1h-1v-1z" style="paint-order:stroke fill markers"/>
<rect x="3" y="8" width="12" height="1" style="paint-order:stroke fill markers"/>
<rect x="8" y="4" width="1" height="3" style="paint-order:stroke fill markers"/>
<path d="m7 5 1-1 1 1z"/>
<rect x="9" y="9" width="1" height="3" style="paint-order:stroke fill markers"/>
<path d="m10.988 3.8887a1.1628 1.612 0 0 0-1.1504 1.6113 1.1628 1.612 0 0 0 1.1621 1.6113 1.1628 1.612 0 0 0 1.1621-1.6113 1.1628 1.612 0 0 0-1.1621-1.6113 1.1628 1.612 0 0 0-0.011719 0zm0.011719 0.85156a0.44051 0.7593 0 0 1 0.44141 0.75977 0.44051 0.7593 0 0 1-0.44141 0.75977 0.44051 0.7593 0 0 1-0.44141-0.75977 0.44051 0.7593 0 0 1 0.44141-0.75977z" style="paint-order:stroke fill markers"/>
</g>
<path d="m1 15 16-13" fill="none" stroke="#000" stroke-width="1px"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

13
assets/layers/fire_hydrants/hydrant_hasmarker_yes.svg Normal file
View file

@ -0,0 +1,13 @@
<?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">
<rect x="1.5" y="2.5" width="15" height="12" fill="#fff" stroke="#f00" stroke-width="3" style="paint-order:stroke fill markers"/>
<g>
<path d="m3 4v3h1v-1h1v1h1v-3h-1v1h-1v-1z" style="paint-order:stroke fill markers"/>
<rect x="3" y="8" width="12" height="1" style="paint-order:stroke fill markers"/>
<rect x="8" y="4" width="1" height="3" style="paint-order:stroke fill markers"/>
<path d="m7 5 1-1 1 1z"/>
<rect x="9" y="9" width="1" height="3" style="paint-order:stroke fill markers"/>
<path d="m13.988 3.8807a1.1628 1.612 0 0 0-1.1504 1.6113 1.1628 1.612 0 0 0 1.1621 1.6113 1.1628 1.612 0 0 0 1.1621-1.6113 1.1628 1.612 0 0 0-1.1621-1.6113 1.1628 1.612 0 0 0-0.01172 0zm0.01172 0.85156a0.44051 0.7593 0 0 1 0.4414 0.75977 0.44051 0.7593 0 0 1-0.44141 0.75977 0.44051 0.7593 0 0 1-0.44141-0.75977 0.44051 0.7593 0 0 1 0.44141-0.75977z" style="paint-order:stroke fill markers"/>
<path d="m10.988 3.8931a1.1628 1.612 0 0 0-1.1504 1.6113 1.1628 1.612 0 0 0 1.1621 1.6113 1.1628 1.612 0 0 0 1.1621-1.6113 1.1628 1.612 0 0 0-1.1621-1.6113 1.1628 1.612 0 0 0-0.01172 0zm0.011719 0.85156a0.44051 0.7593 0 0 1 0.44141 0.75977 0.44051 0.7593 0 0 1-0.44141 0.75977 0.44051 0.7593 0 0 1-0.44141-0.75977 0.44051 0.7593 0 0 1 0.44141-0.75977z" style="paint-order:stroke fill markers"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

2
assets/layers/fire_hydrants/hydrant_underground.svg
View file

@ -1,5 +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="m1 3v2h4.5918a8 5.25 0 0 0-4.5918 4.75 8 5.25 0 0 0 8 5.25 8 5.25 0 0 0 8-5.25 8 5.25 0 0 0-4.5977-4.75h4.5977v-2h-16z" fill="#f00" stroke="#000" stroke-dashoffset="2.3036" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
<path d="m1.5 3.5v2h4.1484a7.5 4.75 0 0 0-4.1484 4.25 7.5 4.75 0 0 0 7.5 4.75 7.5 4.75 0 0 0 7.5-4.75 7.5 4.75 0 0 0-4.1543-4.25h4.1543v-2h-15z" fill="#f00" stroke="#000" stroke-dashoffset="2.3036" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
<path d="m7 7v5h1v-2h2v2h1v-5h-1v2h-2v-2z" fill="#fff"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 491 B

After

Width:  |  Height:  |  Size: 507 B

2
assets/layers/fire_hydrants/hydrant_unknown.svg
View file

@ -1,5 +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">
<circle cx="9" cy="9" r="6" fill="#f00" stroke="#000" stroke-width="2" style="paint-order:stroke fill markers"/>
<path d="m7 6.5v5h1v-2h2v2h1v-5h-1v2h-2v-2z" fill="#fff"/>
<path d="m7 6v5h1v-2h2v2h1v-5h-1v2h-2v-2z" fill="#fff"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 316 B

14
assets/layers/fire_hydrants/src/hydrant_hasmarker_no.svg Normal file
View file

@ -0,0 +1,14 @@
<?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">
<rect x="1.5" y="2.5" width="15" height="12" fill="#fff" stroke="#808080" stroke-width="3" style="paint-order:stroke fill markers"/>
<g fill="#808080">
<path d="m13.988 3.8762a1.1628 1.612 0 0 0-1.1504 1.6113 1.1628 1.612 0 0 0 1.1621 1.6113 1.1628 1.612 0 0 0 1.1621-1.6113 1.1628 1.612 0 0 0-1.1621-1.6113 1.1628 1.612 0 0 0-0.01172 0zm0.011719 0.85156a0.44051 0.7593 0 0 1 0.44141 0.75977 0.44051 0.7593 0 0 1-0.44141 0.75977 0.44051 0.7593 0 0 1-0.44141-0.75977 0.44051 0.7593 0 0 1 0.44141-0.75977z" style="paint-order:stroke fill markers"/>
<path d="m3 4v3h1v-1h1v1h1v-3h-1v1h-1v-1z" style="paint-order:stroke fill markers"/>
<rect x="3" y="8" width="12" height="1" style="paint-order:stroke fill markers"/>
<rect x="8" y="4" width="1" height="3" style="paint-order:stroke fill markers"/>
<path d="m7 5 1-1 1 1z"/>
<rect x="9" y="9" width="1" height="3" style="paint-order:stroke fill markers"/>
<path d="m10.988 3.8887a1.1628 1.612 0 0 0-1.1504 1.6113 1.1628 1.612 0 0 0 1.1621 1.6113 1.1628 1.612 0 0 0 1.1621-1.6113 1.1628 1.612 0 0 0-1.1621-1.6113 1.1628 1.612 0 0 0-0.011719 0zm0.011719 0.85156a0.44051 0.7593 0 0 1 0.44141 0.75977 0.44051 0.7593 0 0 1-0.44141 0.75977 0.44051 0.7593 0 0 1-0.44141-0.75977 0.44051 0.7593 0 0 1 0.44141-0.75977z" style="paint-order:stroke fill markers"/>
</g>
<path d="m1 15 16-13" fill="none" stroke="#000" stroke-width="1px"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

104
assets/layers/fire_hydrants/src/hydrant_hasmarker_yes.svg Normal file
View file

@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="18"
height="18"
version="1.1"
viewBox="0 0 18 18"
id="svg12"
sodipodi:docname="hydrant_hasmarker_yes.svg"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
<metadata
id="metadata18">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs16" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1041"
id="namedview14"
showgrid="true"
inkscape:zoom="31.15712"
inkscape:cx="10.282821"
inkscape:cy="12.241392"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg12"
inkscape:document-rotation="0">
<inkscape:grid
type="xygrid"
id="grid843"
empspacing="2"
spacingx="0.5"
spacingy="0.5" />
</sodipodi:namedview>
<rect
x="1.5000001"
y="2.5"
width="15"
height="12"
fill="#ff0000"
id="rect6"
style="fill:#ffffff;stroke:#ff0000;stroke-width:2.99999;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers" />
<path
id="rect867"
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.30362;paint-order:stroke fill markers"
d="M 3,4 V 7 H 4 V 6 H 5 V 7 H 6 V 4 H 5 V 5 H 4 V 4 Z" />
<rect
style="fill:#000000;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:2.30362;paint-order:stroke fill markers"
id="rect861"
width="12"
height="1"
x="3"
y="8" />
<rect
style="fill:#000000;stroke:none;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:2.30362;paint-order:stroke fill markers"
id="rect865"
width="1"
height="3"
x="8"
y="4" />
<path
style="fill:#000000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 7,5 8,4 9,5 Z"
id="path867" />
<rect
style="fill:#000000;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:2.30362;paint-order:stroke fill markers"
id="rect881"
width="1"
height="3"
x="9"
y="9" />
<path
id="path965"
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.30362;stroke-opacity:1;paint-order:stroke fill markers"
d="M 13.988281,3.880708 A 1.1628472,1.6119715 0 0 0 12.837891,5.4920362 1.1628472,1.6119715 0 0 0 14,7.1033643 1.1628472,1.6119715 0 0 0 15.162109,5.4920362 1.1628472,1.6119715 0 0 0 14,3.880708 a 1.1628472,1.6119715 0 0 0 -0.01172,0 z m 0.01172,0.8515625 A 0.44050542,0.75930256 0 0 1 14.441406,5.4920362 0.44050542,0.75930256 0 0 1 14,6.2518018 0.44050542,0.75930256 0 0 1 13.558594,5.4920362 0.44050542,0.75930256 0 0 1 14.000001,4.7322705 Z" />
<path
id="path958"
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.30362;stroke-opacity:1;paint-order:stroke fill markers"
d="M 10.988281,3.8931417 A 1.1628472,1.6119715 0 0 0 9.8378908,5.5044699 1.1628472,1.6119715 0 0 0 11,7.115798 1.1628472,1.6119715 0 0 0 12.162109,5.5044699 1.1628472,1.6119715 0 0 0 11,3.8931417 a 1.1628472,1.6119715 0 0 0 -0.01172,0 z M 11,4.7447042 A 0.44050542,0.75930256 0 0 1 11.441406,5.5044699 0.44050542,0.75930256 0 0 1 11,6.2642355 0.44050542,0.75930256 0 0 1 10.558594,5.5044699 0.44050542,0.75930256 0 0 1 11,4.7447042 Z" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 4.4 KiB

15
assets/layers/fire_hydrants/src/hydrant_underground.svg
View file

@ -42,13 +42,14 @@
id="namedview897"
showgrid="true"
inkscape:snap-smooth-nodes="true"
inkscape:zoom="11.351633"
inkscape:cx="-0.73721847"
inkscape:cy="13.670335"
inkscape:zoom="16.427584"
inkscape:cx="-7.9440829"
inkscape:cy="13.790875"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg895">
inkscape:current-layer="svg895"
inkscape:document-rotation="0">
<inkscape:grid
type="xygrid"
id="grid1464"
@ -57,9 +58,9 @@
empspacing="2" />
</sodipodi:namedview>
<path
id="path1466"
style="fill:#ff0000;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.30362;paint-order:stroke fill markers"
d="M 1 3 L 1 5 L 5.5917969 5 A 8 5.25 0 0 0 1 9.75 A 8 5.25 0 0 0 9 15 A 8 5.25 0 0 0 17 9.75 A 8 5.25 0 0 0 12.402344 5 L 17 5 L 17 3 L 1 3 z " />
id="rect1476"
style="fill:#ff0000;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:2.30362;paint-order:stroke fill markers"
d="M 1.5 3.5 L 1.5 5.5 L 5.6484375 5.5 A 7.5 4.75 0 0 0 1.5 9.75 A 7.5 4.75 0 0 0 9 14.5 A 7.5 4.75 0 0 0 16.5 9.75 A 7.5 4.75 0 0 0 12.345703 5.5 L 16.5 5.5 L 16.5 3.5 L 1.5 3.5 z " />
<path
d="m 7,7 v 5 h 1 v -2 h 2 v 2 h 1 V 7 H 10 V 9 H 8 V 7 Z"
fill="#fff"

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

14
assets/layers/fire_hydrants/src/hydrant_unknown.svg
View file

@ -41,13 +41,14 @@
inkscape:window-height="1041"
id="namedview1650"
showgrid="true"
inkscape:zoom="28.382378"
inkscape:cx="9.1520724"
inkscape:cy="9.624425"
inkscape:zoom="34.188783"
inkscape:cx="10.586734"
inkscape:cy="9.3768042"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg1648">
inkscape:current-layer="svg1648"
inkscape:document-rotation="0">
<inkscape:grid
type="xygrid"
id="grid2217"
@ -65,7 +66,8 @@
id="ellipse1644"
r="5.9999952" />
<path
d="m7 6.5v5h1v-2h2v2h1v-5h-1v2h-2v-2z"
d="m 7,6 v 5 H 8 V 9 h 2 v 2 h 1 V 6 H 10 V 8 H 8 V 6 Z"
fill="#fff"
id="path1646" />
id="path1646"
style="fill:#ffffff" />
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2 KiB

2
assets/themes/fire/fire.json
View file

@ -25,7 +25,7 @@
"widenFactor": 0.01,
"socialImage": "./assets/layers/fire_hydrants/hydrant_pillar.svg",
"clustering": {
"maxZoom": 18
"maxZoom": 16
},
"layers": [
"fire_hydrants"