Merge pull request #1949 from pietervdvn/RobinLinde-patch-2

Fixes for charging stations, minor other changes
This commit is contained in:
Pieter Vander Vennet 2024-05-14 01:11:26 +02:00 committed by GitHub
commit 2566851a5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 1452 additions and 427 deletions

View file

@ -0,0 +1,6 @@
<svg width="127" height="127" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.3366 2H110.666C132.016 2 128.568 124.791 110.666 124.791H16.3366C-4.27329 124.791 -1.2237 2 16.3366 2Z" stroke="black" stroke-width="2.5" stroke-linejoin="round"/>
<path d="M68.0922 78.6937H59.3214V105.468H68.0922V78.6937Z" fill="black"/>
<path d="M45.1364 33.0528L37.5356 28.6761L24.1753 51.8784L31.7761 56.2551L45.1364 33.0528Z" fill="black"/>
<path d="M82.2772 33.0528L89.878 28.6762L103.238 51.8785L95.6376 56.2552L82.2772 33.0528Z" fill="black"/>
</svg>

After

Width:  |  Height:  |  Size: 612 B

View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Yanpas
SPDX-License-Identifier: CC-BY-SA-4.0

View file

@ -1300,6 +1300,252 @@
"path": "./assets/layers/charging_station/bs1363.svg",
"class": "medium"
}
},
{
"if": "socket:nema5_15=1",
"ifnot": "socket:nema5_15=",
"then": {
"en": "<b>NEMA 5-15</b> (Type B)",
"nl": "<b>NEMA 5-15</b> (VS 3-pin)"
},
"icon": {
"path": "./assets/layers/charging_station/nema-5-15.svg",
"class": "medium"
},
"hideInAnswer": {
"and": [
"_country!=as",
"_country!=ai",
"_country!=ag",
"_country!=aw",
"_country!=bb",
"_country!=bz",
"_country!=bm",
"_country!=bo",
"_country!=vg",
"_country!=ky",
"_country!=co",
"_country!=cr",
"_country!=cu",
"_country!=do",
"_country!=ec",
"_country!=sv",
"_country!=pf",
"_country!=gu",
"_country!=gt",
"_country!=gy",
"_country!=ht",
"_country!=hn",
"_country!=jm",
"_country!=jp",
"_country!=jo",
"_country!=la",
"_country!=lb",
"_country!=lr",
"_country!=mx",
"_country!=fm",
"_country!=ms",
"_country!=ni",
"_country!=ne",
"_country!=pw",
"_country!=pa",
"_country!=py",
"_country!=pe",
"_country!=ph",
"_country!=pr",
"_country!=sr",
"_country!=th",
"_country!=tt",
"_country!=tm",
"_country!=ve",
"_country!=vn"
]
}
},
{
"if": {
"and": [
"socket:nema5_15~*",
"socket:nema5_15!=1"
]
},
"then": {
"en": "<b>NEMA 5-15</b> (Type B)",
"nl": "<b>NEMA 5-15</b> (VS 3-pin)"
},
"hideInAnswer": true,
"icon": {
"path": "./assets/layers/charging_station/nema-5-15.svg",
"class": "medium"
}
},
{
"if": "socket:sev1011_t23=1",
"ifnot": "socket:sev1011_t23=",
"then": {
"en": "<b>SEV 1011 T23</b> (Type J)",
"nl": "<b>SEV 1011 T23</b> (Zwitserse 3-pin)"
},
"icon": {
"path": "./assets/layers/charging_station/typej.svg",
"class": "medium"
},
"hideInAnswer": {
"and": [
"_country!=jo",
"_country!=li",
"_country!=mg",
"_country!=mv",
"_country!=rw",
"_country!=ch"
]
}
},
{
"if": {
"and": [
"socket:sev1011_t23~*",
"socket:sev1011_t23!=1"
]
},
"then": {
"en": "<b>SEV 1011 T23</b> (Type J)",
"nl": "<b>SEV 1011 T23</b> (Zwitserse 3-pin)"
},
"hideInAnswer": true,
"icon": {
"path": "./assets/layers/charging_station/typej.svg",
"class": "medium"
}
},
{
"if": "socket:as3112=1",
"ifnot": "socket:as3112=",
"then": {
"en": "<b>AS3112</b> (Type I)",
"nl": "<b>AS3112</b> (Australische 3-pin)"
},
"icon": {
"path": "./assets/layers/charging_station/as3112.svg",
"class": "medium"
},
"hideInAnswer": {
"and": [
"_country!=as",
"_country!=ar",
"_country!=au",
"_country!=cn",
"_country!=ck",
"_country!=fj",
"_country!=ki",
"_country!=nr",
"_country!=nz",
"_country!=nu",
"_country!=pg",
"_country!=sb",
"_country!=tj",
"_country!=to",
"_country!=tv",
"_country!=uy",
"_country!=uz",
"_country!=vu"
]
}
},
{
"if": {
"and": [
"socket:as3112~*",
"socket:as3112!=1"
]
},
"then": {
"en": "<b>AS3112</b> (Type I)",
"nl": "<b>AS3112</b> (Australische 3-pin)"
},
"hideInAnswer": true,
"icon": {
"path": "./assets/layers/charging_station/as3112.svg",
"class": "medium"
}
},
{
"if": "socket:nema_5_20=1",
"ifnot": "socket:nema_5_20=",
"then": {
"en": "<b>NEMA 5-20</b> (Type B)",
"nl": "<b>NEMA 5-20</b> (VS 3-pin)"
},
"icon": {
"path": "./assets/layers/charging_station/nema-5-20.svg",
"class": "medium"
},
"hideInAnswer": {
"and": [
"_country!=as",
"_country!=ai",
"_country!=ag",
"_country!=aw",
"_country!=bb",
"_country!=bz",
"_country!=bm",
"_country!=bo",
"_country!=vg",
"_country!=ky",
"_country!=co",
"_country!=cr",
"_country!=cu",
"_country!=do",
"_country!=ec",
"_country!=sv",
"_country!=pf",
"_country!=gu",
"_country!=gt",
"_country!=gy",
"_country!=ht",
"_country!=hn",
"_country!=jm",
"_country!=jp",
"_country!=jo",
"_country!=la",
"_country!=lb",
"_country!=lr",
"_country!=mx",
"_country!=fm",
"_country!=ms",
"_country!=ni",
"_country!=ne",
"_country!=pw",
"_country!=pa",
"_country!=py",
"_country!=pe",
"_country!=ph",
"_country!=pr",
"_country!=sr",
"_country!=th",
"_country!=tt",
"_country!=tm",
"_country!=ve",
"_country!=vn"
]
}
},
{
"if": {
"and": [
"socket:nema_5_20~*",
"socket:nema_5_20!=1"
]
},
"then": {
"en": "<b>NEMA 5-20</b> (Type B)",
"nl": "<b>NEMA 5-20</b> (VS 3-pin)"
},
"hideInAnswer": true,
"icon": {
"path": "./assets/layers/charging_station/nema-5-20.svg",
"class": "medium"
}
}
]
},
@ -1658,6 +1904,78 @@
[
"3kW"
]
],
[
"socket:nema5_15",
"socket:nema5_15",
{
"en": "<b>NEMA 5-15</b> (Type B)",
"nl": "<b>NEMA 5-15</b> (VS 3-pin)"
},
"nema-5-15.svg",
[
"120"
],
[
"15"
],
[
"1.8 kW"
]
],
[
"socket:sev1011_t23",
"socket:sev1011_t23",
{
"en": "<b>SEV 1011 T23</b> (Type J)",
"nl": "<b>SEV 1011 T23</b> (Zwitserse 3-pin)"
},
"typej.svg",
[
"230"
],
[
"16"
],
[
"3.7 kW"
]
],
[
"socket:as3112",
"socket:as3112",
{
"en": "<b>AS3112</b> (Type I)",
"nl": "<b>AS3112</b> (Australische 3-pin)"
},
"as3112.svg",
[
"230"
],
[
"10"
],
[
"2.3 kW"
]
],
[
"socket:nema_5_20",
"socket:nema_5_20",
{
"en": "<b>NEMA 5-20</b> (Type B)",
"nl": "<b>NEMA 5-20</b> (VS 3-pin)"
},
"nema-5-20.svg",
[
"120"
],
[
"20"
],
[
"2.4 kW"
]
]
]
},
@ -2413,7 +2731,13 @@
}
}
],
"lineRendering": [],
"lineRendering": [
{
"color": "black",
"width": 2,
"fillColor": "#80808080"
}
],
"pointRendering": [
{
"location": [
@ -2711,6 +3035,34 @@
"nl": "Heeft een <div style='display: inline-block'><b><b>BS1363</b> (VK 3-pin)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bs1363.svg'/></div>"
},
"osmTags": "socket:bs1363~*"
},
{
"question": {
"en": "Has a <div style='display: inline-block'><b><b>NEMA 5-15</b> (Type B)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/nema-5-15.svg'/></div> connector",
"nl": "Heeft een <div style='display: inline-block'><b><b>NEMA 5-15</b> (VS 3-pin)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/nema-5-15.svg'/></div>"
},
"osmTags": "socket:nema5_15~*"
},
{
"question": {
"en": "Has a <div style='display: inline-block'><b><b>SEV 1011 T23</b> (Type J)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/typej.svg'/></div> connector",
"nl": "Heeft een <div style='display: inline-block'><b><b>SEV 1011 T23</b> (Zwitserse 3-pin)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/typej.svg'/></div>"
},
"osmTags": "socket:sev1011_t23~*"
},
{
"question": {
"en": "Has a <div style='display: inline-block'><b><b>AS3112</b> (Type I)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/as3112.svg'/></div> connector",
"nl": "Heeft een <div style='display: inline-block'><b><b>AS3112</b> (Australische 3-pin)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/as3112.svg'/></div>"
},
"osmTags": "socket:as3112~*"
},
{
"question": {
"en": "Has a <div style='display: inline-block'><b><b>NEMA 5-20</b> (Type B)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/nema-5-20.svg'/></div> connector",
"nl": "Heeft een <div style='display: inline-block'><b><b>NEMA 5-20</b> (VS 3-pin)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/nema-5-20.svg'/></div>"
},
"osmTags": "socket:nema_5_20~*"
}
]
}
@ -2870,6 +3222,42 @@
"mW",
"kW"
]
},
"socket:nema5_15:voltage": "voltage",
"socket:nema5_15:current": "current",
"socket:nema5_15:output": {
"quantity": "power",
"denominations": [
"mW",
"kW"
]
},
"socket:sev1011_t23:voltage": "voltage",
"socket:sev1011_t23:current": "current",
"socket:sev1011_t23:output": {
"quantity": "power",
"denominations": [
"mW",
"kW"
]
},
"socket:as3112:voltage": "voltage",
"socket:as3112:current": "current",
"socket:as3112:output": {
"quantity": "power",
"denominations": [
"mW",
"kW"
]
},
"socket:nema_5_20:voltage": "voltage",
"socket:nema_5_20:current": "current",
"socket:nema_5_20:output": {
"quantity": "power",
"denominations": [
"mW",
"kW"
]
}
}
],

