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

Remove obsolete keys through lint script (once more)

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-11-07 21:20:05 +01:00
parent c7386007bc
commit b928bcda6f
54 changed files with 18 additions and 1187 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Models/ThemeConfig/LegacyJsonConvert.ts
View file

@ -57,6 +57,7 @@ export default class LegacyJsonConvert {
} }
} }
}
delete config["color"] delete config["color"]
delete config["width"] delete config["width"]
@ -69,8 +70,6 @@ export default class LegacyJsonConvert {
delete config["rotation"] delete config["rotation"]
delete config["wayHandling"] delete config["wayHandling"]
}
for (const mapRenderingElement of config.mapRendering) { for (const mapRenderingElement of config.mapRendering) {
if (mapRenderingElement["iconOverlays"] !== undefined) { if (mapRenderingElement["iconOverlays"] !== undefined) {
mapRenderingElement["iconBadges"] = mapRenderingElement["iconOverlays"] mapRenderingElement["iconBadges"] = mapRenderingElement["iconOverlays"]

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

@ -63,15 +63,6 @@
} }
] ]
}, },
"icon": {
"render": "./assets/themes/artwork/artwork.svg"
},
"color": {
"render": "#0000ff"
},
"width": {
"render": "10"
},
"description": { "description": {
"en": "Diverse pieces of artwork", "en": "Diverse pieces of artwork",
"nl": "Verschillende soorten kunstwerken", "nl": "Verschillende soorten kunstwerken",
@ -85,7 +76,6 @@
"id": "Beragam karya seni" "id": "Beragam karya seni"
}, },
"minzoom": 12, "minzoom": 12,
"wayHandling": 2,
"presets": [ "presets": [
{ {
"tags": [ "tags": [

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

@ -47,8 +47,6 @@
} }
] ]
}, },
"icon": "./assets/layers/barrier/barrier.svg",
"width": "5",
"presets": [ "presets": [
{ {
"title": { "title": {

10
assets/layers/bench/bench.json
View file

@ -22,7 +22,6 @@
"source": { "source": {
"osmTags": "amenity=bench" "osmTags": "amenity=bench"
}, },
"wayHandling": 1,
"title": { "title": {
"render": { "render": {
"en": "Bench", "en": "Bench",
@ -612,15 +611,6 @@
"id": "bench-survey:date" "id": "bench-survey:date"
} }
], ],
"icon": {
"render": "circle:#FE6F32;./assets/layers/bench/bench.svg"
},
"iconSize": {
"render": "35,35,center"
},
"color": {
"render": "#00f"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [

12
assets/layers/bench_at_pt/bench_at_pt.json
View file

@ -138,18 +138,6 @@
"id": "bench_at_pt-bench" "id": "bench_at_pt-bench"
} }
], ],
"icon": {
"render": "./assets/themes/benches/bench_public_transport.svg"
},
"width": {
"render": "8"
},
"iconSize": {
"render": "35,35,center"
},
"color": {
"render": "#00f"
},
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

25
assets/layers/bicycle_library/bicycle_library.json
View file

@ -264,31 +264,6 @@
} }
} }
], ],
"icon": {
"render": "pin:#22ff55;./assets/layers/bicycle_library/bicycle_library.svg"
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
},
{
"if": "service:bicycle:pump=yes",
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
"badge": true
}
],
"width": {
"render": "1"
},
"iconSize": {
"render": "50,50,bottom"
},
"color": {
"render": "#c00"
},
"wayHandling": 2,
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

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

