midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Themes: add dog icon into title-icons, add dog filter, see #212

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-09-28 00:01:55 +02:00
parent 195a9e9298
commit 7e0120d0e8
11 changed files with 310 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
assets/layers/filters/filters.json
View file

@ -244,6 +244,33 @@
}
}
]
},
{
"id": "dogs",
"options": [
{
"question": {
"en": "No preference towards dogs"
}
},
{
"question": {
"en": "Dogs allowed"
},
"osmTags": {
"or": [
"dog=unleashed",
"dog=yes"
]
}
},
{
"question": {
"en": "No dogs allowed"
},
"osmTags": "dog=no"
}
]
}
]
}
}

3
assets/layers/food/food.json
View file

@ -1102,7 +1102,8 @@
},
"has_organic",
"accepts_cash",
"accepts_cards"
"accepts_cards",
"dogs"
],
"deletion": {
"nonDeleteMappings": [

28
assets/layers/icons/icons.json
View file

@ -154,6 +154,34 @@
}
],
"condition": "id~(node|way|relation)/[0-9]*"
},
{
"id": "dogicon",
"labels": [
"defaults"
],
"mappings": [
{
"if": "dog=no",
"#": "ignore-image-in-then",
"then": "<img textmode='\uD83D\uDC15 ⃠' alt='no_dogs' src='./assets/layers/questions/no_dogs.svg'>"
},
{
"if": "dog=leashed",
"#": "ignore-image-in-then",
"then": "<img textmode='\uD83D\uDC15' alt='dogs are allowed but leashed' src='./assets/layers/questions/dogs_leashed.svg'>"
},
{
"if": {
"or": [
"dog=yes",
"dog=unleashed"
]
},
"#": "ignore-image-in-then",
"then": "<img textmode='\uD83D\uDC15' alt='dogs are allowed' src='./assets/layers/questions/dogs_allowed.svg'>"
}
]
}
],
"mapRendering": null

70
assets/layers/questions/dogs_allowed.svg Normal file
View file

@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
id="svg3125"
sodipodi:docname="dogs_allowed.svg"
viewBox="0 0 360.94291 306.6074"
sodipodi:version="0.32"
version="1.0"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
width="360.9429"
height="306.60739"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs13" />
<sodipodi:namedview
id="base"
bordercolor="#666666"
inkscape:pageshadow="2"
inkscape:window-width="1920"
pagecolor="#ffffff"
inkscape:zoom="1.3715616"
inkscape:window-x="0"
showgrid="false"
borderopacity="1.0"
inkscape:current-layer="svg3125"
inkscape:cx="144.361"
inkscape:cy="169.51481"
inkscape:window-y="0"
inkscape:window-height="995"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:window-maximized="1" />
<path
id="path3137"
style="fill:#000000;stroke:#ffffff;stroke-width:1.15616"
d="M 218.33368,212.89652 H 106.97743 v 65.97861 c 0,36.20557 -54.947977,36.20557 -54.947977,0 V 134.81319 H 27.31312 c -35.3487001,0 -35.6624811,-48.841311 -0.832728,-48.841311 h 44.206996 v 0.0603 L 210.09088,85.983879 294.67915,1.3956086 V 44.480229 l 58.53233,58.532331 c 13.62536,14.14431 5.78082,31.41436 -6.77044,31.41436 h -73.48523 l -0.25344,144.44821 c 0,36.20557 -54.42903,36.20557 -54.42903,0 v -65.97861" />
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work>
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
<dc:publisher>
<cc:Agent
rdf:about="http://openclipart.org/">
<dc:title>Openclipart</dc:title>
</cc:Agent>
</dc:publisher>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

2
assets/layers/questions/dogs_allowed.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: OpenClipArt
SPDX-License-Identifier: PD

54
assets/layers/questions/dogs_leashed.svg Normal file
View file

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
<svg
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="90.859001"
height="84.87442"
viewBox="-0.258 -0.548 90.859003 84.874419"
xml:space="preserve"
sodipodi:docname="dogs_leashed.svg"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><defs
id="defs17">
</defs><sodipodi:namedview
id="namedview15"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="4.1311963"
inkscape:cx="15.733941"
inkscape:cy="70.802735"
inkscape:window-width="1920"
inkscape:window-height="995"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" />
<path
id="polygon6"
style="fill:#0300ff;stroke:#0300ff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 1.242,1.834423 53.328,25.562 -1.711,3.859 -51.617,-24.539 z" /><path
style="fill:#000000;fill-opacity:1"
d="M 35.226,58.209423 H 57.82 v 20.164 c 0,3.297 2.656,5.953 5.953,5.953 v 0 c 3.297,0 5.984,-2.656 5.984,-5.953 v -20.164 c 1.781,0 1.953,-1.172 1.953,-2.547 v -15.032 l -18.874,-9.234 H 12.718 l -5.18,-2.93 c -1.656,-0.953 -3.766,-0.367 -4.711,1.297 v 0 c -0.938,1.656 -0.367,3.758 1.297,4.711 l 8.18,4.688 v 39.211 c 0,3.297 2.672,5.953 5.969,5.953 v 0 c 3.297,0 5.969,-2.656 5.969,-5.953 l -0.016,-15.36 10.82,18.266 c 1.68,2.828 5.336,3.758 8.195,2.07 v 0 c 2.805,-1.68 3.734,-5.367 2.047,-8.203 z"
id="path8" /><polygon
style="fill:#000000;fill-opacity:1"
points="109.445,42.488 73.539,25.379 73.539,48.52 90.531,56.605 90.531,53.426 104.367,53.402 "
id="polygon10"
transform="translate(-18.844,-21.224577)" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