View file

@ -874,7 +874,13 @@
}
}
],
"lineRendering": [],
"lineRendering": [
{
"color": "black",
"width": 2,
"fillColor": "#80808080"
}
],
"pointRendering": [
{
"location": [
@ -1043,4 +1049,4 @@
},
"neededChangesets": 10
}
}
}

View file

@ -99,6 +99,16 @@
],
"sources": []
},
{
"path": "as3112.svg",
"license": "CC-BY-SA-4.0",
"authors": [
"Yanpas"
],
"sources": [
"https://commons.wikimedia.org/wiki/File:Plug_types.svg"
]
},
{
"path": "bosch-3pin.svg",
"license": "CC0-1.0",
@ -125,6 +135,36 @@
"https://commons.wikimedia.org/wiki/File:Plug_types.svg"
]
},
{
"path": "nema-5-15.svg",
"license": "CC-BY-SA-4.0",
"authors": [
"Yanpas"
],
"sources": [
"https://commons.wikimedia.org/wiki/File:Plug_types.svg"
]
},
{
"path": "nema-5-20.svg",
"license": "CC-BY-SA-4.0",
"authors": [
"Modified from Yanpas"
],
"sources": [
"https://commons.wikimedia.org/wiki/File:Plug_types.svg"
]
},
{
"path": "typej.svg",
"license": "CC-BY-SA-4.0",
"authors": [
"Modified from Yanpas"
],
"sources": [
"https://commons.wikimedia.org/wiki/File:Plug_types.svg"
]
},
{
"path": "under_construction.svg",
"license": "CC0-1.0",

View file

@ -0,0 +1,6 @@
<svg width="132" height="108" viewBox="0 0 132 108" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.518 2L122.265 2.19696C126.862 2.20596 129.459 4.82052 129.576 8.99805L130.135 52.9633C128.09 58.3092 127.741 58.4746 122.697 59.2836L94.6426 59.4452L94.7838 82.0482C89.4216 113.801 43.866 113.885 37.5029 81.803L36.9436 59.4727L9.12459 59.2389C5.76322 59.1612 1.50424 53.8838 2.04712 49.9019L2.44736 9.19159C2.82493 5.73227 4.60697 3.17927 8.518 2Z" stroke="black" stroke-width="2.5"/>
<path d="M33.9379 18.4982H25.1671V45.2722H33.9379V18.4982Z" fill="black"/>
<path d="M106.476 18.4982H97.7049V45.2722H106.476V18.4982Z" fill="black"/>
<path d="M65.9505 89.1316C70.0927 89.1316 73.4505 85.7737 73.4505 81.6316C73.4505 77.4895 70.0927 74.1316 65.9505 74.1316C61.8084 74.1316 58.4506 77.4895 58.4506 81.6316C58.4506 85.7737 61.8084 89.1316 65.9505 89.1316Z" fill="black"/>
</svg>

After

Width:  |  Height:  |  Size: 929 B

View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Yanpas
SPDX-License-Identifier: CC-BY-SA-4.0

View file

@ -0,0 +1,7 @@
<svg width="132" height="108" viewBox="0 0 132 108" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.518 2L122.265 2.19696C126.862 2.20596 129.459 4.82052 129.576 8.99805L130.135 52.9633C128.09 58.3092 127.741 58.4746 122.697 59.2836L94.6426 59.4452L94.7838 82.0482C89.4216 113.801 43.866 113.885 37.5029 81.803L36.9436 59.4727L9.12459 59.2389C5.76322 59.1612 1.50424 53.8838 2.04712 49.9019L2.44736 9.19159C2.82493 5.73227 4.60697 3.17927 8.518 2Z" stroke="black" stroke-width="2.5"/>
<path d="M33.9379 18.4982H25.1671V45.2722H33.9379V18.4982Z" fill="black"/>
<path d="M106.476 18.4982H97.7049V45.2722H106.476V18.4982Z" fill="black"/>
<path d="M124.77 28H98V36.77H124.77V28Z" fill="black"/>
<path d="M65.9505 89.1316C70.0927 89.1316 73.4505 85.7737 73.4505 81.6316C73.4505 77.4895 70.0927 74.1316 65.9505 74.1316C61.8084 74.1316 58.4506 77.4895 58.4506 81.6316C58.4506 85.7737 61.8084 89.1316 65.9505 89.1316Z" fill="black"/>
</svg>

After

Width:  |  Height:  |  Size: 985 B

View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Modified from Yanpas
SPDX-License-Identifier: CC-BY-SA-4.0

View file

@ -0,0 +1,6 @@
<svg width="143" height="65" viewBox="0 0 143 65" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M36.152 2.26385L106.901 2.10065L141.146 32.3409L107.176 62.8994H36.1008L1.85425 32.0145L36.152 2.26385Z" stroke="black" stroke-width="2.5" stroke-linejoin="round"/>
<rect x="35" y="25" width="15" height="15" rx="3" fill="black"/>
<rect x="96" y="25" width="15" height="15" rx="3" fill="black"/>
<rect x="64" y="38" width="15" height="15" rx="3" fill="black"/>
</svg>

After

Width:  |  Height:  |  Size: 514 B

View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Modified from Yanpas
SPDX-License-Identifier: CC-BY-SA-4.0

View file

@ -16,3 +16,7 @@ socket:USB-A,,usb_port.svg,<b>USB</b> to charge phones and small electronics,,,5
socket:bosch_3pin,,bosch-3pin.svg,<b>Bosch Active Connect with 3 pins</b> and cable,,,,,,<b>Bosch Active Connect met 3 pinnen</b> aan een kabel,bicycle,car;motorcar;hgv;bus,
socket:bosch_5pin,,bosch-5pin.svg,<b>Bosch Active Connect with 5 pins</b> and cable,,,,,,<b>Bosch Active Connect met 5 pinnen</b> aan een kabel,bicycle,car;motorcar;hgv;bus,
socket:bs1363,,bs1363.svg,<b>BS1363</b> (Type G),bh;bd;bz;bt;bw;bn;kh;cy;dm;gh;gi;gd;gg;gy;id;iq;ie;im;je;jo;ke;kw;lb;mo;mw;mv;mt;mu;ng;om;pk;qa;rw;sa;sc;sl;sb;lk;sd;tz;ug;vu;vn;ye;zm;zw,,230,13,3kW,<b>BS1363</b> (VK 3-pin),*,,
socket:nema5_15,,nema-5-15.svg,<b>NEMA 5-15</b> (Type B),as;ai;ag;aw;bb;bz;bm;bo;vg;ky;co;cr;cu;do;ec;sv;pf;gu;gt;gy;ht;hn;jm;jp;jo;la;lb;lr;mx;fm;ms;ni;ne;pw;pa;py;pe;ph;pr;sr;th;tt;tm;ve;vn,,120,15,1.8 kW,<b>NEMA 5-15</b> (VS 3-pin),*,,
socket:sev1011_t23,,typej.svg,<b>SEV 1011 T23</b> (Type J),jo;li;mg;mv;rw;ch,,230,16,3.7 kW,<b>SEV 1011 T23</b> (Zwitserse 3-pin),*,,
socket:as3112,,as3112.svg,<b>AS3112</b> (Type I),as;ar;au;cn;ck;fj;ki;nr;nz;nu;pg;sb;tj;to;tv;uy;uz;vu,,230,10,2.3 kW,<b>AS3112</b> (Australische 3-pin),*,,
socket:nema_5_20,,nema-5-20.svg,<b>NEMA 5-20</b> (Type B),as;ai;ag;aw;bb;bz;bm;bo;vg;ky;co;cr;cu;do;ec;sv;pf;gu;gt;gy;ht;hn;jm;jp;jo;la;lb;lr;mx;fm;ms;ni;ne;pw;pa;py;pe;ph;pr;sr;th;tt;tm;ve;vn,,120,20,2.4 kW,<b>NEMA 5-20</b> (VS 3-pin),*,,

1 key id image description:en countryWhiteList countryBlackList commonVoltages commonCurrents commonOutputs description:nl associatedVehicleTypes neverAssociatedWith extraVisualisationCondition
16 socket:bosch_3pin bosch-3pin.svg <b>Bosch Active Connect with 3 pins</b> and cable <b>Bosch Active Connect met 3 pinnen</b> aan een kabel bicycle car;motorcar;hgv;bus
17 socket:bosch_5pin bosch-5pin.svg <b>Bosch Active Connect with 5 pins</b> and cable <b>Bosch Active Connect met 5 pinnen</b> aan een kabel bicycle car;motorcar;hgv;bus
18 socket:bs1363 bs1363.svg <b>BS1363</b> (Type G) bh;bd;bz;bt;bw;bn;kh;cy;dm;gh;gi;gd;gg;gy;id;iq;ie;im;je;jo;ke;kw;lb;mo;mw;mv;mt;mu;ng;om;pk;qa;rw;sa;sc;sl;sb;lk;sd;tz;ug;vu;vn;ye;zm;zw 230 13 3kW <b>BS1363</b> (VK 3-pin) *
19 socket:nema5_15 nema-5-15.svg <b>NEMA 5-15</b> (Type B) as;ai;ag;aw;bb;bz;bm;bo;vg;ky;co;cr;cu;do;ec;sv;pf;gu;gt;gy;ht;hn;jm;jp;jo;la;lb;lr;mx;fm;ms;ni;ne;pw;pa;py;pe;ph;pr;sr;th;tt;tm;ve;vn 120 15 1.8 kW <b>NEMA 5-15</b> (VS 3-pin) *
20 socket:sev1011_t23 typej.svg <b>SEV 1011 T23</b> (Type J) jo;li;mg;mv;rw;ch 230 16 3.7 kW <b>SEV 1011 T23</b> (Zwitserse 3-pin) *
21 socket:as3112 as3112.svg <b>AS3112</b> (Type I) as;ar;au;cn;ck;fj;ki;nr;nz;nu;pg;sb;tj;to;tv;uy;uz;vu 230 10 2.3 kW <b>AS3112</b> (Australische 3-pin) *
22 socket:nema_5_20 nema-5-20.svg <b>NEMA 5-20</b> (Type B) as;ai;ag;aw;bb;bz;bm;bo;vg;ky;co;cr;cu;do;ec;sv;pf;gu;gt;gy;ht;hn;jm;jp;jo;la;lb;lr;mx;fm;ms;ni;ne;pw;pa;py;pe;ph;pr;sr;th;tt;tm;ve;vn 120 20 2.4 kW <b>NEMA 5-20</b> (VS 3-pin) *

View file

@ -180,6 +180,17 @@
"https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/plastic_packaging.svg"
]
},
{
"path": "pmd.svg",
"license": "CC-BY-SA-4.0",
"authors": [
"Modified from Tobias Zwick"
],
"sources": [
"https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/cans.svg",
"https://github.com/streetcomplete/StreetComplete/blob/master/res/graphics/recycling%20icons/plastic_packaging.svg"
]
},
{
"path": "printer_cartridges.svg",
"license": "CC-BY-4.0",

View file

@ -0,0 +1,408 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
version="1.1"
viewBox="0 0 96 96"
id="svg38"
sodipodi:docname="pmd.svg"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
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="defs38" />
<sodipodi:namedview
id="namedview38"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="12.364583"
inkscape:cx="33.199663"
inkscape:cy="48"
inkscape:window-width="2256"
inkscape:window-height="1435"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg38" />
<g
transform="matrix(-.26716 -.86833 .86833 -.26716 -702.14 310.26)"
id="g16">
<path
d="m57.814 896.06c-5.7454-10.176-13.781-18.344-23.6-23.6"
fill="none"
stroke="#8ac6de"
stroke-linecap="round"
stroke-width="2.3839"
id="path1" />
<path
d="m62.871 891c-5.9561-10.261-13.848-18.547-23.6-23.6"
fill="none"
stroke="#8ac6de"
stroke-linecap="round"
stroke-width="2.3839"
id="path2" />
<path
d="m67.928 885.94c-5.5418-10.105-13.707-18.135-23.6-23.6"
fill="none"
stroke="#8ac6de"
stroke-linecap="round"
stroke-width="2.3839"
id="path3" />
<path
d="m72.985 880.89c-5.5418-10.105-13.707-18.135-23.6-23.6"
fill="none"
stroke="#8ac6de"
stroke-linecap="round"
stroke-width="2.3839"
id="path4" />
<path
d="m74.686 847.44c-7.4687 2.9602-17.238-1.3052-22.757 4.2143l-2.5286 2.5286c-1.6857 1.6857-0.95453 2.556-0.84285 4.2143-1.6583-0.11167-2.5286-0.84285-4.2143 0.84285s-0.95453 2.556-0.84285 4.2143c-1.6583-0.11168-2.5286-0.84285-4.2143 0.84285s-0.74134 2.4511-0.84285 4.2143c-1.6857 0-2.5286-0.84285-4.2143 0.84285-1.0691 0.97442-0.84285 2.5286-0.84285 4.2143-1.6857 0-12.409 9.0138-15.171 11.8-5.5239 5.5721-11.591 11.595-12.643 14.328-1.4913 7.6991 17.223 26.021 25.286 25.286 2.975-1.1891 8.9062-7.1954 14.328-12.643 2.7112-2.7237 11.8-13.486 11.8-15.171 1.6857 0 3.0607 0.31066 4.2143-0.84285 1.6857-1.6857 0.84285-2.5286 0.84285-4.2143 1.6857 0 2.5286 0.84285 4.2143-0.84285s0.95453-2.556 0.84285-4.2143c1.6583 0.11168 2.5286 0.84285 4.2143-0.84285s0.95453-2.556 0.84285-4.2143c1.6583 0.11168 2.5286 0.84285 4.2143-0.84285l2.5286-2.5286c5.3836-5.3836 1.6551-15.432 4.2143-22.757l3.3714-3.3714-8.4285-8.4285z"
fill="#9ad8f2"
fill-opacity=".71717"
stroke="#8ac6de"
stroke-opacity=".66667"
stroke-width="2.3839"
id="path5" />
<path
d="m48.558 858.4c5.7454 10.176 13.781 18.344 23.6 23.6"
fill="none"
stroke="#8ac6de"
stroke-linecap="round"
stroke-opacity=".66667"
stroke-width="2.3839"
id="path6" />
<path
d="m43.501 863.46c5.9561 10.261 13.848 18.547 23.6 23.6"
fill="none"
stroke="#8ac6de"
stroke-linecap="round"
stroke-opacity=".66667"
stroke-width="2.3839"
id="path7" />
<path
d="m38.444 868.51c5.5418 10.105 13.707 18.135 23.6 23.6"
fill="none"
stroke="#8ac6de"
stroke-linecap="round"
stroke-opacity=".66667"
stroke-width="2.3839"
id="path8" />
<path
d="m33.387 873.57c5.5418 10.105 13.707 18.135 23.6 23.6"
fill="none"
stroke="#8ac6de"
stroke-linecap="round"
stroke-opacity=".66667"
stroke-width="2.3839"
id="path9" />
<ellipse
transform="rotate(45)"
cx="658"
cy="542.25"
rx="9.5358"
ry="3.1576"
fill="#70b9d7"
style="paint-order:fill markers stroke"
id="ellipse9" />
<path
d="m7.785 900.16c5.8047-6.5666 9.7972-13.041 24.285-22.599 2.8498 4.7631 7.5822 10.619 12.537 15.803-13.334-11.836-27.547 1.3485-36.822 6.7955z"
fill="#eef7fb"
fill-opacity=".8"
id="path10" />
<path
d="m52.859 854.49c3.5192-5.4649 16.92-1.2746 23.842-4.8059-6.9841 7.1933-20.674 7.5327-20.418 10.257-2.0215-2.7206-3.1456-4.0854-3.4247-5.4508z"
fill="#eef7fb"
fill-opacity=".8"
id="path11" />
<path
d="m47.434 860.31c-0.75358-0.14879-2.9459 0.94658-3.1057 2.0303 0.80223-0.87911 14.944 13.42 16.577 14.958-4.9558-5.6986-10.258-11.424-13.471-16.988z"
fill="#eef7fb"
fill-opacity=".8"
id="path12" />
<path
d="m42.912 865.25c-0.75358-0.14878-2.9086 0.98383-3.0684 2.0676 0.80223-0.87911 14.907 13.383 16.54 14.921-4.9558-5.6986-10.258-11.424-13.471-16.988z"
fill="#eef7fb"
fill-opacity=".8"
id="path13" />
<path
d="m37.75 870.52c-0.75358-0.14879-2.7596 1.0583-2.9194 2.142 0.80223-0.87911 14.758 13.308 16.391 14.846-4.9558-5.6986-10.258-11.424-13.471-16.988z"
fill="#eef7fb"
fill-opacity=".8"
id="path14" />
<path
d="m88.46 842.07a7.1518 1.192 45 0 0-5.7123-4.2768l-0.06256-0.0625-5.0571 5.0571a7.1518 1.192 45 0 0 4.2143 5.9 7.1518 1.192 45 0 0 5.9 4.2143l5.0571-5.0571-0.06091-0.0609a7.1518 1.192 45 0 0-4.2785-5.7139z"
fill="#3e66a2"
style="paint-order:fill markers stroke"
id="path15" />
<ellipse
transform="rotate(45)"
cx="657.94"
cy="534.05"
rx="7.1891"
ry="1.341"
fill="#7d9dcd"
style="paint-order:fill markers stroke"
id="ellipse15" />
<path
d="m31.385 923.76c-5.5418-10.105-13.707-18.135-23.6-23.6 4.6475 10.013 12.959 17.583 23.6 23.6z"
fill="#8ac6de"
fill-opacity=".66667"
stroke="#8ac6de"
stroke-linecap="round"
stroke-linejoin="round"
stroke-opacity=".66667"
stroke-width="2.3849"
id="path16" />
</g>
<g
transform="matrix(1.1123 0 0 1.1123 -80.024 -797.23)"
id="g28">
<path
d="m77.219 763.36 26.408-0.91079-2.4743 8.144 1.0972 27.424-25.782-4.4246c-1.1581-6.5947 8.7192-17.809 8.7192-17.809 0.01276-0.0638-3.9046-7.1545-7.9678-12.424z"
fill="#c988ad"
style="paint-order:normal"
id="path17" />
<path
d="m102.25 798.02 18.191-9.0442c-0.80764-11.237-4.0408-21.11 0.029-35.091l-16.843 8.5669-2.4743 8.144z"
fill="#b06b92"
id="path18" />
<path
d="m101.85 788.06 17.474-7.9c-0.35142-5.6907-1.4488-11.754-0.6013-16.846l-17.565 7.2829"
fill="#c0c0c0"
id="path19" />
<path
d="m80.361 767.64 20.792 2.9536 0.69278 17.463-22.381-4.0918c1.6275-3.604 5.7219-8.1802 5.7219-8.1802z"
fill="#eee"
id="path20" />
<path
d="m83.935 747.62-1.0494-6.1002 23.25-2.5784 1.2264 6.7919z"
fill="#6f9adb"
id="path21" />
<path
d="m107.36 745.74 13.108 8.149-16.843 8.5669-19.692-14.829z"
fill="#944f76"
id="path22" />
<path
d="m103.63 762.45 16.843-8.5669-24.069-3.1814 7.2268 11.748"
fill="#a55883"
id="path23" />
<path
d="m77.219 763.36 6.7164-15.74 23.427-1.8868-3.735 16.716z"
fill="#d19aba"
id="path24" />
<g
transform="rotate(-10.439,120.47,753.88)"
id="g25">
<path
transform="translate(0,738.52)"
d="m94.477 6.7129-7.4102 4.7559 1.8418 2.3164c0.91641 0.91602 1.9091 1.5023 3.2793 1.5039 2.6726-3.4e-5 4.8393-1.9481 4.8398-4.3516-0.0021-0.78748-0.42923-1.341-0.88086-2.0156z"
fill="#3e66a2"
style="paint-order:normal"
id="path25" />
<ellipse
cx="90.887"
cy="747.78"
rx="4.4024"
ry="4.3525"
fill="#6f9adb"
style="paint-order:normal"
id="ellipse25" />
</g>
<path
d="m85.187 775.79 16.188-1.2665-21.014-6.8778z"
fill-opacity=".17172"
id="path26" />
<path
d="m101.15 770.6 19.317-16.711-16.843 8.5669z"
fill-opacity=".18182"
id="path27" />
<path
d="m85.648 777.54-4.4194 5.8336 17.766-6.7175z"
fill="#fff"
fill-opacity=".73232"
id="path28" />
</g>
<g
transform="matrix(.82351 0 0 .82351 21.061 23.612)"
id="g38">
<path
d="m15.95 56.074c7.5182-2.2076 24.999 0.02776 35.579-7.9388 0 0 2.3102-1.5418 10.652-10.917l1.3708-8.2421-4.752-3.1708 2.1503-2.5665c15.101 5.4037 20.445 14.983 27.687 20.463l-1.0835 4.9046c-10.825 5.8046-12.876 3.6394-24.167 11.251l-25.845 23.622z"
fill="#8dcdd1"
id="path29" />
<path
d="m46.357 50.999c0.26529 6.6833 13.8 4.6132 17.029 8.8587l-25.845 23.622-21.591-27.405s2.2076-2.9727 8.8628-3.7314c6.8399-0.85107 15.701 2.3438 21.544-1.3443z"
fill="#71c0c6"
id="path30" />
<path
d="m62.433 60.678-24.892 22.801-5.5855-7.8391c10.943 1.8616 21.53-9.951 30.478-14.962z"
fill="#55a6ac"
id="path31" />
<path
d="m37.79 83.174c-2.9785 2.767-11.212-0.86567-18.389-8.1137-7.1776-7.248-7.7082-15.889-4.7297-18.656 2.9785-2.767 8.3382 1.3881 15.516 8.6361 7.1776 7.248 10.582 15.367 7.6032 18.134z"
fill="#e7e7e7"
id="path32" />
<path
d="m22.633 55c4.9351-2.1761 10.197 1.2634 18.302 0.94601-6.5255 2.3199-5.4533 2.7434-10.072 6.4255-2.3078-3.3285-5.1894-5.5095-8.2305-7.3715z"
fill="#97e1e6"
id="path33" />
<path
d="m62.181 37.218c1.5905 8.4175 8.5034 11.232 14.563 14.946l3.5725-3.0639 7.2373-0.49403 1.0835-4.9046-25.085-14.725z"
fill="#6db7bd"
id="path34" />
<path
d="m56.984 27.167 3.9658-3.9281 23.8 20.097-3.5175 2.8367c-8.7898-5.0846-15.778-13.408-24.248-19.005z"
fill="#bae0e4"
id="path35" />
<path
d="m60.95 23.239c7.6394 2.7937 15.589 6.3747 27.687 20.463l-3.8869-0.36599z"
fill="#509fa5"
id="path36" />
<ellipse
transform="matrix(.83423 -.55141 .57775 .81621 0 0)"
cx="-22.969"
cy="73.621"
rx="4.8244"
ry="10.02"
fill="#a6a6a6"
id="ellipse36" />
<rect
transform="matrix(.83423 -.55141 .57775 .81621 0 0)"
x="-31.436"
y="64.611"
width="8.6014"
height="17.751"
fill="#a6a6a6"
id="rect36" />
<ellipse
transform="matrix(.83423 -.55141 .57775 .81621 0 0)"
cx="-31.491"
cy="73.592"
rx="3.744"
ry="8.9808"
fill="#e7e7e7"
id="ellipse37" />
<ellipse
transform="matrix(.83423 -.55141 .57775 .81621 0 0)"
cx="-31.527"
cy="73.573"
rx="2.6582"
ry="6.0968"
fill="#757575"
id="ellipse38" />
<path
d="m16.679 65.766-1.8666 1.8918c5.1859 1.9907 9.7764 7.5924 10.218 14.287l3.0072-0.55906c-0.34219-6.3881-4.7385-13.669-11.359-15.62z"
color="#000000"
color-rendering="auto"
dominant-baseline="auto"
fill="#d7d7d7"
image-rendering="auto"
shape-rendering="auto"
solid-color="#000000"
stop-color="#000000"
style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"
id="path38" />
</g>
<g
transform="matrix(0.83287549,0,0,0.83287549,42.83339,-760.15515)"
id="g15">
<path
d="m 32.406,1002.6 c -10.051,-3.4923 -19.236,-3.306 -20.516,0.4162 l -0.46436,1.338 c -1.2801,3.7222 5.0456,11.851 15.096,15.344 10.051,3.4923 20.02,1.0254 21.3,-2.6968 l 0.46436,-1.338 c 1.2801,-3.7223 -5.8299,-9.5708 -15.881,-13.063 z"
fill="#8d8c7f"
style="paint-order:fill markers stroke"
id="path1-3" />
<path
d="m 26.758,963.9 -2.8586,8.4361 -1.3932,14.6 -7.3426,10.678 -1.8622,5.4151 c -1.3813,4.3193 6.1294,10.605 14.298,13.451 8.1686,2.8469 17.995,2.9579 19.428,-1.211 l 2.0224,-5.8807 1.3683,-12.341 7.3393,-12.947 2.7091,-7.9096 z"
fill="#c2c2c0"
style="paint-order:fill markers stroke"
id="path2-6" />
<path
d="m 46.888,960.52 c -10.051,-3.4923 -19.236,-3.306 -20.516,0.4162 l -0.46436,1.338 c -1.2801,3.7222 5.2505,11.256 15.301,14.748 10.051,3.4923 19.815,1.6211 21.095,-2.1011 l 0.46436,-1.338 c 1.2801,-3.7222 -5.8299,-9.5707 -15.881,-13.063 z"
fill="#8d8c7f"
style="paint-order:fill markers stroke"
id="path3-7" />
<ellipse
transform="matrix(0.9446,0.32822,-0.3252,0.94564,0,0)"
cx="356.70999"
cy="899.98999"
rx="16.686001"
ry="6.4477"
fill="#5f553c"
style="paint-order:fill markers stroke"
id="ellipse3" />
<g
transform="matrix(0.62753,0.21805,-0.28972,0.84245,321.57,-114)"
id="g5">
<path
d="m 108.06,1267.5 0.96521,3.0021 c 10.298,8.8536 39.616,9.1927 52.122,0 l 0.86868,-3.0021 c -13.552,9.4413 -42.55,8.7559 -53.955,0 z"
fill="#8d8c7f"
id="path4-5" />
<path
d="m 108.06,1267.5 0.96521,-3.0021 c 11.373,8.003 40.267,8.5058 52.122,0 l 0.86868,3.0021 c -12.75,9.2549 -41.701,9.1372 -53.955,0 z"
fill="#e1e1df"
id="path5-3" />
</g>
<g
transform="matrix(0.62753,0.21805,-0.28972,0.84245,319.83,-108.94)"
id="g7">
<path
d="m 108.06,1267.5 0.96521,3.0021 c 10.298,8.8536 39.616,9.1927 52.122,0 l 0.86868,-3.0021 c -13.552,9.4413 -42.55,8.7559 -53.955,0 z"
fill="#8d8c7f"
id="path6-5" />
<path
d="m 108.06,1267.5 0.96521,-3.0021 c 11.373,8.003 40.267,8.5058 52.122,0 l 0.86868,3.0021 c -12.75,9.2549 -41.701,9.1372 -53.955,0 z"
fill="#e1e1df"
id="path7-6" />
</g>
<g
transform="matrix(0.62753,0.21805,-0.28972,0.84245,318.09,-103.88)"
id="g9">
<path
d="m 108.06,1267.5 0.96521,3.0021 c 10.298,8.8536 39.616,9.1927 52.122,0 l 0.86868,-3.0021 c -13.552,9.4413 -42.55,8.7559 -53.955,0 z"
fill="#8d8c7f"
id="path8-2" />
<path
d="m 108.06,1267.5 0.96521,-3.0021 c 11.373,8.003 40.267,8.5058 52.122,0 l 0.86868,3.0021 c -12.75,9.2549 -41.701,9.1372 -53.955,0 z"
fill="#e1e1df"
id="path9-9" />
</g>
<g
transform="matrix(0.62753,0.21805,-0.28972,0.84245,316.35,-98.822)"
id="g11">
<path
d="m 108.06,1267.5 0.96521,3.0021 c 10.298,8.8536 39.616,9.1927 52.122,0 l 0.86868,-3.0021 c -13.552,9.4413 -42.55,8.7559 -53.955,0 z"
fill="#8d8c7f"
id="path10-1" />
<path
d="m 108.06,1267.5 0.96521,-3.0021 c 11.373,8.003 40.267,8.5058 52.122,0 l 0.86868,3.0021 c -12.75,9.2549 -41.701,9.1372 -53.955,0 z"
fill="#e1e1df"
id="path11-2" />
</g>
<g
transform="matrix(0.62753,0.21805,-0.28972,0.84245,333.44,-74.093)"
id="g12">
<path
d="m 71.626,1223.6 0.96521,3.0021 c 10.298,8.8536 39.616,9.1927 52.122,0 l 0.86868,-3.0021 c -13.552,9.4413 -42.55,8.7559 -53.955,0 z"
fill="#8d8c7f"
id="path12-7" />
</g>
<path
d="m 15.202,997.63 1.4755,-2.3187 c 4.8181,9.222 22.804,15.946 32.708,11.365 l -0.32464,2.7185 c -10.682,5.0168 -28.816,-1.3953 -33.858,-11.765 z"
fill="#e1e1df"
id="path13-0" />
<path
d="m 26.174,965.16 c 1.0575,2.3034 3.9059,5.6444 5.2903,6.626 l -12.456,40.18 c -2.2438,-2.2859 -5.2521,-3.2052 -5.99,-8.1831 z"
fill="#ffffff"
fill-opacity="0.38384"
id="path14-9" />
<path
d="m 36.69,975.19 -13.222,39.374 c 8.0057,-13.978 13.836,-29.131 19.648,-36.808 z"
fill="#ffffff"
fill-opacity="0.38384"
id="path15-3" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Modified from Tobias Zwick
SPDX-License-Identifier: CC-BY-SA-4.0

View file

@ -238,6 +238,15 @@
},
"then": "./assets/layers/recycling/plastic.svg"
},
{
"if": {
"and": [
"_waste_amount>1",
"recycling:pmd=yes"
]
},
"then": "./assets/layers/recycling/pmd.svg"
},
{
"if": {
"and": [
@ -465,6 +474,15 @@
},
"then": "./assets/layers/recycling/plastic.svg"
},
{
"if": {
"and": [
"_waste_amount=1",
"recycling:pmd=yes"
]
},
"then": "./assets/layers/recycling/pmd.svg"
},
{
"if": {
"and": [
@ -640,6 +658,7 @@
"recycling:plastic_bottles=",
"recycling:plastic_packaging=",
"recycling:plastic=",
"recycling:pmd=",
"recycling:printer_cartridges=",
"recycling:scrap_metal=",
"recycling:shoes=",
@ -1093,6 +1112,18 @@
"class": "medium"
}
},
{
"if": "recycling:pmd=yes",
"ifnot": "recycling:pmd=",
"then": {
"en": "Plastic packaging, metal packaging and drink cartons (PMD) can be recycled here",
"nl": "Plastic verkpakkingen, metalen verkpakkingen en drankpakken kunnen hier gerecycled worden"
},
"icon": {
"path": "./assets/layers/recycling/pmd.svg",
"class": "medium"
}
},
{
"if": "recycling:printer_cartridges=yes",
"ifnot": "recycling:printer_cartridges=",
@ -1571,6 +1602,13 @@
},
"osmTags": "recycling:plastic=yes"
},
{
"question": {
"en": "Recycling of plastic packaging, metal packaging and drink cartons (PMD)",
"nl": "Recycling van plastic verkpakkingen, metalen verkpakkingen en drankpakken (PMD)"
},
"osmTags": "recycling:pmd=yes"
},
{
"question": {
"en": "Recycling of scrap metal",
@ -1672,4 +1710,4 @@
"enableRelocation": true,
"enableImproveAccuracy": true
}
}
}

