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

Fix build

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-11-07 16:43:29 +01:00
parent bd21212eba
commit bb283b59a4
5 changed files with 200 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

18
assets/layers/barrier/barrier.json
View file

@ -193,9 +193,9 @@
{
"if": "cycle_barrier:type=double",
"then": {
"en": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>",
"nl": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>",
"de": "Doppelt, zwei Barrieren hintereinander <img src='./assets/themes/cycle_infra/Cycle_barrier_double.png' style='width:8em'>"
"en": "Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>",
"nl": "Dubbel, twee hekjes achter elkaar <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>",
"de": "Doppelt, zwei Barrieren hintereinander <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>"
}
},
{
@ -246,9 +246,9 @@
},
{
"render": {
"en": "Space between barriers (along the length of the road): {width:separation} m",
"nl": "Ruimte tussen barrières (langs de lengte van de weg): {width:separation} m",
"de": "Abstand zwischen den Barrieren (entlang der Straße): {width:separation} m"
"en": "Space between barriers (along the length of the road): {spacing} m",
"nl": "Ruimte tussen barrières (langs de lengte van de weg): {spacing} m",
"de": "Abstand zwischen den Barrieren (entlang der Straße): {spacing} m"
},
"question": {
"en": "How much space is there between the barriers (along the length of the road)?",
@ -273,9 +273,9 @@
},
{
"render": {
"en": "Width of opening: {width:opening} m",
"nl": "Breedte van de opening: {width:opening} m",
"de": "Breite der Öffnung: {width:opening} m"
"en": "Width of opening: {opening} m",
"nl": "Breedte van de opening: {opening} m",
"de": "Breite der Öffnung: {opening} m"
},
"question": {
"en": "How wide is the smallest opening next to the barriers?",

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

@ -1682,7 +1682,7 @@
"planned:amenity=",
"construction:amenity=",
"disused:amenity=",
"operational_status=",
"operational_status=broken",
"amenity=charging_station"
]
},
@ -1695,11 +1695,11 @@
{
"if": {
"and": [
"planned:amenity=",
"planned:amenity=charging_station",
"construction:amenity=",
"disused:amenity=",
"operational_status=broken",
"amenity=charging_station"
"operational_status=",
"amenity="
]
},
"then": {
@ -1711,8 +1711,8 @@
{
"if": {
"and": [
"planned:amenity=charging_station",
"construction:amenity=",
"planned:amenity=",
"construction:amenity=charging_station",
"disused:amenity=",
"operational_status=",
"amenity="
@ -1728,8 +1728,8 @@
"if": {
"and": [
"planned:amenity=",
"construction:amenity=charging_station",
"disused:amenity=",
"construction:amenity=",
"disused:amenity=charging_station",
"operational_status=",
"amenity="
]
@ -1745,9 +1745,9 @@
"and": [
"planned:amenity=",
"construction:amenity=",
"disused:amenity=charging_station",
"disused:amenity=",
"operational_status=",
"amenity="
"amenity=charging_station"
]
},
"then": {
@ -1794,6 +1794,69 @@
}
}
],
"mapRendering": [
{
"location": [
"point",
"centroid"
],
"icon": {
"render": "pin:#fff;./assets/themes/charging_stations/plug.svg",
"mappings": [
{
"if": "bicycle=yes",
"then": "pin:#fff;./assets/themes/charging_stations/bicycle.svg"
},
{
"if": {
"or": [
"car=yes",
"motorcar=yes"
]
},
"then": "pin:#fff;./assets/themes/charging_stations/car.svg"
}
]
},
"iconBadges": [
{
"if": {
"or": [
"disused:amenity=charging_station",
"operational_status=broken"
]
},
"then": "cross:#c22;"
},
{
"if": {
"or": [
"proposed:amenity=charging_station",
"planned:amenity=charging_station"
]
},
"then": "./assets/layers/charging_station/under_construction.svg"
},
{
"if": {
"and": [
"bicycle=yes",
{
"or": [
"motorcar=yes",
"car=yes"
]
}
]
},
"then": "circle:#fff;./assets/themes/charging_stations/car.svg"
}
],
"iconSize": {
"render": "50,50,bottom"
}
}
],
"presets": [
{
"tags": [
@ -2244,68 +2307,5 @@
]
},
"neededChangesets": 10
},
"mapRendering": [
{
"location": [
"point",
"centroid"
],
"icon": {
"render": "pin:#fff;./assets/themes/charging_stations/plug.svg",
"mappings": [
{
"if": "bicycle=yes",
"then": "pin:#fff;./assets/themes/charging_stations/bicycle.svg"
},
{
"if": {
"or": [
"car=yes",
"motorcar=yes"
]
},
"then": "pin:#fff;./assets/themes/charging_stations/car.svg"
}
]
},
"iconBadges": [
{
"if": {
"or": [
"disused:amenity=charging_station",
"operational_status=broken"
]
},
"then": "cross:#c22;"
},
{
"if": {
"or": [
"proposed:amenity=charging_station",
"planned:amenity=charging_station"
]
},
"then": "./assets/layers/charging_station/under_construction.svg"
},
{
"if": {
"and": [
"bicycle=yes",
{
"or": [
"motorcar=yes",
"car=yes"
]
}
]
},
"then": "circle:#fff;./assets/themes/charging_stations/car.svg"
}
],
"iconSize": {
"render": "50,50,bottom"
}
}
]
}
}