diff --git a/Models/ThemeConfig/LegacyJsonConvert.ts b/Models/ThemeConfig/LegacyJsonConvert.ts index 7f7b0e30f..b30473edc 100644 --- a/Models/ThemeConfig/LegacyJsonConvert.ts +++ b/Models/ThemeConfig/LegacyJsonConvert.ts @@ -57,20 +57,19 @@ export default class LegacyJsonConvert { } } - - delete config["color"] - delete config["width"] - delete config["dashArray"] - - delete config["icon"] - delete config["iconOverlays"] - delete config["label"] - delete config["iconSize"] - delete config["rotation"] - delete config["wayHandling"] - } + delete config["color"] + delete config["width"] + delete config["dashArray"] + + delete config["icon"] + delete config["iconOverlays"] + delete config["label"] + delete config["iconSize"] + delete config["rotation"] + delete config["wayHandling"] + for (const mapRenderingElement of config.mapRendering) { if (mapRenderingElement["iconOverlays"] !== undefined) { mapRenderingElement["iconBadges"] = mapRenderingElement["iconOverlays"] diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json index a9c1d4599..3969e0e2d 100644 --- a/assets/layers/artwork/artwork.json +++ b/assets/layers/artwork/artwork.json @@ -63,15 +63,6 @@ } ] }, - "icon": { - "render": "./assets/themes/artwork/artwork.svg" - }, - "color": { - "render": "#0000ff" - }, - "width": { - "render": "10" - }, "description": { "en": "Diverse pieces of artwork", "nl": "Verschillende soorten kunstwerken", @@ -85,7 +76,6 @@ "id": "Beragam karya seni" }, "minzoom": 12, - "wayHandling": 2, "presets": [ { "tags": [ diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json index fd0519779..aa23992c7 100644 --- a/assets/layers/barrier/barrier.json +++ b/assets/layers/barrier/barrier.json @@ -47,8 +47,6 @@ } ] }, - "icon": "./assets/layers/barrier/barrier.svg", - "width": "5", "presets": [ { "title": { diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json index f9c2ad7aa..baf8e510a 100644 --- a/assets/layers/bench/bench.json +++ b/assets/layers/bench/bench.json @@ -22,7 +22,6 @@ "source": { "osmTags": "amenity=bench" }, - "wayHandling": 1, "title": { "render": { "en": "Bench", @@ -612,15 +611,6 @@ "id": "bench-survey:date" } ], - "icon": { - "render": "circle:#FE6F32;./assets/layers/bench/bench.svg" - }, - "iconSize": { - "render": "35,35,center" - }, - "color": { - "render": "#00f" - }, "presets": [ { "tags": [ diff --git a/assets/layers/bench_at_pt/bench_at_pt.json b/assets/layers/bench_at_pt/bench_at_pt.json index 1d008ba2c..645d990de 100644 --- a/assets/layers/bench_at_pt/bench_at_pt.json +++ b/assets/layers/bench_at_pt/bench_at_pt.json @@ -138,18 +138,6 @@ "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": [ { "icon": { diff --git a/assets/layers/bicycle_library/bicycle_library.json b/assets/layers/bicycle_library/bicycle_library.json index d4796c99b..a4c78a05a 100644 --- a/assets/layers/bicycle_library/bicycle_library.json +++ b/assets/layers/bicycle_library/bicycle_library.json @@ -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": [ { "icon": { diff --git a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json index 4df1ab6c2..dc67b90c9 100644 --- a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json +++ b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json @@ -37,22 +37,6 @@ }, "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": { "osmTags": { "and": [ @@ -62,7 +46,6 @@ } }, "minzoom": 13, - "wayHandling": 2, "presets": [ { "title": { @@ -83,7 +66,6 @@ ] } ], - "color": "#6bc4f7", "tagRenderings": [ "images", { diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json index 0a5776353..62fb4c4f6 100644 --- a/assets/layers/bike_cafe/bike_cafe.json +++ b/assets/layers/bike_cafe/bike_cafe.json @@ -332,18 +332,6 @@ "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": [ { "title": { @@ -365,7 +353,6 @@ ] } ], - "wayHandling": 2, "mapRendering": [ { "icon": { diff --git a/assets/layers/bike_cleaning/bike_cleaning.json b/assets/layers/bike_cleaning/bike_cleaning.json index fbf78c216..8fade5020 100644 --- a/assets/layers/bike_cleaning/bike_cleaning.json +++ b/assets/layers/bike_cleaning/bike_cleaning.json @@ -37,10 +37,6 @@ } ] }, - "icon": { - "render": "./assets/layers/bike_cleaning/bike_cleaning.svg" - }, - "iconSize": "50,50,bottom", "source": { "osmTags": { "or": [ @@ -51,7 +47,6 @@ } }, "minzoom": 13, - "wayHandling": 1, "presets": [ { "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": [ { "render": "" diff --git a/assets/layers/bike_parking/bike_parking.json b/assets/layers/bike_parking/bike_parking.json index f81577b00..a66a84fa2 100644 --- a/assets/layers/bike_parking/bike_parking.json +++ b/assets/layers/bike_parking/bike_parking.json @@ -22,13 +22,6 @@ ] } }, - "icon": { - "render": "./assets/layers/bike_parking/parking.svg" - }, - "iconSize": "40,40,bottom", - "color": "#00f", - "width": "1", - "wayHandling": 2, "presets": [ { "title": { diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json index 321f435e5..0e37ac26a 100644 --- a/assets/layers/bike_repair_station/bike_repair_station.json +++ b/assets/layers/bike_repair_station/bike_repair_station.json @@ -615,69 +615,6 @@ }, "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": [ { "title": { diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index 4ac500338..2e2004062 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -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": [ { "icon": { diff --git a/assets/layers/bike_themed_object/bike_themed_object.json b/assets/layers/bike_themed_object/bike_themed_object.json index 42af35fce..cc704319e 100644 --- a/assets/layers/bike_themed_object/bike_themed_object.json +++ b/assets/layers/bike_themed_object/bike_themed_object.json @@ -56,20 +56,7 @@ "phone", "opening_hours" ], - "icon": { - "render": "./assets/layers/bike_themed_object/other_services.svg" - }, - "width": { - "render": "2" - }, - "iconSize": { - "render": "50,50,bottom" - }, - "color": { - "render": "#AB76D5" - }, "presets": [], - "wayHandling": 2, "mapRendering": [ { "icon": { diff --git a/assets/layers/binocular/binocular.json b/assets/layers/binocular/binocular.json index 17eff96e8..2ad39b353 100644 --- a/assets/layers/binocular/binocular.json +++ b/assets/layers/binocular/binocular.json @@ -75,18 +75,6 @@ "id": "binocular-direction" } ], - "icon": { - "render": "circle:white;./assets/layers/binocular/telescope.svg" - }, - "width": { - "render": "8" - }, - "iconSize": { - "render": "40,40,center" - }, - "color": { - "render": "#00f" - }, "presets": [ { "tags": [ diff --git a/assets/layers/birdhide/birdhide.json b/assets/layers/birdhide/birdhide.json index d88a3cd08..83117e915 100644 --- a/assets/layers/birdhide/birdhide.json +++ b/assets/layers/birdhide/birdhide.json @@ -190,23 +190,6 @@ "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": { "freeform": { "addExtraTags": [] @@ -216,11 +199,6 @@ }, "mappings": [] }, - "color": { - "render": { - "nl": "#94bb28" - } - }, "stroke": { "render": { "nl": "3" @@ -255,7 +233,6 @@ } } ], - "wayHandling": 1, "filter": [ { "id": "wheelchair", diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json index e882e4d3d..d46750550 100644 --- a/assets/layers/cafe_pub/cafe_pub.json +++ b/assets/layers/cafe_pub/cafe_pub.json @@ -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": "
{name}
" - } - ] - }, "presets": [ { "tags": [ diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 1a3623620..b01e7a8f7 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -1916,7 +1916,6 @@ } } ], - "wayHandling": 1, "filter": [ { "id": "vehicle-type", diff --git a/assets/layers/cluster_style/cluster_style.json b/assets/layers/cluster_style/cluster_style.json index 1712fdb25..081cbb5d3 100644 --- a/assets/layers/cluster_style/cluster_style.json +++ b/assets/layers/cluster_style/cluster_style.json @@ -8,35 +8,6 @@ "tagRenderings": [ "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": "
{showCount}
", - "mappings": [ - { - "if": "showCount>1000", - "then": "
{kilocount}K
" - } - ] - }, "mapRendering": [ { "label": { diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json index d4ae7dc1e..984545be6 100644 --- a/assets/layers/crossings/crossings.json +++ b/assets/layers/crossings/crossings.json @@ -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": [ { "title": { diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json index 6e5aa00e4..82287015b 100644 --- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json +++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json @@ -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, "mapRendering": [ { diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json index 3210712d3..ac21247dc 100644 --- a/assets/layers/defibrillator/defibrillator.json +++ b/assets/layers/defibrillator/defibrillator.json @@ -30,16 +30,6 @@ "ru": "Дефибриллятор" } }, - "icon": { - "render": "./assets/themes/aed/aed.svg", - "mappings": [ - { - "if": "_recently_surveyed=true", - "then": "./assets/layers/defibrillator/aed_checked.svg" - } - ] - }, - "color": "#0000ff", "presets": [ { "title": { diff --git a/assets/layers/direction/direction.json b/assets/layers/direction/direction.json index 768d1a41f..c60322d11 100644 --- a/assets/layers/direction/direction.json +++ b/assets/layers/direction/direction.json @@ -28,24 +28,8 @@ "de": "Diese Ebene visualisiert Richtungen" }, "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", "presets": [], - "wayHandling": 2, "mapRendering": [ { "icon": { diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json index 47386e609..87b7cb1ab 100644 --- a/assets/layers/drinking_water/drinking_water.json +++ b/assets/layers/drinking_water/drinking_water.json @@ -22,22 +22,6 @@ "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": { "osmTags": { "and": [ @@ -53,7 +37,6 @@ "_closest_other_drinking_water_distance=Math.floor(Number(JSON.parse(feat.properties._closest_other_drinking_water)?.distance) * 1000)" ], "minzoom": 13, - "wayHandling": 1, "presets": [ { "title": { @@ -71,7 +54,6 @@ ] } ], - "color": "#6bc4f7", "tagRenderings": [ "images", { diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json index 773addd3a..b30b9ece5 100644 --- a/assets/layers/etymology/etymology.json +++ b/assets/layers/etymology/etymology.json @@ -139,40 +139,6 @@ }, "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": [ { "icon": { diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 38ed4e94e..063c916b2 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -14,52 +14,6 @@ } }, "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": "
{name}
" - } - ] - }, "presets": [ { "title": { diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json index 7463a4ba5..8e255b83d 100644 --- a/assets/layers/ghost_bike/ghost_bike.json +++ b/assets/layers/ghost_bike/ghost_bike.json @@ -58,11 +58,6 @@ } ] }, - "icon": "./assets/layers/ghost_bike/ghost_bike.svg", - "iconSize": "40,40,bottom", - "width": "5", - "color": "#000", - "wayHandling": 1, "presets": [ { "title": { diff --git a/assets/layers/grass_in_parks/grass_in_parks.json b/assets/layers/grass_in_parks/grass_in_parks.json index a9fb3608b..87ea8db0d 100644 --- a/assets/layers/grass_in_parks/grass_in_parks.json +++ b/assets/layers/grass_in_parks/grass_in_parks.json @@ -36,11 +36,6 @@ } ] }, - "icon": "./assets/themes/playgrounds/playground.svg", - "iconSize": "40,40,center", - "width": "1", - "color": "#0f0", - "wayHandling": 2, "tagRenderings": [ "images", { diff --git a/assets/layers/information_board/information_board.json b/assets/layers/information_board/information_board.json index fddd03b38..b482ff5b3 100644 --- a/assets/layers/information_board/information_board.json +++ b/assets/layers/information_board/information_board.json @@ -29,15 +29,6 @@ "tagRenderings": [ "images" ], - "icon": { - "render": "./assets/layers/information_board/board.svg" - }, - "iconSize": { - "render": "40,40,center" - }, - "color": { - "render": "#00f" - }, "presets": [ { "tags": [ diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json index b47d4691a..464ed658f 100644 --- a/assets/layers/map/map.json +++ b/assets/layers/map/map.json @@ -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": [ { "tags": [ @@ -228,7 +188,6 @@ } } ], - "wayHandling": 2, "deletion": { "softDeletionTags": { "and": [ diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json index e334ac3cb..3c1214523 100644 --- a/assets/layers/nature_reserve/nature_reserve.json +++ b/assets/layers/nature_reserve/nature_reserve.json @@ -400,19 +400,6 @@ }, "wikipedia" ], - "wayHandling": 2, - "icon": { - "render": "./assets/layers/nature_reserve/nature_reserve.svg" - }, - "width": { - "render": "1" - }, - "iconSize": { - "render": "50,50,center" - }, - "color": { - "render": "#3c3" - }, "presets": [ { "tags": [ diff --git a/assets/layers/observation_tower/observation_tower.json b/assets/layers/observation_tower/observation_tower.json index 0ddea7505..a5b2596a0 100644 --- a/assets/layers/observation_tower/observation_tower.json +++ b/assets/layers/observation_tower/observation_tower.json @@ -142,19 +142,6 @@ "wheelchair-access", "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": [ { "tags": [ diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json index 8e08cfd02..1b6629e76 100644 --- a/assets/layers/parking/parking.json +++ b/assets/layers/parking/parking.json @@ -42,22 +42,12 @@ } ] }, - "icon": { - "render": "./assets/layers/parking/parking.svg" - }, "description": { "nl": "Parking" }, "tagRenderings": [ "images" ], - "wayHandling": 1, - "iconSize": { - "render": "36,36,center" - }, - "color": { - "render": "#E1AD01" - }, "presets": [ { "tags": [ diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json index 0b5dc4fa3..b0ada5b1c 100644 --- a/assets/layers/picnic_table/picnic_table.json +++ b/assets/layers/picnic_table/picnic_table.json @@ -78,15 +78,6 @@ "id": "picnic_table-material" } ], - "icon": { - "render": "circle:#e6cf39;./assets/layers/picnic_table/picnic_table.svg" - }, - "iconSize": { - "render": "35,35,center" - }, - "color": { - "render": "#00f" - }, "presets": [ { "tags": [ @@ -102,7 +93,6 @@ } } ], - "wayHandling": 1, "deletion": { "softDeletionTags": { "and": [ diff --git a/assets/layers/play_forest/play_forest.json b/assets/layers/play_forest/play_forest.json index db0d9d17a..063669719 100644 --- a/assets/layers/play_forest/play_forest.json +++ b/assets/layers/play_forest/play_forest.json @@ -93,18 +93,6 @@ } ], "hideFromOverview": false, - "icon": { - "render": "./assets/layers/play_forest/icon.svg" - }, - "width": { - "render": "2" - }, - "iconSize": { - "render": "40,40,center" - }, - "color": { - "render": "#007055" - }, "presets": [ { "title": "Speelbos", @@ -116,7 +104,6 @@ "description": "Een zone in het bos, duidelijk gemarkeerd als speelzone met de overeenkomstige borden.
" } ], - "wayHandling": 2, "mapRendering": [ { "icon": { diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json index 6b4c0be4f..b6df6429a 100644 --- a/assets/layers/playground/playground.json +++ b/assets/layers/playground/playground.json @@ -480,48 +480,6 @@ "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": [ { "tags": [ @@ -537,7 +495,6 @@ } } ], - "wayHandling": 2, "deletion": { "softDeletionTags": { "and": [ diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json index 529ebb50b..ebb432d1a 100644 --- a/assets/layers/public_bookcase/public_bookcase.json +++ b/assets/layers/public_bookcase/public_bookcase.json @@ -20,7 +20,6 @@ "osmTags": "amenity=public_bookcase" }, "minzoom": 10, - "wayHandling": 2, "title": { "render": { "en": "Bookcase", @@ -44,23 +43,6 @@ } ] }, - "icon": { - "render": "./assets/themes/bookcases/bookcase.svg" - }, - "label": { - "mappings": [ - { - "if": "name~*", - "then": "
{name}
" - } - ] - }, - "color": { - "render": "#0000ff" - }, - "width": { - "render": "8" - }, "presets": [ { "title": { diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index 682925aee..b739986fb 100644 --- a/assets/layers/shops/shops.json +++ b/assets/layers/shops/shops.json @@ -324,25 +324,6 @@ "questions", "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": [ { "tags": [ @@ -368,7 +349,6 @@ } } ], - "wayHandling": 2, "deletion": { "softDeletionTags": { "and": [ diff --git a/assets/layers/slow_roads/slow_roads.json b/assets/layers/slow_roads/slow_roads.json index a9cc195f9..88be0f251 100644 --- a/assets/layers/slow_roads/slow_roads.json +++ b/assets/layers/slow_roads/slow_roads.json @@ -3,7 +3,6 @@ "name": { "nl": "Paadjes, trage wegen en autoluwe straten" }, - "icon": "./assets/layers/slow_roads/slow_road.svg", "minzoom": 16, "source": { "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": [], "mapRendering": [ { diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json index 833d950a8..f032aa36e 100644 --- a/assets/layers/sport_pitch/sport_pitch.json +++ b/assets/layers/sport_pitch/sport_pitch.json @@ -8,7 +8,6 @@ "it": "Campi sportivi", "de": "Sportplätze" }, - "wayHandling": 1, "minzoom": 12, "source": { "osmTags": { @@ -423,78 +422,6 @@ "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": [ { "title": { diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index c1aeebc03..22c1af368 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -453,56 +453,6 @@ "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": [ { "tags": [ @@ -512,7 +462,6 @@ "title": "Surveillance camera" } ], - "wayHandling": 2, "mapRendering": [ { "icon": { diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json index 5fe9010f6..1257902dc 100644 --- a/assets/layers/toilet/toilet.json +++ b/assets/layers/toilet/toilet.json @@ -22,28 +22,6 @@ "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": [ { "title": { diff --git a/assets/layers/trail/trail.json b/assets/layers/trail/trail.json index 21527bd4b..4ff87d105 100644 --- a/assets/layers/trail/trail.json +++ b/assets/layers/trail/trail.json @@ -179,41 +179,9 @@ "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": { "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": [ { "icon": { diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index a74877a88..d58972b87 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -506,37 +506,6 @@ "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": [ { "tags": [ diff --git a/assets/layers/viewpoint/viewpoint.json b/assets/layers/viewpoint/viewpoint.json index 67e5ae145..b3f077b74 100644 --- a/assets/layers/viewpoint/viewpoint.json +++ b/assets/layers/viewpoint/viewpoint.json @@ -21,10 +21,6 @@ "osmTags": "tourism=viewpoint" }, "minzoom": 14, - "icon": "./assets/layers/viewpoint/viewpoint.svg", - "iconSize": "20,20,center", - "color": "#ffffff", - "width": "5", "wayhandling": 2, "presets": [ { diff --git a/assets/layers/village_green/village_green.json b/assets/layers/village_green/village_green.json index e1e80220f..061ea1612 100644 --- a/assets/layers/village_green/village_green.json +++ b/assets/layers/village_green/village_green.json @@ -20,11 +20,6 @@ } ] }, - "icon": "./assets/themes/playgrounds/playground.svg", - "iconSize": "40,40,center", - "width": "1", - "color": "#937f20", - "wayHandling": 2, "tagRenderings": [ "images", { diff --git a/assets/layers/visitor_information_centre/visitor_information_centre.json b/assets/layers/visitor_information_centre/visitor_information_centre.json index 6211720f6..b968d2ce0 100644 --- a/assets/layers/visitor_information_centre/visitor_information_centre.json +++ b/assets/layers/visitor_information_centre/visitor_information_centre.json @@ -59,17 +59,7 @@ "de": "Ein Besucherzentrum bietet Informationen über eine bestimmte Attraktion oder Sehenswürdigkeit, an der es sich befindet." }, "tagRenderings": [], - "icon": { - "render": "./assets/layers/visitor_information_centre/information.svg" - }, - "iconSize": { - "render": "40,40,center" - }, - "color": { - "render": "#E64C00" - }, "presets": [], - "wayHandling": 1, "mapRendering": [ { "icon": { diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json index 6781f739f..49a365d2b 100644 --- a/assets/layers/waste_basket/waste_basket.json +++ b/assets/layers/waste_basket/waste_basket.json @@ -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": [ { "tags": [ diff --git a/assets/layers/watermill/watermill.json b/assets/layers/watermill/watermill.json index 4da74a1f4..5c55c8e76 100644 --- a/assets/layers/watermill/watermill.json +++ b/assets/layers/watermill/watermill.json @@ -163,16 +163,6 @@ "id": "Operator tag" } ], - "wayHandling": 1, - "icon": { - "render": "./assets/layers/watermill/watermill.svg" - }, - "iconSize": { - "render": "50,50,center" - }, - "color": { - "render": "#FFC0CB" - }, "mapRendering": [ { "icon": { diff --git a/assets/themes/aed/aed_brugge.json b/assets/themes/aed/aed_brugge.json index 0de0fcb89..c71b6f3f0 100644 --- a/assets/themes/aed/aed_brugge.json +++ b/assets/themes/aed/aed_brugge.json @@ -30,16 +30,6 @@ "_has_closeby_feature=Number(feat.properties._closest_osm_aed_distance) < 25 ? 'yes' : 'no'" ], "title": "AED in Brugse dataset", - "icon": { - "render": "circle:red", - "mappings": [ - { - "if": "_has_closeby_feature=yes", - "then": "circle:#008000aa" - } - ] - }, - "iconSize": "20,20,center", "tagRenderings": [ "all_tags" ], diff --git a/assets/themes/buurtnatuur/buurtnatuur.json b/assets/themes/buurtnatuur/buurtnatuur.json index dde19b991..cb644deb3 100644 --- a/assets/themes/buurtnatuur/buurtnatuur.json +++ b/assets/themes/buurtnatuur/buurtnatuur.json @@ -74,42 +74,6 @@ "tagRenderings": [ "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": [ { "tags": [ @@ -230,29 +194,6 @@ "tagRenderings": [ "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": [ { "tags": [ @@ -361,47 +302,6 @@ "tagRenderings": [ "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": [ { "tags": [ diff --git a/assets/themes/fruit_trees/fruit_trees.json b/assets/themes/fruit_trees/fruit_trees.json index b6af011b1..6e93dabe5 100644 --- a/assets/themes/fruit_trees/fruit_trees.json +++ b/assets/themes/fruit_trees/fruit_trees.json @@ -43,18 +43,6 @@ "tagRenderings": [ "images" ], - "icon": { - "render": "./assets/themes/buurtnatuur/forest.svg" - }, - "width": { - "render": "8" - }, - "iconSize": { - "render": "40,40,center" - }, - "color": { - "render": "#00f" - }, "presets": [ { "tags": [ @@ -167,18 +155,6 @@ "id": "fruitboom-ref" } ], - "icon": { - "render": "./assets/themes/fruit_trees/fruit_tree.svg" - }, - "width": { - "render": "8" - }, - "iconSize": { - "render": "40,40,center" - }, - "color": { - "render": "#00f" - }, "presets": [ { "tags": [ diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json index 6507e8b59..2a2d0b5f1 100644 --- a/assets/themes/uk_addresses/uk_addresses.json +++ b/assets/themes/uk_addresses/uk_addresses.json @@ -117,7 +117,7 @@ { "if": "_embedding_object:id=false", "then": { - "en":"The INSPIRE-polygon containing this point has no addresses contained" + "en": "The INSPIRE-polygon containing this point has no addresses contained" } } ], diff --git a/scripts/generateLayerOverview.ts b/scripts/generateLayerOverview.ts index da1a984b4..9d076dd84 100644 --- a/scripts/generateLayerOverview.ts +++ b/scripts/generateLayerOverview.ts @@ -47,6 +47,11 @@ class LayerOverviewUtils { if (layerJson["overpassTags"] !== undefined) { errorCount.push("Layer " + layerJson.id + "still uses the old 'overpassTags'-format. Please use \"source\": {\"osmTags\": }' instead of \"overpassTags\": (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 { const layer = new LayerConfig(layerJson, "test", true) const images = Array.from(layer.ExtractImages()) diff --git a/scripts/lint.ts b/scripts/lint.ts index 94a6df6c2..2d0498971 100644 --- a/scripts/lint.ts +++ b/scripts/lint.ts @@ -10,7 +10,7 @@ import LegacyJsonConvert from "../Models/ThemeConfig/LegacyJsonConvert"; const layerFiles = ScriptUtils.getLayerFiles(); for (const layerFile of layerFiles) { LegacyJsonConvert.fixLayerConfig(layerFile.parsed) - writeFileSync(layerFile.path, JSON.stringify(layerFile.parsed, null, " ")) + writeFileSync(layerFile.path, JSON.stringify(layerFile.parsed, null, " ")) } const themeFiles = ScriptUtils.getThemeFiles()