View file

@ -206,6 +206,13 @@
"cs": "Odpadkový koš na plasty"
}
},
{
"if": "waste=pmd",
"then": {
"en": "A waste basket for plastic packaging, metal packaging and drink cartons (PMD)",
"nl": "Een vuilnisbak voor plastic verpakkingen, metalen verpakkingen en drankpakken (PMD)"
}
},
{
"if": "waste=paper",
"then": {
@ -237,8 +244,8 @@
},
"condition": {
"or": [
"waste=dog_excrement",
"waste=trash",
"waste~i~.*dog_excrement.*",
"waste~i~.*trash.*",
"waste="
]
},
@ -397,6 +404,20 @@
"cs": "Odpadkový koš na plast"
},
"osmTags": "waste~i~.*plastic.*"
},
{
"question": {
"en": "Waste basket for plastic packaging, metal packaging and drink cartons (PMD)",
"nl": "Vuilnisbak voor plastic verpakkingen, metalen verpakkingen en drankpakken (PMD)"
},
"osmTags": "waste~i~.*pmd.*"
},
{
"question": {
"en": "Waste basket for paper",
"nl": "Vuilnisbak voor papier"
},
"osmTags": "waste~i~.*paper.*"
}
]
},
@ -432,16 +453,5 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuracy": true
},
"cs": {
"0": {
"iconSize": {
"mappings": {
"0": {
"then": "Odpadkový koš"
}
}
}
}
}
}
}

