Make hydrant icons appear larger, add icon in header

This commit is contained in:
Midgard 2021-04-03 23:32:41 +02:00
parent 54a8b5536c
commit 15a91e27ab
Signed by untrusted user who does not match committer: midgard
GPG key ID: 511C112F1331BBB4
5 changed files with 78 additions and 91 deletions

View file

@ -21,8 +21,8 @@
"title": {
"render": {
"nl": "Hydrant",
"en": "Hydrant"
"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"
},
"mappings": [
@ -30,28 +30,28 @@
"disused:emergency=fire_hydrant",
"abandoned:emergency=fire_hydrant"
]}, "then": {
"nl": "Onbruikbare hydrant",
"en": "Unusable hydrant"
"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"
}},
{"if": {"and": ["removed:emergency=fire_hydrant", "has_marker=yes"]}, "then": {
"nl": "Bordje bij verwijderde hydrant",
"en": "Marker for removed hydrant"
"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"
}},
{"if": "removed:emergency=fire_hydrant", "then": {
"nl": "Verwijderde hydrant",
"en": "Removed hydrant"
"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"
}},
{"if": "has_marker=no", "then": {
"nl": "Hydrant zonder bordje",
"en": "Hydrant without marker"
"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"
}},
{"if": "ref~*", "then": {
"nl": "Hydrant {ref}",
"en": "Hydrant {ref}"
"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}"
}}
]
},

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="m6.0977 5.5c-1.9108 0.70406-3.0972 2.0445-3.0977 3.5 0 2.2091 2.6863 4 6 4s6-1.7909 6-4c-8.8e-5 -1.4552-1.1856-2.7956-3.0957-3.5h3.0957v-1.5h-12v1.5z" fill="#f00" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
<path d="m7 6v5h1v-2h2v2h1v-5h-1v2h-2v-2z" fill="#fff"/>
<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="m7 7v5h1v-2h2v2h1v-5h-1v2h-2v-2z" fill="#fff"/>
</svg>

Before

Width:  |  Height:  |  Size: 495 B

After

Width:  |  Height:  |  Size: 491 B

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">
<ellipse cx="9" cy="9" rx="4.5" ry="4.5" fill="#f00" stroke="#000" stroke-width="2" style="paint-order:stroke fill markers"/>
<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"/>
</svg>

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 318 B

View file

@ -9,45 +9,13 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="18"
height="18"
viewBox="0 0 18 18"
version="1.1"
id="svg8"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
sodipodi:docname="hydrant_underground.svg">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#f91dde"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="29.415609"
inkscape:cx="7.1642004"
inkscape:cy="9.3387172"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:document-rotation="0"
showgrid="true"
units="px"
inkscape:snap-page="true"
inkscape:window-width="1920"
inkscape:window-height="1041"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-global="true"
inkscape:snap-smooth-nodes="true">
<inkscape:grid
type="xygrid"
id="grid1597"
spacingx="0.13229167"
spacingy="0.13229167"
empspacing="2" />
</sodipodi:namedview>
viewBox="0 0 18 18"
id="svg895"
sodipodi:docname="hydrant_underground.svg"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
<metadata
id="metadata5">
id="metadata901">
<rdf:RDF>
<cc:Work
rdf:about="">
@ -58,18 +26,43 @@
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<path
id="path1648"
style="fill:#ff0000;stroke:#ffffff;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.30362;paint-order:stroke fill markers"
d="m 6.0976563,5.5000019 c -1.9108191,0.7040587 -3.0971747,2.0445075 -3.0976562,3.500004 0,2.2091411 2.6862913,4.0000041 6.0000001,4.0000041 C 12.313709,13.00001 15,11.209147 15,9.0000059 14.999912,7.5447841 13.814362,6.2044012 11.904297,5.5000019 H 15 V 4.0000002 H 3.0000001 v 1.5000017 z"
sodipodi:nodetypes="ccsccccccc" />
<path
id="rect1587"
style="fill:#ffffff;stroke:none;stroke-width:0.529167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.30362;paint-order:stroke fill markers"
d="M 7,6.0000026 V 11.000008 H 7.9999999 V 9.0000059 H 10 v 2.0000021 h 1 V 6.0000026 H 10 V 8.0000049 H 7.9999999 V 6.0000026 Z" />
</g>
<defs
id="defs899" />
<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="namedview897"
showgrid="true"
inkscape:snap-smooth-nodes="true"
inkscape:zoom="11.351633"
inkscape:cx="-0.73721847"
inkscape:cy="13.670335"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg895">
<inkscape:grid
type="xygrid"
id="grid1464"
spacingx="0.5"
spacingy="0.5"
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 " />
<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"
id="path893"
style="fill:#ffffff" />
</svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View file

@ -11,11 +11,11 @@
height="18"
version="1.1"
viewBox="0 0 18 18"
id="svg1600"
id="svg1648"
sodipodi:docname="hydrant_unknown.svg"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
<metadata
id="metadata1606">
id="metadata1654">
<rdf:RDF>
<cc:Work
rdf:about="">
@ -27,9 +27,9 @@
</rdf:RDF>
</metadata>
<defs
id="defs1604" />
id="defs1652" />
<sodipodi:namedview
pagecolor="#e33ce8"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
@ -39,39 +39,33 @@
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1041"
id="namedview1602"
id="namedview1650"
showgrid="true"
inkscape:zoom="20"
inkscape:cx="5.7857505"
inkscape:cy="1.705875"
inkscape:zoom="28.382378"
inkscape:cx="9.1520724"
inkscape:cy="9.624425"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg1600"
inkscape:snap-smooth-nodes="true">
inkscape:current-layer="svg1648">
<inkscape:grid
type="xygrid"
id="grid2169"
id="grid2217"
spacingx="0.5"
spacingy="0.5"
empspacing="2" />
</sodipodi:namedview>
<ellipse
<circle
cx="9"
cy="9"
fill="#ff0000"
stroke="#ffffff"
stroke-dashoffset="2.3036"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="0.52917"
style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers"
id="ellipse1596"
rx="4.5000005"
ry="4.5000062" />
stroke="#000000"
stroke-width="2.00001"
style="paint-order:stroke fill markers"
id="ellipse1644"
r="5.9999952" />
<path
d="M 7.0005764,6.5003688 V 11.499352 H 8.0003717 V 9.4997211 H 10 v 1.9996309 h 0.999795 V 6.5003688 H 10 V 8.5 H 8.0003717 V 6.5003688 Z"
fill="#ffffff"
style="fill:#ffffff;stroke-width:1;paint-order:stroke fill markers"
id="path1598" />
d="m7 6.5v5h1v-2h2v2h1v-5h-1v2h-2v-2z"
fill="#fff"
id="path1646" />
</svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB