Linting themes, fix userbadges

This commit is contained in:
Pieter Vander Vennet 2021-10-21 21:41:45 +02:00
parent 9336e19757
commit b9b8a5c71a
27 changed files with 4074 additions and 3903 deletions

View file

@ -269,13 +269,11 @@
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
},
{
"if": "service:bicycle:pump=yes",
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
"badge": true
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg"
}
],
"width": {
@ -293,16 +291,14 @@
"icon": {
"render": "pin:#22ff55;./assets/layers/bicycle_library/bicycle_library.svg"
},
"iconOverlays": [
"iconBadges": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
},
{
"if": "service:bicycle:pump=yes",
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
"badge": true
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg"
}
],
"iconSize": {

View file

@ -48,8 +48,7 @@
"operational_status=closed"
]
},
"then": "close:#c33",
"badge": true
"then": "close:#c33"
}
],
"iconSize": "50,50,bottom",
@ -282,7 +281,7 @@
"icon": {
"render": "pin:#ffffff;./assets/layers/bicycle_tube_vending_machine/pinIcon.svg"
},
"iconOverlays": [
"iconBadges": [
{
"if": {
"or": [
@ -290,8 +289,7 @@
"operational_status=closed"
]
},
"then": "close:#c33",
"badge": true
"then": "close:#c33"
}
],
"iconSize": "50,50,bottom",

View file

@ -81,8 +81,7 @@
"then": {
"render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg",
"roaming": true
},
"badge": true
}
}
],
"titleIcons": [
@ -168,7 +167,7 @@
"icon": {
"render": "./assets/layers/bike_cleaning/bike_cleaning.svg"
},
"iconOverlays": [
"iconBadges": [
{
"if": {
"and": [
@ -179,8 +178,7 @@
"then": {
"render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg",
"roaming": true
},
"badge": true
}
}
],
"iconSize": "50,50,bottom",

View file

@ -673,8 +673,7 @@
"iconOverlays": [
{
"if": "operator=De Fietsambassade Gent",
"then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg",
"badge": true
"then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg"
}
],
"iconSize": {
@ -826,11 +825,10 @@
}
]
},
"iconOverlays": [
"iconBadges": [
{
"if": "operator=De Fietsambassade Gent",
"then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg",
"badge": true
"then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg"
}
],
"iconSize": {

View file

@ -723,13 +723,11 @@
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
},
{
"if": "service:bicycle:pump=yes",
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
"badge": true
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg"
},
{
"if": {
@ -739,8 +737,7 @@
},
"then": {
"render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
},
"badge": true
}
}
],
"width": {
@ -768,16 +765,14 @@
}
]
},
"iconOverlays": [
"iconBadges": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
},
{
"if": "service:bicycle:pump=yes",
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
"badge": true
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg"
},
{
"if": {
@ -787,8 +782,7 @@
},
"then": {
"render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
},
"badge": true
}
}
],
"iconSize": {

View file

@ -28,8 +28,7 @@
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"label": {
@ -215,11 +214,10 @@
}
]
},
"iconOverlays": [
"iconBadges": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"label": {

File diff suppressed because it is too large Load diff

View file

@ -33,8 +33,7 @@
"operational_status=closed"
]
},
"then": "close:#c33",
"badge": true
"then": "close:#c33"
}
],
"iconSize": "40,40,bottom",
@ -185,7 +184,7 @@
"icon": {
"render": "pin:#6BC4F7;./assets/layers/drinking_water/drips.svg"
},
"iconOverlays": [
"iconBadges": [
{
"if": {
"or": [
@ -193,8 +192,7 @@
"operational_status=closed"
]
},
"then": "close:#c33",
"badge": true
"then": "close:#c33"
}
],
"iconSize": "40,40,bottom",

View file

@ -35,8 +35,7 @@
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
},
{
"if": {
@ -47,8 +46,7 @@
},
"then": {
"render": "circle:white;./assets/themes/fritures/Vegetarian-mark.svg"
},
"badge": true
}
}
],
"label": {
@ -656,11 +654,10 @@
}
]
},
"iconOverlays": [
"iconBadges": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
},
{
"if": {
@ -671,8 +668,7 @@
},
"then": {
"render": "circle:white;./assets/themes/fritures/Vegetarian-mark.svg"
},
"badge": true
}
}
],
"label": {

View file

@ -482,8 +482,7 @@
"opening_hours~*"
]
},
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"width": {
@ -541,7 +540,7 @@
"icon": {
"render": "./assets/themes/playgrounds/playground.svg"
},
"iconOverlays": [
"iconBadges": [
{
"if": {
"and": [
@ -549,8 +548,7 @@
"opening_hours~*"
]
},
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"iconSize": {

View file

@ -45,7 +45,7 @@
]
},
"icon": {
"render": "./assets/themes/bookcases/bookcase.svg;"
"render": "./assets/themes/bookcases/bookcase.svg"
},
"label": {
"mappings": [

View file

@ -279,8 +279,7 @@
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"width": {
@ -328,11 +327,10 @@
"icon": {
"render": "./assets/themes/shops/shop.svg"
},
"iconOverlays": [
"iconBadges": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"iconSize": {

View file

@ -420,8 +420,7 @@
"opening_hours~*"
]
},
"then": "isOpen",
"badge": true
"then": "isOpen"
},
{
"if": {
@ -431,8 +430,7 @@
"access=no"
]
},
"then": "circle:white;./assets/layers/sport_pitch/lock.svg",
"badge": true
"then": "circle:white;./assets/layers/sport_pitch/lock.svg"
}
],
"width": {
@ -514,7 +512,7 @@
}
]
},
"iconOverlays": [
"iconBadges": [
{
"if": {
"and": [
@ -522,8 +520,7 @@
"opening_hours~*"
]
},
"then": "isOpen",
"badge": true
"then": "isOpen"
},
{
"if": {
@ -533,8 +530,7 @@
"access=no"
]
},
"then": "circle:white;./assets/layers/sport_pitch/lock.svg",
"badge": true
"then": "circle:white;./assets/layers/sport_pitch/lock.svg"
}
],
"iconSize": {

View file

@ -1411,6 +1411,26 @@
"https://www.onlinewebfonts.com/icon/197818"
]
},
{
"path": "teardrop_with_hole_green.svg",
"license": "CC-BY-SA 3.0 Unported",
"authors": [
"Mono, derivated work User:Benoit Rochon"
],
"sources": [
"https://commons.wikimedia.org/wiki/File:Map_pin_icon_green.svg"
]
},
{
"path": "teardrop.svg",
"license": "CC-BY-SA 3.0 Unported",
"authors": [
"Mono, derivated work User:Benoit Rochon"
],
"sources": [
"https://commons.wikimedia.org/wiki/File:Map_pin_icon_green.svg"
]
},
{
"path": "translate.svg",
"license": "CC-BY-SA 3.0",
@ -1503,4 +1523,4 @@
"https://www.wikipedia.org/"
]
}
]
]