2
assets/layers/questions/dogs_leashed.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: NPS Graphics, converted by User:ZyMOS
SPDX-License-Identifier: PD

30
assets/layers/questions/license_info.json
View file

@ -39,6 +39,26 @@
"https://www.onlinewebfonts.com/icon/464488"
]
},
{
"path": "dogs_allowed.svg",
"license": "PUBLIC-DOMAIN",
"authors": [
"OpenClipArt"
],
"sources": [
"https://freesvg.org/no-dogs-round-sign-vector-graphics"
]
},
{
"path": "dogs_leashed.svg",
"license": "PUBLIC-DOMAIN",
"authors": [
" \tNPS Graphics, converted by User:ZyMOS"
],
"sources": [
"https://commons.wikimedia.org/wiki/File:Pictograms-nps-pets_on_leash-2.svg"
]
},
{
"path": "nfc_card.svg",
"license": "CC0-1.0",
@ -49,6 +69,16 @@
"https://wens.be/free-antwerpenize-bicycle-font"
]
},
{
"path": "no_dogs.svg",
"license": "Public Domain",
"authors": [
"OpenClipArt"
],
"sources": [
"https://freesvg.org/no-dogs-round-sign-vector-graphics"
]
},
{
"path": "no_smoking.svg",
"license": "CC0-1.0",

87
assets/layers/questions/no_dogs.svg Normal file
View file

@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
id="svg3125"
sodipodi:docname="no_dogs.svg"
viewBox="0 0 430.55 430.55"
sodipodi:version="0.32"
version="1.0"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
width="430.54999"
height="430.54999"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs13" />
<sodipodi:namedview
id="base"
bordercolor="#666666"
inkscape:pageshadow="2"
inkscape:window-width="1920"
pagecolor="#ffffff"
inkscape:zoom="1.1508686"
inkscape:window-x="0"
showgrid="false"
borderopacity="1.0"
inkscape:current-layer="svg3125"
inkscape:cx="67.774897"
inkscape:cy="247.20459"
inkscape:window-y="0"
inkscape:window-height="995"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:window-maximized="1" />
<path
id="path3137"
style="fill:#000000;stroke:#ffffff;stroke-width:1.0489"
d="M 248.70672,267.79518 H 147.68191 v 59.85723 c 0,32.84648 -49.85001,32.84648 -49.85001,0 V 196.95628 H 75.408708 c -32.069111,0 -32.35378,-44.3099 -0.755469,-44.3099 h 40.105551 v 0.0547 l 126.46989,-0.0438 76.74032,-76.740324 v 39.087304 l 53.1018,53.10181 c 12.36123,12.83202 5.24449,28.49979 -6.14229,28.49979 h -66.6674 l -0.22993,131.0465 c 0,32.84648 -49.3792,32.84648 -49.3792,0 v -59.85723" />
<path
id="path3141"
style="fill:none;stroke:#ffffff;stroke-width:54;stroke-miterlimit:4;stroke-dasharray:none"
d="M 359,356.71 75.76,73.47" />
<g
id="g3143"
transform="translate(-236.8,-236.8)"
style="stroke-width:40;stroke-miterlimit:4;stroke-dasharray:none">
<path
id="path3145"
style="fill:none;stroke:#ff0000;stroke-width:40;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 452.08,647.35 c -107.85,0 -195.28,-87.43 -195.28,-195.27 0,-107.85 87.43,-195.28 195.28,-195.28 107.84,0 195.27,87.43 195.27,195.28 0,107.84 -87.43,195.27 -195.27,195.27 z" />
</g>
<path
id="path3149"
style="fill:none;stroke:#ff0000;stroke-width:40;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 359.28,356.93 75.41,73.12" />
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work>
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
<dc:publisher>
<cc:Agent
rdf:about="http://openclipart.org/">
<dc:title>Openclipart</dc:title>
</cc:Agent>
</dc:publisher>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

2
assets/layers/questions/no_dogs.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: OpenClipArt
SPDX-License-Identifier: Public Domain

5
assets/layers/questions/questions.json
View file

@ -487,6 +487,7 @@
"mappings": [
{
"if": "dog=yes",
"icon": "./assets/layers/questions/dogs_allowed.svg",
"then": {
"en": "Dogs are allowed",
"nl": "honden zijn toegelaten",
@ -515,6 +516,7 @@
},
{
"if": "dog=no",
"icon": "./assets/layers/questions/no_dogs.svg",
"then": {
"en": "Dogs are <b>not</b> allowed",
"nl": "honden zijn <b>niet</b> toegelaten",
@ -542,6 +544,7 @@
},
{
"if": "dog=leashed",
"icon": "./assets/layers/questions/dogs_leashed.svg",
"then": {
"en": "Dogs are allowed, but they have to be leashed",
"nl": "honden zijn <b>enkel aan de leiband</b> welkom",
@ -568,6 +571,8 @@
},
{
"if": "dog=unleashed",
"icon": "./assets/layers/questions/dogs_allowed.svg",
"then": {
"en": "Dogs are allowed and can run around freely",
"nl": "honden zijn welkom en mogen vrij rondlopen",