View file

@ -900,6 +900,10 @@ video {
margin-right: 4rem;
}
.mb-4 {
margin-bottom: 1rem;
}
.mt-4 {
margin-top: 1rem;
}
@ -932,10 +936,6 @@ video {
margin-right: 0.25rem;
}
.mb-4 {
margin-bottom: 1rem;
}
.ml-1 {
margin-left: 0.25rem;
}
@ -2339,7 +2339,7 @@ input {
color: var(--foreground-color);
}
input[type=text] {
input[type="text"] {
width: 100%;
}
@ -2362,12 +2362,12 @@ input[type=text] {
.low-interaction {
background: var(--low-interaction-background);
color: var(--low-interaction-foreground)
color: var(--low-interaction-foreground);
}
.interactive {
background: var(--interactive-background);
color: var(--interactive-foreground)
color: var(--interactive-foreground);
}
.border-interactive {
@ -2386,7 +2386,8 @@ input[type=text] {
* This very important section defines what the various input elements look like within the 'low-interaction' and 'interactive'-blocks
*/
button.small, .button.small {
button.small,
.button.small {
line-height: 1rem;
margin: 0;
margin-left: 0.5rem;
@ -2407,7 +2408,30 @@ button.small, .button.small {
color: var(--low-interaction-foreground);
}
button, .button {
.button.theme-button {
margin: 0;
margin-top: 0.25rem;
margin-bottom: 0.25rem;
/* Margin should be removed on larger screens */
@media (min-width: 768px) {
margin: 0;
margin-top: 0;
margin-bottom: 0;
}
/* Experimental support for foldable devices */
@media (horizontal-viewport-segments: 2) {
margin: 0;
margin-top: 0;
margin-bottom: 0;
}
}
button,
.button {
align-items: center;
display: inline-flex;
line-height: 1.25rem;
@ -2430,60 +2454,72 @@ button, .button {
box-shadow: 0 5px 10px #88888888;
}
button.selected, .button.selected {
button.selected,
.button.selected {
background-color: var(--catch-detail-color);
border-color: var(--catch-detail-color);
color: var(--catch-detail-foregroundcolor);
}
button.selected svg path, .button.selected svg path {
button.selected svg path,
.button.selected svg path {
fill: var(--catch-detail-foregroundcolor) !important;
}
button:not(.no-image-background):not(.soft) svg path, .button:not(.no-image-background):not(.soft) svg path {
button:not(.no-image-background):not(.soft) svg path,
.button:not(.no-image-background):not(.soft) svg path {
fill: var(--interactive-foreground) !important;
transition: all 250ms;
}
.interactive button, .interactive .button {
.interactive button,
.interactive .button {
background: var(--interactive-background);
color: var(--interactive-foreground);
}
button:hover, .button:hover {
button:hover,
.button:hover {
background-color: var(--catch-detail-color);
color: var(--catch-detail-foregroundcolor);
border: 2px solid var(--catch-detail-color-contrast);
}
button:hover:not(.no-image-background) img, .button:hover:not(.no-image-background) img {
button:hover:not(.no-image-background) img,
.button:hover:not(.no-image-background) img {
background: var(--low-interaction-background);
border-radius: 100rem;
}
button:hover:not(.no-image-background) svg path, .button:hover:not(.no-image-background) svg path {
button:hover:not(.no-image-background) svg path,
.button:hover:not(.no-image-background) svg path {
fill: var(--catch-detail-foregroundcolor) !important;
}
button.disabled:hover:not(.no-image-background) svg path, .button.disabled:hover:not(.no-image-background) svg path {
button.disabled:hover:not(.no-image-background) svg path,
.button.disabled:hover:not(.no-image-background) svg path {
fill: var(--low-interaction-foreground) !important;
}
button.primary, .button.primary {
button.primary,
.button.primary {
color: var(--button-foreground);
background: var(--button-background);
}
button.primary:not(.no-image-background) svg path, .button.primary:not(.no-image-background) svg path {
button.primary:not(.no-image-background) svg path,
.button.primary:not(.no-image-background) svg path {
fill: var(--button-foreground) !important;
transition: all 250ms;
}
button.disabled.low-interaction, .button.disabled.low-interaction {
button.disabled.low-interaction,
.button.disabled.low-interaction {
background-color: var(--low-interaction-background-50);
}
button.disabled, .button.disabled {
button.disabled,
.button.disabled {
cursor: default;
border: 2px dashed var(--button-background);
background: unset;
@ -2491,7 +2527,8 @@ button.disabled, .button.disabled {
box-shadow: none;
}
button.disabled:hover, .button.disabled:hover {
button.disabled:hover,
.button.disabled:hover {
cursor: default;
border: 2px dashed var(--button-background);
background: unset;
@ -2505,18 +2542,21 @@ button.link {
}
button.link:hover {
color:unset;
color: unset;
}
.interactive button.disabled svg path, .interactive .button.disabled svg path {
.interactive button.disabled svg path,
.interactive .button.disabled svg path {
fill: var(--interactive-foreground) !important;
}
.low-interaction button.disabled svg path, .low-interaction .button.disabled svg path {
.low-interaction button.disabled svg path,
.low-interaction .button.disabled svg path {
fill: var(--low-interaction-foreground) !important;
}
.normal-background button.disabled svg path, .normal-background .button.disabled svg path {
.normal-background button.disabled svg path,
.normal-background .button.disabled svg path {
fill: var(--foreground-color) !important;
}
@ -2529,12 +2569,14 @@ button.link:hover {
width: 100%;
}
button.soft, .button.soft {
button.soft,
.button.soft {
border: 2px solid var(--interactive-background);
margin: 0;
}
button.soft:hover, .button.soft:hover {
button.soft:hover,
.button.soft:hover {
background-color: var(--interactive-background);
color: var(--interactive-foreground);
border: 2px solid var(--catch-detail-color-contrast);
@ -2572,7 +2614,7 @@ select:hover {
border-color: var(--catch-detail-color-contrast);
}
.neutral-label{
.neutral-label {
/** This label styles as normal text. It's power comes from the many :not(.neutral-label) entries.
* Placed here for autocompletion
*/
@ -2600,7 +2642,7 @@ label.button {
label:hover:not(.neutral-label) {
background-color: var(--catch-detail-color);
color: var(--catch-detail-foregroundcolor);
border: 2px solid var(--interactive-contrast)
border: 2px solid var(--interactive-contrast);
}
label:not(.no-image-background):not(.neutral-label) img {
@ -2708,7 +2750,8 @@ textarea {
color: #7193bb;
}
.literal-code, code {
.literal-code,
code {
/* A codeblock */
display: inline-block;
background-color: lightgray;
@ -2831,18 +2874,18 @@ a.link-underline {
}
svg.apply-fill path {
fill: var(--svg-color)
fill: var(--svg-color);
}
.compass_arrow {
width: calc( 2.5rem - 1px ) ;
height: calc( 2.5rem - 1px )
width: calc(2.5rem - 1px);
height: calc(2.5rem - 1px);
}
@media (min-width: 640px) {
.compass_arrow {
width: calc( 2.75rem - 1px ) ;
height: calc( 2.75rem - 1px )
width: calc(2.75rem - 1px);
height: calc(2.75rem - 1px);
}
}
@ -2923,6 +2966,16 @@ svg.apply-fill path {
max-width: 100%;
}
/************************* Experimental support for foldable devices ********************************/
@media (horizontal-viewport-segments: 2) {
.theme-list {
display: grid;
grid-auto-flow: row;
grid-template-columns: repeat(2, minmax(0, 1fr));
}
}
.hover\:bg-indigo-200:hover {
--tw-bg-opacity: 1;
background-color: rgb(199 210 254 / var(--tw-bg-opacity));

View file

@ -136,7 +136,7 @@
<UnofficialThemeList search={themeSearchText} {state} />
<div slot="not-logged-in">
<button class="w-full" on:click={() => osmConnection.AttemptLogin()}>
<button class="m-0 my-2 w-full" on:click={() => osmConnection.AttemptLogin()}>
<Login class="mr-2 h-6 w-6 " />
<Tr t={Translations.t.index.logIn} />
</button>

View file

@ -16,6 +16,7 @@
role="dialog"
style="max-width: 100vw; max-height: 100vh"
tabindex="-1"
id="modal-right"
use:trapFocus
>
<slot name="close-button">
@ -30,3 +31,12 @@
<slot />
</div>
</div>
<!-- Experimental support for foldable devices -->
<style lang="scss">
@media (horizontal-viewport-segments: 2) {
#modal-right {
width: 50%;
}
}
</style>

View file

@ -85,7 +85,7 @@
</script>
{#if theme.id !== personal.id || $unlockedPersonal}
<a class={"button w-full text-ellipsis"} href={$href}>
<a class={"button theme-button w-full text-ellipsis"} href={$href}>
<img src={theme.icon} class="m-1 mr-2 block h-11 w-11 sm:m-2 sm:mr-4" alt="" />
<span class="flex flex-col overflow-hidden text-ellipsis">
<Tr t={title} />

View file

@ -24,7 +24,7 @@
<section class="w-full">
<slot name="title" />
<div class="gap-4 md:grid md:grid-flow-row md:grid-cols-2 lg:grid-cols-3">
<div class="theme-list my-2 gap-4 md:grid md:grid-flow-row md:grid-cols-2 lg:grid-cols-3">
{#each filteredThemes as theme (theme.id)}
{#if theme !== undefined && !(hideThemes && theme?.hideFromOverview)}
<!-- TODO: doesn't work if first theme is hidden -->

File diff suppressed because it is too large Load diff