104
assets/svg/teardrop.svg Normal file
View file

@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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"
id="svg2816"
version="1.1"
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
width="94"
height="128"
sodipodi:docname="teardrop.svg">
<metadata
id="metadata2822">
<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 />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2820">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective2824" />
</defs>
<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="1003"
id="namedview2818"
showgrid="false"
inkscape:zoom="3.0991164"
inkscape:cx="-71.403124"
inkscape:cy="60.493358"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2816" />
<path
style="fill:#000000;fill-opacity:0.98823529"
d="M 46.977003,126.64334 C 46.693972,125.95584 40.813862,120.20567 36.603071,114.98067 11.655836,81.858372 -16.158365,51.082905 16.319943,13.682837 30.700637,-0.21083367 48.43303,-1.0034227 66.662563,5.4726973 117.9922,35.174601 80.828906,83.627914 56.427079,115.48067 l -9.450076,11.16267 z M 62.417383,75.872046 C 96.654166,51.387445 70.185413,4.2391813 32.569429,19.913013 21.585178,25.769872 16.134954,35.960547 15.944071,47.980664 c -0.524495,11.693153 5.685418,21.471037 15.526227,27.460808 7.055481,3.840074 10.157178,4.533661 18.145697,4.057654 5.177622,-0.308516 8.161127,-1.153847 12.801388,-3.62708 z"
id="path4127"
sodipodi:nodetypes="ccccccccccsc" />
<path
sodipodi:type="arc"
style="fill:#000000;fill-opacity:0.98823529;fill-rule:nonzero;stroke:none"
id="path4129"
sodipodi:cx="52.363636"
sodipodi:cy="49.05526"
sodipodi:rx="51.222816"
sodipodi:ry="41.754009"
d="m 41.682107,89.891342 a 51.222816,41.754009 0 1 1 1.276617,0.208091"
sodipodi:start="1.7808687"
sodipodi:end="8.0386371"
sodipodi:open="true"
transform="matrix(0.87829487,0,0,1.0519028,0.55474126,-6.9952658)" />
<path
sodipodi:type="arc"
style="opacity:0.34016395;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none"
id="path4131"
sodipodi:cx="49.05526"
sodipodi:cy="48.59893"
sodipodi:rx="26.010695"
sodipodi:ry="20.991087"
d="m 43.631232,69.128546 a 26.010695,20.991087 0 1 1 0.64826,0.104614"
sodipodi:start="1.7808687"
sodipodi:end="8.0386371"
sodipodi:open="true"
transform="translate(0.64534523,0)" />
<path
sodipodi:type="arc"
style="fill:#000080;fill-opacity:0;fill-rule:nonzero;stroke:none"
id="path4135"
sodipodi:cx="35.365417"
sodipodi:cy="102.78788"
sodipodi:rx="16.655972"
sodipodi:ry="11.750445"
d="m 31.892136,114.28 a 16.655972,11.750445 0 1 1 0.415114,0.0586"
sodipodi:start="1.7808687"
sodipodi:end="8.0386371"
sodipodi:open="true"
transform="translate(0.64534523,0)" />
</svg>

After

Width:  |  Height:  |  Size: 3.8 KiB

View file

@ -0,0 +1,130 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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"
id="svg2816"
version="1.1"
inkscape:version="0.91 r13725"
width="94"
height="128"
sodipodi:docname="Map_pin_icon_green.svg">
<metadata
id="metadata2822">
<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="defs2820">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective2824" />
</defs>
<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="1017"
id="namedview2818"
showgrid="false"
inkscape:zoom="3.0991164"
inkscape:cx="-5.0939007"
inkscape:cy="60.493358"
inkscape:window-x="1912"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg2816" />
<path
style="fill:#008000;fill-opacity:0.98823529"
d="M 46.977003,126.64334 C 46.693972,125.95584 40.813862,120.20567 36.603071,114.98067 11.655836,81.858372 -16.158365,51.082905 16.319943,13.682837 30.700637,-0.21083367 48.43303,-1.0034227 66.662563,5.4726973 117.9922,35.174601 80.828906,83.627914 56.427079,115.48067 l -9.450076,11.16267 z M 62.417383,75.872046 C 96.654166,51.387445 70.185413,4.2391813 32.569429,19.913013 21.585178,25.769872 16.134954,35.960547 15.944071,47.980664 c -0.524495,11.693153 5.685418,21.471037 15.526227,27.460808 7.055481,3.840074 10.157178,4.533661 18.145697,4.057654 5.177622,-0.308516 8.161127,-1.153847 12.801388,-3.62708 z"
id="path4127"
sodipodi:nodetypes="ccccccccccsc" />
<path
sodipodi:type="arc"
style="fill:#008000;fill-opacity:0.98823529;fill-rule:nonzero;stroke:none"
id="path4129"
sodipodi:cx="52.363636"
sodipodi:cy="49.05526"
sodipodi:rx="51.222816"
sodipodi:ry="41.754009"
d="m 41.682107,89.891342 a 51.222816,41.754009 0 1 1 1.276617,0.208091"
sodipodi:start="1.7808687"
sodipodi:end="8.0386371"
sodipodi:open="true"
transform="matrix(0.87829487,0,0,1.0519028,0.55474126,-6.9952658)" />
<path
sodipodi:type="arc"
style="opacity:0.34016395;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none"
id="path4131"
sodipodi:cx="49.05526"
sodipodi:cy="48.59893"
sodipodi:rx="26.010695"
sodipodi:ry="20.991087"
d="m 43.631232,69.128546 a 26.010695,20.991087 0 1 1 0.64826,0.104614"
sodipodi:start="1.7808687"
sodipodi:end="8.0386371"
sodipodi:open="true"
transform="translate(0.64534523,0)" />
<path
sodipodi:type="arc"
style="fill:#000080;fill-opacity:0;fill-rule:nonzero;stroke:none"
id="path4135"
sodipodi:cx="35.365417"
sodipodi:cy="102.78788"
sodipodi:rx="16.655972"
sodipodi:ry="11.750445"
d="m 31.892136,114.28 a 16.655972,11.750445 0 1 1 0.415114,0.0586"
sodipodi:start="1.7808687"
sodipodi:end="8.0386371"
sodipodi:open="true"
transform="translate(0.64534523,0)" />
<path
sodipodi:type="arc"
style="fill:#009400;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path4149"
sodipodi:cx="52.705883"
sodipodi:cy="52.021389"
sodipodi:rx="34.452763"
sodipodi:ry="33.540108"
d="m 45.521425,84.824145 a 34.452763,33.540108 0 1 1 0.85866,0.167155"
sodipodi:start="1.7808687"
sodipodi:end="8.0386371"
sodipodi:open="true"
transform="matrix(0.97020484,0,0,1.0272058,-4.0587829,-5.7503824)" />
<path
sodipodi:type="arc"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path4184"
sodipodi:cx="64.211853"
sodipodi:cy="68.789574"
sodipodi:rx="34.203297"
sodipodi:ry="36.623341"
d="m 57.079416,104.60778 a 34.203297,36.623341 0 1 1 0.852443,0.18252"
sodipodi:start="1.7808687"
sodipodi:end="8.0386371"
sodipodi:open="true"
transform="matrix(0.64629924,0,0,0.61681122,5.1261236,4.9013803)" />
</svg>

