diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index b492e7cc20..22d87c33ed 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -1681,7 +1681,7 @@
"planned:amenity=",
"construction:amenity=",
"disused:amenity=",
- "operational_status=",
+ "operational_status=broken",
"amenity=charging_station"
]
},
@@ -1694,11 +1694,11 @@
{
"if": {
"and": [
- "planned:amenity=",
+ "planned:amenity=charging_station",
"construction:amenity=",
"disused:amenity=",
- "operational_status=broken",
- "amenity=charging_station"
+ "operational_status=",
+ "amenity="
]
},
"then": {
@@ -1710,8 +1710,8 @@
{
"if": {
"and": [
- "planned:amenity=charging_station",
- "construction:amenity=",
+ "planned:amenity=",
+ "construction:amenity=charging_station",
"disused:amenity=",
"operational_status=",
"amenity="
@@ -1727,8 +1727,8 @@
"if": {
"and": [
"planned:amenity=",
- "construction:amenity=charging_station",
- "disused:amenity=",
+ "construction:amenity=",
+ "disused:amenity=charging_station",
"operational_status=",
"amenity="
]
@@ -1744,9 +1744,9 @@
"and": [
"planned:amenity=",
"construction:amenity=",
- "disused:amenity=charging_station",
+ "disused:amenity=",
"operational_status=",
- "amenity="
+ "amenity=charging_station"
]
},
"then": {
@@ -1793,6 +1793,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": [
@@ -2243,68 +2306,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"
- }
- }
- ]
+ }
}
\ No newline at end of file
diff --git a/assets/layers/left_right_style/left_right_style.json b/assets/layers/left_right_style/left_right_style.json
index 57ec143ef3..91fd76b797 100644
--- a/assets/layers/left_right_style/left_right_style.json
+++ b/assets/layers/left_right_style/left_right_style.json
@@ -14,17 +14,21 @@
"width": 15,
"color": {
"render": "#ff000088",
- "mappings": [{
- "if": "id=left",
- "then": "#0000ff88"
- }]
+ "mappings": [
+ {
+ "if": "id=left",
+ "then": "#0000ff88"
+ }
+ ]
},
"offset": {
"render": "-15",
- "mappings": [{
- "if": "id=right",
- "then": "15"
- }]
+ "mappings": [
+ {
+ "if": "id=right",
+ "then": "15"
+ }
+ ]
}
}
]
diff --git a/assets/themes/grb_import/grb.json b/assets/themes/grb_import/grb.json
index 144e85ffda..c79f6e5fe3 100644
--- a/assets/themes/grb_import/grb.json
+++ b/assets/themes/grb_import/grb.json
@@ -319,7 +319,9 @@
"title": "CRAB-adres",
"mapRendering": [
{
- "location": ["point"],
+ "location": [
+ "point"
+ ],
"icon": "circle:#bb3322",
"iconSize": "15,15,center"
}
@@ -334,14 +336,16 @@
"mappings": [
{
"if": {
- "and":["_embedding_nr:={HUISNR}","_embedding_street:={STRAATNM}"]
+ "and": [
+ "_embedding_nr:={HUISNR}",
+ "_embedding_street:={STRAATNM}"
+ ]
},
"then": "no"
}
]
},
"tagRenderings": [
-
{
"id": "render_crab",
"render": "Volgens het CRAB ligt hier {STRAATNM} {HUISNR} (label: {HNRLABEL})"
@@ -350,10 +354,12 @@
"id": "render_embedded",
"render": "Het omliggende object met addres heeft {_embedding_street} {_embedding_nr}",
"condition": {
- "and": ["_embedding_street~*","_embedding_nr~*"]
+ "and": [
+ "_embedding_street~*",
+ "_embedding_nr~*"
+ ]
}
},
-
"all_tags",
{
"id": "import-button",