@ -37,22 +37,6 @@
}, },
"defaults" "defaults"
], ],
"icon": {
"render": "pin:#ffffff;./assets/layers/bicycle_tube_vending_machine/pinIcon.svg"
},
"iconOverlays": [
{
"if": {
"or": [
"operational_status=broken",
"operational_status=closed"
]
},
"then": "close:#c33",
"badge": true
}
],
"iconSize": "50,50,bottom",
"source": { "source": {
"osmTags": { "osmTags": {
"and": [ "and": [
@ -62,7 +46,6 @@
} }
}, },
"minzoom": 13, "minzoom": 13,
"wayHandling": 2,
"presets": [ "presets": [
{ {
"title": { "title": {
@ -83,7 +66,6 @@
] ]
} }
], ],
"color": "#6bc4f7",
"tagRenderings": [ "tagRenderings": [
"images", "images",
{ {

13
assets/layers/bike_cafe/bike_cafe.json
View file

@ -332,18 +332,6 @@
"id": "bike_cafe-opening_hours" "id": "bike_cafe-opening_hours"
} }
], ],
"icon": {
"render": "./assets/layers/bike_cafe/bike_cafe.svg"
},
"width": {
"render": "2"
},
"iconSize": {
"render": "50,50,bottom"
},
"color": {
"render": "#694E2D"
},
"presets": [ "presets": [
{ {
"title": { "title": {
@ -365,7 +353,6 @@
] ]
} }
], ],
"wayHandling": 2,
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

19
assets/layers/bike_cleaning/bike_cleaning.json
View file

@ -37,10 +37,6 @@
} }
] ]
}, },
"icon": {
"render": "./assets/layers/bike_cleaning/bike_cleaning.svg"
},
"iconSize": "50,50,bottom",
"source": { "source": {
"osmTags": { "osmTags": {
"or": [ "or": [
@ -51,7 +47,6 @@
} }
}, },
"minzoom": 13, "minzoom": 13,
"wayHandling": 1,
"presets": [ "presets": [
{ {
"title": { "title": {
@ -69,20 +64,6 @@
] ]
} }
], ],
"color": "#6bc4f7",
"iconOverlays": [
{
"if": {
"and": [
"service:bicycle:cleaning~*",
"amenity!=bike_wash"
]
},
"then": {
"render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
}
}
],
"titleIcons": [ "titleIcons": [
{ {
"render": "<img src='./assets/layers/bike_cleaning/bike_cleaning_icon.svg'/>" "render": "<img src='./assets/layers/bike_cleaning/bike_cleaning_icon.svg'/>"

7
assets/layers/bike_parking/bike_parking.json
View file

@ -22,13 +22,6 @@
] ]
} }
}, },
"icon": {
"render": "./assets/layers/bike_parking/parking.svg"
},
"iconSize": "40,40,bottom",
"color": "#00f",
"width": "1",
"wayHandling": 2,
"presets": [ "presets": [
{ {
"title": { "title": {

63
assets/layers/bike_repair_station/bike_repair_station.json
View file

@ -615,69 +615,6 @@
}, },
"level" "level"
], ],
"icon": {
"render": "./assets/layers/bike_repair_station/repair_station.svg",
"mappings": [
{
"if": {
"and": [
"service:bicycle:pump=no",
"service:bicycle:pump:operational_status=broken"
]
},
"then": "./assets/layers/bike_repair_station/repair_station.svg"
},
{
"if": {
"and": [
"service:bicycle:pump=yes",
"service:bicycle:tools=yes"
]
},
"then": "./assets/layers/bike_repair_station/repair_station_pump.svg"
},
{
"if": {
"and": [
"service:bicycle:pump:operational_status=broken",
"service:bicycle:tools=no"
]
},
"then": "./assets/layers/bike_repair_station/broken_pump_2.svg"
},
{
"if": {
"and": [
"service:bicycle:pump=yes",
{
"or": [
"service:bicycle:tools=no",
"service:bicycle:tools="
]
}
]
},
"then": "./assets/layers/bike_repair_station/pump.svg"
}
]
},
"iconOverlays": [
{
"if": "operator=De Fietsambassade Gent",
"then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg",
"badge": true
}
],
"iconSize": {
"render": "50,50,bottom"
},
"color": {
"render": "#00f"
},
"width": {
"render": "1"
},
"wayHandling": 2,
"presets": [ "presets": [
{ {
"title": { "title": {

46
assets/layers/bike_shop/bike_shop.json
View file

@ -707,52 +707,6 @@
] ]
} }
], ],
"icon": {
"render": "./assets/layers/bike_shop/repair_shop.svg",
"mappings": [
{
"if": "operator=De Fietsambassade Gent",
"then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg"
},
{
"if": "service:bicycle:retail=yes",
"then": "./assets/layers/bike_shop/shop.svg"
}
]
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
},
{
"if": "service:bicycle:pump=yes",
"then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
"badge": true
},
{
"if": {
"and": [
"service:bicycle:cleaning~*"
]
},
"then": {
"render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
},
"badge": true
}
],
"width": {
"render": "1"
},
"iconSize": {
"render": "50,50,bottom"
},
"color": {
"render": "#c00"
},
"wayHandling": 2,
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

13
assets/layers/bike_themed_object/bike_themed_object.json
View file

@ -56,20 +56,7 @@
"phone", "phone",
"opening_hours" "opening_hours"
], ],
"icon": {
"render": "./assets/layers/bike_themed_object/other_services.svg"
},
"width": {
"render": "2"
},
"iconSize": {
"render": "50,50,bottom"
},
"color": {
"render": "#AB76D5"
},
"presets": [], "presets": [],
"wayHandling": 2,
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

12
assets/layers/binocular/binocular.json
View file

@ -75,18 +75,6 @@
"id": "binocular-direction" "id": "binocular-direction"
} }
], ],
"icon": {
"render": "circle:white;./assets/layers/binocular/telescope.svg"
},
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#00f"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [

23
assets/layers/birdhide/birdhide.json
View file