After

Width:  |  Height:  |  Size: 4.8 KiB

View file

@ -156,8 +156,7 @@
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"width": {
@ -221,11 +220,10 @@
"icon": {
"render": "./assets/themes/climbing/club.svg"
},
"iconOverlays": [
"iconBadges": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"iconSize": {
@ -325,8 +323,7 @@
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"width": "0",
@ -339,11 +336,10 @@
"icon": {
"render": "./assets/themes/climbing/climbing_gym.svg"
},
"iconOverlays": [
"iconBadges": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"iconSize": {

View file

@ -84,33 +84,27 @@
"iconOverlays": [
{
"if": "plant~.*vine.*",
"then": "circle:white;./assets/themes/facadegardens/klimplant.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/klimplant.svg"
},
{
"if": "plant~.*groundcover.*",
"then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg"
},
{
"if": "edible=true",
"then": "circle:white;./assets/themes/facadegardens/eetbaar.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/eetbaar.svg"
},
{
"if": "rain_barel=yes",
"then": "circle:white;./assets/themes/facadegardens/gevelton.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/gevelton.svg"
},
{
"if": "plant~.*shrub.*",
"then": "circle:white;./assets/themes/facadegardens/struik.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/struik.svg"
},
{
"if": "plant~.*flower.*",
"then": "circle:white;./assets/themes/facadegardens/bloei.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/bloei.svg"
}
],
"tagRenderings": [
@ -486,36 +480,30 @@
}
]
},
"iconOverlays": [
"iconBadges": [
{
"if": "plant~.*vine.*",
"then": "circle:white;./assets/themes/facadegardens/klimplant.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/klimplant.svg"
},
{
"if": "plant~.*groundcover.*",
"then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg"
},
{
"if": "edible=true",
"then": "circle:white;./assets/themes/facadegardens/eetbaar.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/eetbaar.svg"
},
{
"if": "rain_barel=yes",
"then": "circle:white;./assets/themes/facadegardens/gevelton.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/gevelton.svg"
},
{
"if": "plant~.*shrub.*",
"then": "circle:white;./assets/themes/facadegardens/struik.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/struik.svg"
},
{
"if": "plant~.*flower.*",
"then": "circle:white;./assets/themes/facadegardens/bloei.svg",
"badge": true
"then": "circle:white;./assets/themes/facadegardens/bloei.svg"
}
],
"iconSize": {

View file

@ -154,8 +154,7 @@
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"width": {
@ -196,11 +195,10 @@
"icon": {
"render": "square:white;./assets/themes/postboxes/post_office.svg"
},
"iconOverlays": [
"iconBadges": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"then": "isOpen"
}
],
"iconSize": {