Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Reformatting and regeneration of themes

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-28 03:25:12 +02:00
parent 89f4ab5045
commit 4471319588
3 changed files with 97 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1681,7 +1681,7 @@
"planned:amenity=", "planned:amenity=",
"construction:amenity=", "construction:amenity=",
"disused:amenity=", "disused:amenity=",
"operational_status=", "operational_status=broken",
"amenity=charging_station" "amenity=charging_station"
] ]
}, },
@ -1694,11 +1694,11 @@
{ {
"if": { "if": {
"and": [ "and": [
"planned:amenity=", "planned:amenity=charging_station",
"construction:amenity=", "construction:amenity=",
"disused:amenity=", "disused:amenity=",
"operational_status=broken", "operational_status=",
"amenity=charging_station" "amenity="
] ]
}, },
"then": { "then": {
@ -1710,8 +1710,8 @@
{ {
"if": { "if": {
"and": [ "and": [
"planned:amenity=charging_station", "planned:amenity=",
"construction:amenity=", "construction:amenity=charging_station",
"disused:amenity=", "disused:amenity=",
"operational_status=", "operational_status=",
"amenity=" "amenity="
@ -1727,8 +1727,8 @@
"if": { "if": {
"and": [ "and": [
"planned:amenity=", "planned:amenity=",
"construction:amenity=charging_station", "construction:amenity=",
"disused:amenity=", "disused:amenity=charging_station",
"operational_status=", "operational_status=",
"amenity=" "amenity="
] ]
@ -1744,9 +1744,9 @@
"and": [ "and": [
"planned:amenity=", "planned:amenity=",
"construction:amenity=", "construction:amenity=",
"disused:amenity=charging_station", "disused:amenity=",
"operational_status=", "operational_status=",
"amenity=" "amenity=charging_station"
] ]
}, },
"then": { "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": [ "presets": [
{ {
"tags": [ "tags": [
@ -2243,68 +2306,5 @@
] ]
}, },
"neededChangesets": 10 "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"
}
}
]
} }

20
assets/layers/left_right_style/left_right_style.json
View file

@ -14,17 +14,21 @@
"width": 15, "width": 15,
"color": { "color": {
"render": "#ff000088", "render": "#ff000088",
"mappings": [{ "mappings": [
"if": "id=left", {
"then": "#0000ff88" "if": "id=left",
}] "then": "#0000ff88"
}
]
}, },
"offset": { "offset": {
"render": "-15", "render": "-15",
"mappings": [{ "mappings": [
"if": "id=right", {
"then": "15" "if": "id=right",
}] "then": "15"
}
]
} }
} }
] ]

16
assets/themes/grb_import/grb.json
View file

@ -319,7 +319,9 @@
"title": "CRAB-adres", "title": "CRAB-adres",
"mapRendering": [ "mapRendering": [
{ {
"location": ["point"], "location": [
"point"
],
"icon": "circle:#bb3322", "icon": "circle:#bb3322",
"iconSize": "15,15,center" "iconSize": "15,15,center"
} }
@ -334,14 +336,16 @@
"mappings": [ "mappings": [
{ {
"if": { "if": {
"and":["_embedding_nr:={HUISNR}","_embedding_street:={STRAATNM}"] "and": [
"_embedding_nr:={HUISNR}",
"_embedding_street:={STRAATNM}"
]
}, },
"then": "no" "then": "no"
} }
] ]
}, },
"tagRenderings": [ "tagRenderings": [
{ {
"id": "render_crab", "id": "render_crab",
"render": "Volgens het CRAB ligt hier <b>{STRAATNM}</b> {HUISNR} (label: {HNRLABEL})" "render": "Volgens het CRAB ligt hier <b>{STRAATNM}</b> {HUISNR} (label: {HNRLABEL})"
@ -350,10 +354,12 @@
"id": "render_embedded", "id": "render_embedded",
"render": "Het omliggende object met addres heeft <b>{_embedding_street}</b> {_embedding_nr}", "render": "Het omliggende object met addres heeft <b>{_embedding_street}</b> {_embedding_nr}",
"condition": { "condition": {
"and": ["_embedding_street~*","_embedding_nr~*"] "and": [
"_embedding_street~*",
"_embedding_nr~*"
]
} }
}, },
"all_tags", "all_tags",
{ {
"id": "import-button", "id": "import-button",