@ -190,23 +190,6 @@
"id": "birdhide-operator" "id": "birdhide-operator"
} }
], ],
"icon": {
"render": {
"nl": "./assets/layers/birdhide/birdhide.svg"
},
"mappings": [
{
"if": {
"or": [
"building=yes",
"shelter=yes",
"amenity=shelter"
]
},
"then": "./assets/layers/birdhide/birdshelter.svg"
}
]
},
"size": { "size": {
"freeform": { "freeform": {
"addExtraTags": [] "addExtraTags": []
@ -216,11 +199,6 @@
}, },
"mappings": [] "mappings": []
}, },
"color": {
"render": {
"nl": "#94bb28"
}
},
"stroke": { "stroke": {
"render": { "render": {
"nl": "3" "nl": "3"
@ -255,7 +233,6 @@
} }
} }
], ],
"wayHandling": 1,
"filter": [ "filter": [
{ {
"id": "wheelchair", "id": "wheelchair",

25
assets/layers/cafe_pub/cafe_pub.json
View file

@ -15,31 +15,6 @@
] ]
} }
}, },
"wayHandling": 1,
"icon": {
"render": "circle:white;./assets/layers/cafe_pub/pub.svg",
"mappings": [
{
"if": "amenity=cafe",
"then": "circle:white;./assets/layers/cafe_pub/cafe.svg"
}
]
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
}
],
"label": {
"mappings": [
{
"if": "name~*",
"then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
}
]
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [

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

@ -1916,7 +1916,6 @@
} }
} }
], ],
"wayHandling": 1,
"filter": [ "filter": [
{ {
"id": "vehicle-type", "id": "vehicle-type",

29
assets/layers/cluster_style/cluster_style.json
View file

@ -8,35 +8,6 @@
"tagRenderings": [ "tagRenderings": [
"all_tags" "all_tags"
], ],
"color": {
"render": "#3c3",
"mappings": [
{
"if": "showCount>200",
"then": "#f33"
},
{
"if": "showCount>100",
"then": "#c93"
},
{
"if": "showCount>50",
"then": "#cc3"
}
]
},
"width": {
"render": "1"
},
"label": {
"render": "<div class='rounded-full text-xl font-bold' style='width: 2rem; height: 2rem; background: white'>{showCount}</div>",
"mappings": [
{
"if": "showCount>1000",
"then": "<div class='rounded-full text-xl font-bold flex flex-col' style='width: 2.5rem; height: 2.5rem; background: white'>{kilocount}K</div>"
}
]
},
"mapRendering": [ "mapRendering": [
{ {
"label": { "label": {

15
assets/layers/crossings/crossings.json
View file

@ -45,21 +45,6 @@
} }
] ]
}, },
"icon": {
"render": "./assets/layers/crossings/pedestrian_crossing.svg",
"mappings": [
{
"if": {
"or": [
"highway=traffic_signals",
"crossing=traffic_signals"
]
},
"then": "./assets/layers/crossings/traffic_lights.svg"
}
]
},
"width": "5",
"presets": [ "presets": [
{ {
"title": { "title": {

73
assets/layers/cycleways_and_roads/cycleways_and_roads.json
View file

@ -1248,79 +1248,6 @@
] ]
} }
], ],
"icon": {
"render": "./assets/themes/cycle_infra/bicycleway.svg"
},
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "rgba(170, 170, 170, 0.7)",
"mappings": [
{
"if": "highway=cycleway",
"then": "rgba(0, 189, 141, 0.7)"
},
{
"if": "highway=path",
"then": "rgba(204, 74, 207, 0.7)"
},
{
"if": "cycleway=track",
"then": "rgba(113, 3, 200, 0.7)"
},
{
"if": "cycleway=shared_lane",
"then": "rgba(74, 59, 247, 0.7)"
},
{
"if": "cycleway=lane",
"then": "rgba(254, 155, 6, 0.9)"
},
{
"if": "cyclestreet=yes",
"then": "rgba(57, 159, 191, 0.7)"
}
]
},
"dashArray": {
"render": "",
"mappings": [
{
"if": {
"or": [
"oneway=yes",
{
"or": [
"highway=cycleway",
"highway=path"
]
}
]
},
"then": ""
},
{
"if": "cycleway=track",
"then": ""
},
{
"if": "cycleway=shared_lane",
"then": "15 30"
},
{
"if": "cycleway=lane",
"then": "25 15 15 15 25"
},
{
"if": "cyclestreet=yes",
"then": ""
}
]
},
"allowSplit": true, "allowSplit": true,
"mapRendering": [ "mapRendering": [
{ {

10
assets/layers/defibrillator/defibrillator.json
View file

@ -30,16 +30,6 @@
"ru": "Дефибриллятор" "ru": "Дефибриллятор"
} }
}, },
"icon": {
"render": "./assets/themes/aed/aed.svg",
"mappings": [
{
"if": "_recently_surveyed=true",
"then": "./assets/layers/defibrillator/aed_checked.svg"
}
]
},
"color": "#0000ff",
"presets": [ "presets": [
{ {
"title": { "title": {

16
assets/layers/direction/direction.json
View file

@ -28,24 +28,8 @@
"de": "Diese Ebene visualisiert Richtungen" "de": "Diese Ebene visualisiert Richtungen"
}, },
"tagRenderings": [], "tagRenderings": [],
"icon": {
"render": "direction_gradient:var(--catch-detail-color)",
"#": "For some weird reason, showing the icon in the layer control panel breaks the svg-gradient (because the svg gradient has a global color or smthng) - so we use a different icon without gradient",
"mappings": [
{
"if": "id=node/-1",
"then": "direction:var(--catch-detail-color)"
}
]
},
"rotation": {
"render": "{_direction:numerical}deg"
},
"iconSize": "200,200,center",
"color": "--catch-detail-color",
"stroke": "0", "stroke": "0",
"presets": [], "presets": [],
"wayHandling": 2,
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

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

@ -22,22 +22,6 @@
"id": "Air minum" "id": "Air minum"
} }
}, },
"icon": {
"render": "pin:#6BC4F7;./assets/layers/drinking_water/drips.svg"
},
"iconOverlays": [
{
"if": {
"or": [
"operational_status=broken",
"operational_status=closed"
]
},
"then": "close:#c33",
"badge": true
}
],
"iconSize": "40,40,bottom",
"source": { "source": {
"osmTags": { "osmTags": {
"and": [ "and": [
@ -53,7 +37,6 @@
"_closest_other_drinking_water_distance=Math.floor(Number(JSON.parse(feat.properties._closest_other_drinking_water)?.distance) * 1000)" "_closest_other_drinking_water_distance=Math.floor(Number(JSON.parse(feat.properties._closest_other_drinking_water)?.distance) * 1000)"
], ],
"minzoom": 13, "minzoom": 13,
"wayHandling": 1,
"presets": [ "presets": [
{ {
"title": { "title": {
@ -71,7 +54,6 @@
] ]
} }
], ],
"color": "#6bc4f7",
"tagRenderings": [ "tagRenderings": [
"images", "images",
{ {

34
assets/layers/etymology/etymology.json
View file

@ -139,40 +139,6 @@
}, },
"wikipedia" "wikipedia"
], ],
"icon": {
"render": "pin:#05d7fcaa;./assets/layers/etymology/logo.svg",
"mappings": [
{
"if": {
"and": [
"name:etymology=",
"name:etymology:wikidata="
]
},
"then": "pin:#fcca05aa;./assets/layers/etymology/logo.svg"
}
]
},
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#05d7fcaa",
"mappings": [
{
"if": {
"and": [
"name:etymology=",
"name:etymology:wikidata="
]
},
"then": "#fcca05aa"
}
]
},
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

46
assets/layers/food/food.json
View file

@ -14,52 +14,6 @@
} }
}, },
"minzoom": 12, "minzoom": 12,
"wayHandling": 1,
"icon": {
"render": "circle:white;./assets/layers/food/restaurant.svg",
"mappings": [
{
"if": {
"and": [
"amenity=fast_food",
"cuisine=friture"
]
},
"then": "circle:white;./assets/layers/food/fries.svg"
},
{
"if": "amenity=fast_food",
"then": "circle:white;./assets/layers/food/fastfood.svg"
}
]
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
},
{
"if": {
"or": [
"diet:vegetarian=yes",
"diet:vegan=yes"
]
},
"then": {
"render": "circle:white;./assets/themes/fritures/Vegetarian-mark.svg"
},
"badge": true
}
],
"label": {
"mappings": [
{
"if": "name~*",
"then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
}
]
},
"presets": [ "presets": [
{ {
"title": { "title": {

5
assets/layers/ghost_bike/ghost_bike.json
View file

@ -58,11 +58,6 @@
} }
] ]
}, },
"icon": "./assets/layers/ghost_bike/ghost_bike.svg",
"iconSize": "40,40,bottom",
"width": "5",
"color": "#000",
"wayHandling": 1,
"presets": [ "presets": [
{ {
"title": { "title": {

5
assets/layers/grass_in_parks/grass_in_parks.json
View file

@ -36,11 +36,6 @@
} }
] ]
}, },
"icon": "./assets/themes/playgrounds/playground.svg",
"iconSize": "40,40,center",
"width": "1",
"color": "#0f0",
"wayHandling": 2,
"tagRenderings": [ "tagRenderings": [
"images", "images",
{ {

9
assets/layers/information_board/information_board.json
View file

@ -29,15 +29,6 @@
"tagRenderings": [ "tagRenderings": [
"images" "images"
], ],
"icon": {
"render": "./assets/layers/information_board/board.svg"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#00f"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [

41
assets/layers/map/map.json
View file

@ -166,46 +166,6 @@
} }
} }
], ],
"icon": {
"render": "./assets/layers/map/map.svg",
"mappings": [
{
"if": {
"and": [
"map_source=OpenStreetMap",
"map_source:attribution=sticker"
]
},
"then": "./assets/layers/map/map-stickered.svg"
},
{
"if": {
"and": [
"map_source=OpenStreetMap",
"map_source:attribution=yes"
]
},
"then": "./assets/layers/map/osm-logo-white-bg.svg"
},
{
"if": {
"and": [
"map_source=OpenStreetMap"
]
},
"then": "./assets/layers/map/osm-logo-buggy-attr.svg"
}
]
},
"width": {
"render": "8"
},
"iconSize": {
"render": "50,50,center"
},
"color": {
"render": "#00f"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [
@ -228,7 +188,6 @@
} }
} }
], ],
"wayHandling": 2,
"deletion": { "deletion": {
"softDeletionTags": { "softDeletionTags": {
"and": [ "and": [

13
assets/layers/nature_reserve/nature_reserve.json
View file

@ -400,19 +400,6 @@
}, },
"wikipedia" "wikipedia"
], ],
"wayHandling": 2,
"icon": {
"render": "./assets/layers/nature_reserve/nature_reserve.svg"
},
"width": {
"render": "1"
},
"iconSize": {
"render": "50,50,center"
},
"color": {
"render": "#3c3"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [

13
assets/layers/observation_tower/observation_tower.json
View file

@ -142,19 +142,6 @@
"wheelchair-access", "wheelchair-access",
"wikipedia" "wikipedia"
], ],
"wayHandling": 1,
"icon": {
"render": "circle:white;./assets/layers/observation_tower/Tower_observation.svg"
},
"width": {
"render": "2"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#00f"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [

10
assets/layers/parking/parking.json
View file

@ -42,22 +42,12 @@
} }
] ]
}, },
"icon": {
"render": "./assets/layers/parking/parking.svg"
},
"description": { "description": {
"nl": "Parking" "nl": "Parking"
}, },
"tagRenderings": [ "tagRenderings": [
"images" "images"
], ],
"wayHandling": 1,
"iconSize": {
"render": "36,36,center"
},
"color": {
"render": "#E1AD01"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [

10
assets/layers/picnic_table/picnic_table.json
View file

@ -78,15 +78,6 @@
"id": "picnic_table-material" "id": "picnic_table-material"
} }
], ],
"icon": {
"render": "circle:#e6cf39;./assets/layers/picnic_table/picnic_table.svg"
},
"iconSize": {
"render": "35,35,center"
},
"color": {
"render": "#00f"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [
@ -102,7 +93,6 @@
} }
} }
], ],
"wayHandling": 1,
"deletion": { "deletion": {
"softDeletionTags": { "softDeletionTags": {
"and": [ "and": [

13
assets/layers/play_forest/play_forest.json
View file

@ -93,18 +93,6 @@
} }
], ],
"hideFromOverview": false, "hideFromOverview": false,
"icon": {
"render": "./assets/layers/play_forest/icon.svg"
},
"width": {
"render": "2"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#007055"
},
"presets": [ "presets": [
{ {
"title": "Speelbos", "title": "Speelbos",
@ -116,7 +104,6 @@
"description": "Een zone in het bos, duidelijk gemarkeerd als speelzone met de overeenkomstige borden.<br/><img src='./assets/layers/play_forest/icon.svg'/>" "description": "Een zone in het bos, duidelijk gemarkeerd als speelzone met de overeenkomstige borden.<br/><img src='./assets/layers/play_forest/icon.svg'/>"
} }
], ],
"wayHandling": 2,
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

43
assets/layers/playground/playground.json
View file

@ -480,48 +480,6 @@
"render": "{reviews(name, playground)}" "render": "{reviews(name, playground)}"
} }
], ],
"icon": {
"render": "./assets/themes/playgrounds/playground.svg"
},
"iconOverlays": [
{
"if": {
"and": [
"opening_hours!=24/7",
"opening_hours~*"
]
},
"then": "isOpen",
"badge": true
}
],
"width": {
"render": "1"
},
"iconSize": {
"render": "40,40,center",
"mappings": [
{
"if": "id~node/.*",
"then": "40,40,center"
},
{
"if": "_size_classification=small",
"then": "25,25,center"
},
{
"if": "_size_classification=medium",
"then": "40,40,center"
},
{
"if": "_size_classification=large",
"then": "60,60,center"
}
]
},
"color": {
"render": "#5dbaa9"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [
@ -537,7 +495,6 @@
} }
} }
], ],
"wayHandling": 2,
"deletion": { "deletion": {
"softDeletionTags": { "softDeletionTags": {
"and": [ "and": [

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

@ -20,7 +20,6 @@
"osmTags": "amenity=public_bookcase" "osmTags": "amenity=public_bookcase"
}, },
"minzoom": 10, "minzoom": 10,
"wayHandling": 2,
"title": { "title": {
"render": { "render": {
"en": "Bookcase", "en": "Bookcase",
@ -44,23 +43,6 @@
} }
] ]
}, },
"icon": {
"render": "./assets/themes/bookcases/bookcase.svg"
},
"label": {
"mappings": [
{
"if": "name~*",
"then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
}
]
},
"color": {
"render": "#0000ff"
},
"width": {
"render": "8"
},
"presets": [ "presets": [
{ {
"title": { "title": {

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

@ -324,25 +324,6 @@
"questions", "questions",
"reviews" "reviews"
], ],
"icon": {
"render": "./assets/themes/shops/shop.svg"
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
}
],
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#00f"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [
@ -368,7 +349,6 @@
} }
} }
], ],
"wayHandling": 2,
"deletion": { "deletion": {
"softDeletionTags": { "softDeletionTags": {
"and": [ "and": [

33
assets/layers/slow_roads/slow_roads.json
View file

@ -3,7 +3,6 @@
"name": { "name": {
"nl": "Paadjes, trage wegen en autoluwe straten" "nl": "Paadjes, trage wegen en autoluwe straten"
}, },
"icon": "./assets/layers/slow_roads/slow_road.svg",
"minzoom": 16, "minzoom": 16,
"source": { "source": {
"osmTags": { "osmTags": {
@ -233,38 +232,6 @@
] ]
} }
], ],
"width": {
"render": "7"
},
"dashArray": {
"render": "",
"mappings": [
{
"if": "highway=cycleway",
"then": ""
},
{
"if": "highway=path",
"then": "0 12"
},
{
"if": {
"or": [
"highway=footway",
"highway=pedestrian"
]
},
"then": "12 18"
},
{
"if": "highway=living_street",
"then": "12 12 0 12"
}
]
},
"color": {
"render": "#eaba2a"
},
"presets": [], "presets": [],
"mapRendering": [ "mapRendering": [
{ {

73
assets/layers/sport_pitch/sport_pitch.json
View file

@ -8,7 +8,6 @@
"it": "Campi sportivi", "it": "Campi sportivi",
"de": "Sportplätze" "de": "Sportplätze"
}, },
"wayHandling": 1,
"minzoom": 12, "minzoom": 12,
"source": { "source": {
"osmTags": { "osmTags": {
@ -423,78 +422,6 @@
"render": "{reviews(name, sportpitch)}" "render": "{reviews(name, sportpitch)}"
} }
], ],
"icon": {
"render": "circle:white;./assets/layers/sport_pitch/sport_pitch.svg",
"mappings": [
{
"if": {
"or": [
"sport=baseball",
"sport=basketball",
"sport=beachvolleyball",
"sport=boules",
"sport=skateboard",
"sport=soccer",
"sport=table_tennis",
"sport=tennis",
"sport=volleyball"
]
},
"then": "circle:white;./assets/layers/sport_pitch/{sport}.svg"
}
]
},
"iconOverlays": [
{
"if": {
"and": [
"opening_hours!=24/7",
"opening_hours~*"
]
},
"then": "isOpen",
"badge": true
},
{
"if": {
"or": [
"access=customers",
"access=private",
"access=no"
]
},
"then": "circle:white;./assets/layers/sport_pitch/lock.svg",
"badge": true
}
],
"width": {
"render": "1"
},
"iconSize": {
"render": "25,25,center",
"mappings": [
{
"if": {
"or": [
"_size_classification=medium",
"id~node/.*"
]
},
"then": "40,40,center"
},
{
"if": "_size_classification=small",
"then": "25,25,center"
},
{
"if": "_size_classification=large",
"then": "50,50,center"
}
]
},
"color": {
"render": "#7cb82f"
},
"presets": [ "presets": [
{ {
"title": { "title": {

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

@ -453,56 +453,6 @@
"id": "camera:mount" "id": "camera:mount"
} }
], ],
"icon": {
"render": "./assets/themes/surveillance/logo.svg",
"mappings": [
{
"if": "camera:type=dome",
"then": "./assets/themes/surveillance/dome.svg"
},
{
"if": "_direction:leftright=right",
"then": "./assets/themes/surveillance/cam_right.svg"
},
{
"if": "_direction:leftright=left",
"then": "./assets/themes/surveillance/cam_left.svg"
}
]
},
"rotation": {
"#": "Note: {camera:direction} is substituted by a number, giving the string 'calc(123deg + 90deg)' ; it is this string that is used as css property, which interprets the calc",
"render": "calc({_direction:numerical}deg + 90deg)",
"mappings": [
{
"if": "camera:type=dome",
"then": "0"
},
{
"if": "_direction:leftright=right",
"then": "calc({_direction:numerical}deg - 90deg)"
}
]
},
"width": {
"render": "8"
},
"iconSize": {
"mappings": [
{
"if": "camera:type=dome",
"then": "50,50,center"
},
{
"if": "_direction:leftright~*",
"then": "100,35,center"
}
],
"render": "50,50,center"
},
"color": {
"render": "#f00"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [
@ -512,7 +462,6 @@
"title": "Surveillance camera" "title": "Surveillance camera"
} }
], ],
"wayHandling": 2,
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

22
assets/layers/toilet/toilet.json
View file

@ -22,28 +22,6 @@
"it": "Servizi igienici" "it": "Servizi igienici"
} }
}, },
"icon": {
"render": "./assets/layers/toilet/toilets.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "circle:white;./assets/layers/toilet/wheelchair.svg"
},
{
"if": {
"or": [
"toilets:position=urinals",
"toilets:position=urinal"
]
},
"then": "./assets/layers/toilet/urinal.svg"
}
]
},
"color": {
"render": "#0000ff"
},
"wayHandling": 1,
"presets": [ "presets": [
{ {
"title": { "title": {

32
assets/layers/trail/trail.json
View file

@ -179,41 +179,9 @@
"id": "pushchair access" "id": "pushchair access"
} }
], ],
"icon": {
"render": "./assets/layers/trail/trail.svg",
"mappings": [
{
"if": "wheelchair=yes",
"then": "./assets/layers/trail/wheelchair.svg"
},
{
"if": "pushchair=yes",
"then": "./assets/layers/trail/pushchair.svg"
}
]
},
"description": { "description": {
"nl": "Aangeduide wandeltochten" "nl": "Aangeduide wandeltochten"
}, },
"wayHandling": 0,
"width": {
"render": "3"
},
"iconSize": {
"render": "35,35,center"
},
"color": {
"render": "#335D9F",
"mappings": [
{
"if": "colour~*",
"then": "{colour}"
}
]
},
"dashArray": {
"render": "5 5"
},
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

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

@ -506,37 +506,6 @@
"id": "tree_node-wikidata" "id": "tree_node-wikidata"
} }
], ],
"icon": {
"render": "circle:#ffffff;./assets/themes/trees/unknown.svg",
"mappings": [
{
"if": {
"and": [
"leaf_type=broadleaved"
]
},
"then": "circle:#ffffff;./assets/themes/trees/broadleaved.svg"
},
{
"if": {
"and": [
"leaf_type=needleleaved"
]
},
"then": "circle:#ffffff;./assets/themes/trees/needleleaved.svg"
}
]
},
"wayHandling": 1,
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,bottom"
},
"color": {
"render": "#00f"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [

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

@ -21,10 +21,6 @@
"osmTags": "tourism=viewpoint" "osmTags": "tourism=viewpoint"
}, },
"minzoom": 14, "minzoom": 14,
"icon": "./assets/layers/viewpoint/viewpoint.svg",
"iconSize": "20,20,center",
"color": "#ffffff",
"width": "5",
"wayhandling": 2, "wayhandling": 2,
"presets": [ "presets": [
{ {

5
assets/layers/village_green/village_green.json
View file

@ -20,11 +20,6 @@
} }
] ]
}, },
"icon": "./assets/themes/playgrounds/playground.svg",
"iconSize": "40,40,center",
"width": "1",
"color": "#937f20",
"wayHandling": 2,
"tagRenderings": [ "tagRenderings": [
"images", "images",
{ {

10
assets/layers/visitor_information_centre/visitor_information_centre.json
View file

@ -59,17 +59,7 @@
"de": "Ein Besucherzentrum bietet Informationen über eine bestimmte Attraktion oder Sehenswürdigkeit, an der es sich befindet." "de": "Ein Besucherzentrum bietet Informationen über eine bestimmte Attraktion oder Sehenswürdigkeit, an der es sich befindet."
}, },
"tagRenderings": [], "tagRenderings": [],
"icon": {
"render": "./assets/layers/visitor_information_centre/information.svg"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#E64C00"
},
"presets": [], "presets": [],
"wayHandling": 1,
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

28
assets/layers/waste_basket/waste_basket.json
View file

@ -142,34 +142,6 @@
] ]
} }
], ],
"icon": {
"render": "./assets/themes/waste_basket/waste_basket.svg"
},
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center",
"mappings": [
{
"if": {
"and": [
"amenity=waste_basket"
]
},
"then": {
"en": "Waste Basket",
"nl": "Vuilnisbak",
"ru": "Контейнер для мусора",
"de": "Abfalleimer",
"eo": "Rubujo"
}
}
]
},
"color": {
"render": "#00f"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [

10
assets/layers/watermill/watermill.json
View file

@ -163,16 +163,6 @@
"id": "Operator tag" "id": "Operator tag"
} }
], ],
"wayHandling": 1,
"icon": {
"render": "./assets/layers/watermill/watermill.svg"
},
"iconSize": {
"render": "50,50,center"
},
"color": {
"render": "#FFC0CB"
},
"mapRendering": [ "mapRendering": [
{ {
"icon": { "icon": {

10
assets/themes/aed/aed_brugge.json
View file

@ -30,16 +30,6 @@
"_has_closeby_feature=Number(feat.properties._closest_osm_aed_distance) < 25 ? 'yes' : 'no'" "_has_closeby_feature=Number(feat.properties._closest_osm_aed_distance) < 25 ? 'yes' : 'no'"
], ],
"title": "AED in Brugse dataset", "title": "AED in Brugse dataset",
"icon": {
"render": "circle:red",
"mappings": [
{
"if": "_has_closeby_feature=yes",
"then": "circle:#008000aa"
}
]
},
"iconSize": "20,20,center",
"tagRenderings": [ "tagRenderings": [
"all_tags" "all_tags"
], ],

100
assets/themes/buurtnatuur/buurtnatuur.json
View file

@ -74,42 +74,6 @@
"tagRenderings": [ "tagRenderings": [
"images" "images"
], ],
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/nature_reserve.svg"
},
"width": {
"render": "5"
},
"iconSize": {
"render": "50,50,center"
},
"color": {
"render": "#3c3",
"mappings": [
{
"if": {
"and": [
"name=",
"noname=",
"operator=",
"access=",
"access:description=",
"leisure=park"
]
},
"then": "#cc1100"
},
{
"if": {
"and": [
"name=",
"noname="
]
},
"then": "#fccb37"
}
]
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [
@ -230,29 +194,6 @@
"tagRenderings": [ "tagRenderings": [
"images" "images"
], ],
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/park.svg"
},
"width": {
"render": "5"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#3c3",
"mappings": [
{
"if": {
"and": [
"name=",
"noname="
]
},
"then": "#fccb37"
}
]
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [
@ -361,47 +302,6 @@
"tagRenderings": [ "tagRenderings": [
"images" "images"
], ],
"icon": {
"render": "circle:#ffffff;./assets/themes/buurtnatuur/forest.svg"
},
"width": {
"render": "5"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#3a3",
"mappings": [
{
"if": {
"and": [
"operator=",
"access=",
"access:description="
]
},
"then": "#cc1100"
},
{
"if": {
"and": [
"operator="
]
},
"then": "#cccc00"
},
{
"if": {
"and": [
"name=",
"noname="
]
},
"then": "#fccb37"
}
]
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [

24
assets/themes/fruit_trees/fruit_trees.json
View file

@ -43,18 +43,6 @@
"tagRenderings": [ "tagRenderings": [
"images" "images"
], ],
"icon": {
"render": "./assets/themes/buurtnatuur/forest.svg"
},
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#00f"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [
@ -167,18 +155,6 @@
"id": "fruitboom-ref" "id": "fruitboom-ref"
} }
], ],
"icon": {
"render": "./assets/themes/fruit_trees/fruit_tree.svg"
},
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#00f"
},
"presets": [ "presets": [
{ {
"tags": [ "tags": [

2
assets/themes/uk_addresses/uk_addresses.json
View file

@ -117,7 +117,7 @@
{ {
"if": "_embedding_object:id=false", "if": "_embedding_object:id=false",
"then": { "then": {
"en":"The INSPIRE-polygon containing this point has <b>no</b> addresses contained" "en": "The INSPIRE-polygon containing this point has <b>no</b> addresses contained"
} }
} }
], ],

5
scripts/generateLayerOverview.ts
View file

@ -47,6 +47,11 @@ class LayerOverviewUtils {
if (layerJson["overpassTags"] !== undefined) { if (layerJson["overpassTags"] !== undefined) {
errorCount.push("Layer " + layerJson.id + "still uses the old 'overpassTags'-format. Please use \"source\": {\"osmTags\": <tags>}' instead of \"overpassTags\": <tags> (note: this isn't your fault, the custom theme generator still spits out the old format)") errorCount.push("Layer " + layerJson.id + "still uses the old 'overpassTags'-format. Please use \"source\": {\"osmTags\": <tags>}' instead of \"overpassTags\": <tags> (note: this isn't your fault, the custom theme generator still spits out the old format)")
} }
const forbiddenTopLevel = ["icon","wayHandling","roamingRenderings","roamingRendering","label","width","color","colour","iconOverlays"]
for (const forbiddenKey of forbiddenTopLevel) {
if(layerJson[forbiddenKey] !== undefined)
errorCount.push("Layer "+layerJson.id+" still has a forbidden key "+forbiddenKey)
}
try { try {
const layer = new LayerConfig(layerJson, "test", true) const layer = new LayerConfig(layerJson, "test", true)
const images = Array.from(layer.ExtractImages()) const images = Array.from(layer.ExtractImages())