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

Add extra icons, change size, add tactile paving

Browse source
This commit is contained in:
Robin van der Linde 2022-05-08 14:31:00 +02:00
parent a5155260be
commit 6eaf4a33e9
No known key found for this signature in database
GPG key ID: 4B0074A1A79F6BED
35 changed files with 383 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/layers/artwork/artwork.json
View file

@ -558,4 +558,4 @@
}
}
]
}
}

124
assets/layers/charging_station/charging_station.json
View file

@ -3,8 +3,8 @@
"name": {
"en": "Charging stations",
"nl": "Oplaadpunten",
"de": "Ladestationen",
"ca": "Estacions de càrrega"
"ca": "Estacions de càrrega",
"de": "Ladestationen"
},
"minzoom": 10,
"source": {
@ -67,8 +67,8 @@
"description": {
"en": "A charging station",
"nl": "Oplaadpunten",
"de": "Eine Ladestation",
"da": "En ladestation"
"da": "En ladestation",
"de": "Eine Ladestation"
},
"tagRenderings": [
"images",
@ -1504,7 +1504,7 @@
},
"mappings": [
{
"if": "socket:schuko:output=3.6 kw",
"if": "socket:schuko:output=3.6 kW",
"then": {
"en": "<b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 3.6 kw A",
"nl": "<b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F) levert een vermogen van maximaal 3.6 kw A"
@ -1609,7 +1609,7 @@
},
"mappings": [
{
"if": "socket:typee:output=3 kw",
"if": "socket:typee:output=3 kW",
"then": {
"en": "<b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 3 kw A",
"nl": "<b>Europese stekker</b> met aardingspin (CEE7/4 type E) levert een vermogen van maximaal 3 kw A"
@ -1620,7 +1620,7 @@
}
},
{
"if": "socket:typee:output=22 kw",
"if": "socket:typee:output=22 kW",
"then": {
"en": "<b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 22 kw A",
"nl": "<b>Europese stekker</b> met aardingspin (CEE7/4 type E) levert een vermogen van maximaal 22 kw A"
@ -1725,7 +1725,7 @@
},
"mappings": [
{
"if": "socket:chademo:output=50 kw",
"if": "socket:chademo:output=50 kW",
"then": {
"en": "<b>Chademo</b> outputs at most 50 kw A",
"nl": "<b>Chademo</b> levert een vermogen van maximaal 50 kw A"
@ -1841,7 +1841,7 @@
},
"mappings": [
{
"if": "socket:type1_cable:output=3.7 kw",
"if": "socket:type1_cable:output=3.7 kW",
"then": {
"en": "<b>Type 1 with cable</b> (J1772) outputs at most 3.7 kw A",
"nl": "<b>Type 1 met kabel</b> (J1772) levert een vermogen van maximaal 3.7 kw A"
@ -1852,7 +1852,7 @@
}
},
{
"if": "socket:type1_cable:output=7 kw",
"if": "socket:type1_cable:output=7 kW",
"then": {
"en": "<b>Type 1 with cable</b> (J1772) outputs at most 7 kw A",
"nl": "<b>Type 1 met kabel</b> (J1772) levert een vermogen van maximaal 7 kw A"
@ -1968,7 +1968,7 @@
},
"mappings": [
{
"if": "socket:type1:output=3.7 kw",
"if": "socket:type1:output=3.7 kW",
"then": {
"en": "<b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 3.7 kw A",
"nl": "<b>Type 1 <i>zonder</i> kabel</b> (J1772) levert een vermogen van maximaal 3.7 kw A"
@ -1979,7 +1979,7 @@
}
},
{
"if": "socket:type1:output=6.6 kw",
"if": "socket:type1:output=6.6 kW",
"then": {
"en": "<b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 6.6 kw A",
"nl": "<b>Type 1 <i>zonder</i> kabel</b> (J1772) levert een vermogen van maximaal 6.6 kw A"
@ -1990,7 +1990,7 @@
}
},
{
"if": "socket:type1:output=7 kw",
"if": "socket:type1:output=7 kW",
"then": {
"en": "<b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 7 kw A",
"nl": "<b>Type 1 <i>zonder</i> kabel</b> (J1772) levert een vermogen van maximaal 7 kw A"
@ -2001,7 +2001,7 @@
}
},
{
"if": "socket:type1:output=7.2 kw",
"if": "socket:type1:output=7.2 kW",
"then": {
"en": "<b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 7.2 kw A",
"nl": "<b>Type 1 <i>zonder</i> kabel</b> (J1772) levert een vermogen van maximaal 7.2 kw A"
@ -2128,7 +2128,7 @@
},
"mappings": [
{
"if": "socket:type1_combo:output=50 kw",
"if": "socket:type1_combo:output=50 kW",
"then": {
"en": "<b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 50 kw A",
"nl": "<b>Type 1 CCS</b> (ook gekend als Type 1 Combo) levert een vermogen van maximaal 50 kw A"
@ -2139,7 +2139,7 @@
}
},
{
"if": "socket:type1_combo:output=62.5 kw",
"if": "socket:type1_combo:output=62.5 kW",
"then": {
"en": "<b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 62.5 kw A",
"nl": "<b>Type 1 CCS</b> (ook gekend als Type 1 Combo) levert een vermogen van maximaal 62.5 kw A"
@ -2150,7 +2150,7 @@
}
},
{
"if": "socket:type1_combo:output=150 kw",
"if": "socket:type1_combo:output=150 kW",
"then": {
"en": "<b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 150 kw A",
"nl": "<b>Type 1 CCS</b> (ook gekend als Type 1 Combo) levert een vermogen van maximaal 150 kw A"
@ -2161,7 +2161,7 @@
}
},
{
"if": "socket:type1_combo:output=350 kw",
"if": "socket:type1_combo:output=350 kW",
"then": {
"en": "<b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 350 kw A",
"nl": "<b>Type 1 CCS</b> (ook gekend als Type 1 Combo) levert een vermogen van maximaal 350 kw A"
@ -2277,7 +2277,7 @@
},
"mappings": [
{
"if": "socket:tesla_supercharger:output=120 kw",
"if": "socket:tesla_supercharger:output=120 kW",
"then": {
"en": "<b>Tesla Supercharger</b> outputs at most 120 kw A",
"nl": "<b>Tesla Supercharger</b> levert een vermogen van maximaal 120 kw A"
@ -2288,7 +2288,7 @@
}
},
{
"if": "socket:tesla_supercharger:output=150 kw",
"if": "socket:tesla_supercharger:output=150 kW",
"then": {
"en": "<b>Tesla Supercharger</b> outputs at most 150 kw A",
"nl": "<b>Tesla Supercharger</b> levert een vermogen van maximaal 150 kw A"
@ -2299,7 +2299,7 @@
}
},
{
"if": "socket:tesla_supercharger:output=250 kw",
"if": "socket:tesla_supercharger:output=250 kW",
"then": {
"en": "<b>Tesla Supercharger</b> outputs at most 250 kw A",
"nl": "<b>Tesla Supercharger</b> levert een vermogen van maximaal 250 kw A"
@ -2426,7 +2426,7 @@
},
"mappings": [
{
"if": "socket:type2:output=11 kw",
"if": "socket:type2:output=11 kW",
"then": {
"en": "<b>Type 2</b> (mennekes) outputs at most 11 kw A",
"nl": "<b>Type 2</b> (mennekes) levert een vermogen van maximaal 11 kw A"
@ -2437,7 +2437,7 @@
}
},
{
"if": "socket:type2:output=22 kw",
"if": "socket:type2:output=22 kW",
"then": {
"en": "<b>Type 2</b> (mennekes) outputs at most 22 kw A",
"nl": "<b>Type 2</b> (mennekes) levert een vermogen van maximaal 22 kw A"
@ -2564,7 +2564,7 @@
},
"mappings": [
{
"if": "socket:type2_combo:output=50 kw",
"if": "socket:type2_combo:output=50 kW",
"then": {
"en": "<b>Type 2 CCS</b> (mennekes) outputs at most 50 kw A",
"nl": "<b>Type 2 CCS</b> (mennekes) levert een vermogen van maximaal 50 kw A"
@ -2691,7 +2691,7 @@
},
"mappings": [
{
"if": "socket:type2_cable:output=11 kw",
"if": "socket:type2_cable:output=11 kW",
"then": {
"en": "<b>Type 2 with cable</b> (mennekes) outputs at most 11 kw A",
"nl": "<b>Type 2 met kabel</b> (J1772) levert een vermogen van maximaal 11 kw A"
@ -2702,7 +2702,7 @@
}
},
{
"if": "socket:type2_cable:output=22 kw",
"if": "socket:type2_cable:output=22 kW",
"then": {
"en": "<b>Type 2 with cable</b> (mennekes) outputs at most 22 kw A",
"nl": "<b>Type 2 met kabel</b> (J1772) levert een vermogen van maximaal 22 kw A"
@ -2829,7 +2829,7 @@
},
"mappings": [
{
"if": "socket:tesla_supercharger_ccs:output=50 kw",
"if": "socket:tesla_supercharger_ccs:output=50 kW",
"then": {
"en": "<b>Tesla Supercharger CCS</b> (a branded type2_css) outputs at most 50 kw A",
"nl": "<b>Tesla Supercharger CCS</b> (een type2 CCS met Tesla-logo) levert een vermogen van maximaal 50 kw A"
@ -2945,7 +2945,7 @@
},
"mappings": [
{
"if": "socket:tesla_destination:output=120 kw",
"if": "socket:tesla_destination:output=120 kW",
"then": {
"en": "<b>Tesla Supercharger (destination)</b> outputs at most 120 kw A",
"nl": "<b>Tesla Supercharger (destination)</b> levert een vermogen van maximaal 120 kw A"
@ -2956,7 +2956,7 @@
}
},
{
"if": "socket:tesla_destination:output=150 kw",
"if": "socket:tesla_destination:output=150 kW",
"then": {
"en": "<b>Tesla Supercharger (destination)</b> outputs at most 150 kw A",
"nl": "<b>Tesla Supercharger (destination)</b> levert een vermogen van maximaal 150 kw A"
@ -2967,7 +2967,7 @@
}
},
{
"if": "socket:tesla_destination:output=250 kw",
"if": "socket:tesla_destination:output=250 kW",
"then": {
"en": "<b>Tesla Supercharger (destination)</b> outputs at most 250 kw A",
"nl": "<b>Tesla Supercharger (destination)</b> levert een vermogen van maximaal 250 kw A"
@ -3095,7 +3095,7 @@
},
"mappings": [
{
"if": "socket:tesla_destination:output=11 kw",
"if": "socket:tesla_destination:output=11 kW",
"then": {
"en": "<b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla) outputs at most 11 kw A",
"nl": "<b>Tesla supercharger (destination</b> (Een Type 2 met kabel en Tesla-logo) levert een vermogen van maximaal 11 kw A"
@ -3106,7 +3106,7 @@
}
},
{
"if": "socket:tesla_destination:output=22 kw",
"if": "socket:tesla_destination:output=22 kW",
"then": {
"en": "<b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla) outputs at most 22 kw A",
"nl": "<b>Tesla supercharger (destination</b> (Een Type 2 met kabel en Tesla-logo) levert een vermogen van maximaal 22 kw A"
@ -3225,7 +3225,7 @@
},
"mappings": [
{
"if": "socket:USB-A:output=5w",
"if": "socket:USB-A:output=5W",
"then": {
"en": "<b>USB</b> to charge phones and small electronics outputs at most 5w A",
"nl": "<b>USB</b> om GSMs en kleine electronica op te laden levert een vermogen van maximaal 5w A"
@ -3236,7 +3236,7 @@
}
},
{
"if": "socket:USB-A:output=10w",
"if": "socket:USB-A:output=10W",
"then": {
"en": "<b>USB</b> to charge phones and small electronics outputs at most 10w A",
"nl": "<b>USB</b> om GSMs en kleine electronica op te laden levert een vermogen van maximaal 10w A"
@ -4104,18 +4104,18 @@
"question": {
"en": "All vehicle types",
"nl": "Alle voertuigen",
"da": "Alle køretøjstyper",
"de": "Ladestationen für alle Fahrzeugtypen",
"fr": "Tout type de véhicule",
"da": "Alle køretøjstyper"
"fr": "Tout type de véhicule"
}
},
{
"question": {
"en": "Charging station for bicycles",
"nl": "Oplaadpunten voor fietsen",
"da": "Ladestation til cykler",
"de": "Ladestationen für Fahrräder",
"fr": "Station de charge pour vélos",
"da": "Ladestation til cykler"
"fr": "Station de charge pour vélos"
},
"osmTags": "bicycle=yes"
},
@ -4123,9 +4123,9 @@
"question": {
"en": "Charging station for cars",
"nl": "Oplaadpunten voor auto's",
"da": "Ladestation til biler",
"de": "Ladestationen für Autos",
"fr": "Station de charge pour automobiles",
"da": "Ladestation til biler"
"fr": "Station de charge pour automobiles"
},
"osmTags": {
"or": [
@ -4143,8 +4143,8 @@
"question": {
"en": "Only working charging stations",
"nl": "Enkel werkende oplaadpunten",
"de": "Nur Ladestationen in Betrieb",
"da": "Kun fungerende ladestationer"
"da": "Kun fungerende ladestationer",
"de": "Nur Ladestationen in Betrieb"
},
"osmTags": {
"and": [
@ -4162,8 +4162,8 @@
"question": {
"en": "All connectors",
"nl": "Alle types",
"de": "Alle Anschlüsse",
"ca": "Tots els connectors"
"ca": "Tots els connectors",
"de": "Alle Anschlüsse"
}
},
{
@ -4306,14 +4306,14 @@
"human": {
"en": " minutes",
"nl": " minuten",
"ru": " минут",
"ca": " minuts"
"ca": " minuts",
"ru": " минут"
},
"humanSingular": {
"en": " minute",
"nl": " minuut",
"ru": " минута",
"ca": " minut"
"ca": " minut",
"ru": " минута"
}
},
{
@ -4330,14 +4330,14 @@
"human": {
"en": " hours",
"nl": " uren",
"ru": " часов",
"ca": " hores"
"ca": " hores",
"ru": " часов"
},
"humanSingular": {
"en": " hour",
"nl": " uur",
"ru": " час",
"ca": " hora"
"ca": " hora",
"ru": " час"
}
},
{
@ -4351,14 +4351,14 @@
"human": {
"en": " days",
"nl": " day",
"ru": " дней",
"ca": " dies"
"ca": " dies",
"ru": " дней"
},
"humanSingular": {
"en": " day",
"nl": " dag",
"ru": " день",
"ca": " dia"
"ca": " dia",
"ru": " день"
}
}
]
@ -4395,8 +4395,8 @@
"human": {
"en": "Volts",
"nl": "volt",
"ru": "Вольт",
"ca": "Volts"
"ca": "Volts",
"ru": "Вольт"
}
}
],
@ -4467,8 +4467,8 @@
"human": {
"en": "kilowatt",
"nl": "kilowatt",
"ru": "киловатт",
"ca": "quilovats"
"ca": "quilovats",
"ru": "киловатт"
}
},
{
@ -4479,8 +4479,8 @@
"human": {
"en": "megawatt",
"nl": "megawatt",
"ru": "мегаватт",
"ca": "megavats"
"ca": "megavats",
"ru": "мегаватт"
}
}
],

7
assets/layers/kerbs/flush.svg Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
<g transform="translate(15.081 -7.1438)">
<rect transform="matrix(.70705 .70716 -.70705 .70716 0 0)" x="-3.2362" y="13.603" width="4.2255" height="4.2255" fill="#349340" stop-color="#000000" stroke="#bfe8c4" stroke-linecap="round" stroke-width=".26458"/>
<path d="m-13.229 11.112h0.79375l1.0583-0.52917 0.79375 1e-6" fill="none" stop-color="#000000" stroke="#7fd28a" stroke-width=".52917" style="-inkscape-stroke:none;font-variation-settings:normal"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 611 B

69
assets/layers/kerbs/kerbs.json
View file

@ -23,22 +23,27 @@
"location": [
"point"
],
"icon": "./assets/layers/kerbs/KerbIcon.svg",
"iconSize": "25,23,center",
"iconBadges": [
{
"if": "kerb=raised",
"then": "square:#f44e42"
},
{
"if": "kerb=lowered",
"then": "triangle:#11ff00"
},
{
"if": "kerb=flush",
"then": "circle:#11ff00"
}
]
"icon": {
"render": "./assets/layers/kerbs/KerbIcon.svg",
"mappings": [
{
"if": "kerb=raised",
"then": "./assets/layers/kerbs/raised.svg"
},
{
"if": "kerb=lowered",
"then": "./assets/layers/kerbs/lowered.svg"
},
{
"if": "kerb=flush",
"then": "./assets/layers/kerbs/flush.svg"
},
{
"if": "kerb=no",
"then": "./assets/layers/kerbs/no.svg"
}
]
}
},
{
"color": "#f44e42",
@ -91,6 +96,33 @@
"hideInAnswer": true
}
]
},
{
"id": "tactile-paving",
"question": {
"en": "Is there tactile paving at this kerb?"
},
"mappings": [
{
"if": "tactile_paving=yes",
"then": {
"en": "This kerb has tactile paving."
}
},
{
"if": "tactile_paving=no",
"then": {
"en": "This kerb does not have tactile paving."
}
},
{
"if": "tactile_paving=incorrect",
"then": {
"en": "This kerb has tactile paving, but it is incorrect"
},
"hideInAnswer": true
}
]
}
],
"presets": [
@ -109,7 +141,10 @@
"preciseInput": {
"maxSnapDistance": 10,
"preferredBackground": "photo",
"snapToLayer": ["cycleways_and_roads", "kerbs"]
"snapToLayer": [
"cycleways_and_roads",
"kerbs"
]
}
}
]

40
assets/layers/kerbs/license_info.json
View file

@ -8,5 +8,45 @@
"sources": [
"https://commons.wikimedia.org/wiki/File:KerbIcon.svg"
]
},
{
"path": "flush.svg",
"license": "CC0",
"authors": [
"Jeroen Hoek"
],
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dflush.svg"
]
},
{
"path": "lowered.svg",
"license": "CC0",
"authors": [
"Jeroen Hoek"
],
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dlowered.svg"
]
},
{
"path": "no.svg",
"license": "CC0",
"authors": [
"Jeroen Hoek"
],
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dno.svg"
]
},
{
"path": "raised.svg",
"license": "CC0",
"authors": [
"Jeroen Hoek"
],
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Draised.svg"
]
}
]

5
assets/layers/kerbs/lowered.svg Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
<rect transform="matrix(.70705 .70716 -.70705 .70716 0 0)" x="2.3773" y="-2.1127" width="4.2255" height="4.2255" fill="#34938a" stop-color="#000000" stroke="#bfe8e5" stroke-linecap="round" stroke-width=".26458"/>
<path d="m1.8521 3.9692h0.79375l1.0583-1.0587h0.79375" fill="none" stop-color="#000000" stroke="#7fd2ca" stroke-width=".52917" style="-inkscape-stroke:none;font-variation-settings:normal"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 553 B

7
assets/layers/kerbs/no.svg Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
<g>
<rect transform="matrix(.70705 .70716 -.70705 .70716 0 0)" x="2.3774" y="-2.1131" width="4.2255" height="4.2255" fill="#363636" stop-color="#000000" stroke="#adadad" stroke-linecap="round" stroke-width=".26458"/>
<path d="m2.1167 3.9688h2.1167" fill="none" stroke="#5c5c5c" stroke-width=".52917"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 461 B

7
assets/layers/kerbs/raised.svg Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
<g>
<rect transform="matrix(.70705 .70716 -.70705 .70716 0 0)" x="2.3774" y="-2.1128" width="4.2255" height="4.2255" fill="#933434" stop-color="#000000" stroke="#e8bfbf" stroke-linecap="round" stroke-width=".26458"/>
<path d="m1.8521 3.9688 1.3229-4e-7v-1.3229l1.3229 5e-7" fill="none" stop-color="#000000" stroke="#d27f7f" stroke-width=".52917" style="-inkscape-stroke:none;font-variation-settings:normal"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 568 B

4
assets/layers/note/note.json
View file

@ -293,7 +293,7 @@
{
"id": "no_imports",
"options": [
{
{
"question": {
"en": "All Notes",
"nl": "Alle Notes"
@ -317,4 +317,4 @@
]
}
]
}
}

2
assets/layers/surveillance_camera/surveillance_camera.json
View file

@ -570,4 +570,4 @@
"nl": "Deze laag toont bewakingscamera's en laat toe om de informatie te verrijken en om nieuwe camera\"s toe te voegen",
"de": "Diese Ebene zeigt die Überwachungskameras an und ermöglicht es, Informationen zu aktualisieren und neue Kameras hinzuzufügen"
}
}
}

2
assets/layers/tree_node/tree_node.json
View file

@ -743,4 +743,4 @@
"es": "Una capa que muestra árboles",
"de": "Eine Ebene, die Bäume zeigt"
}
}
}