From 00e2f56d3e85b84bc3fe8e510b82b78ff5f613e7 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Mon, 26 Jul 2021 10:37:11 +0200 Subject: [PATCH] Remove all old 'hideUnderlayingFeaturePercentages' as they aren't used anymore; check in script; fix #431 --- assets/layers/bench/bench.json | 1 - assets/layers/bench_at_pt/bench_at_pt.json | 1 - assets/layers/bicycle_library/bicycle_library.json | 1 - assets/layers/bike_cafe/bike_cafe.json | 1 - .../bike_monitoring_station/bike_monitoring_station.json | 1 - assets/layers/bike_shop/bike_shop.json | 1 - assets/layers/bike_themed_object/bike_themed_object.json | 1 - assets/layers/information_board/information_board.json | 1 - assets/layers/map/map.json | 1 - assets/layers/nature_reserve/nature_reserve.json | 1 - assets/layers/picnic_table/picnic_table.json | 1 - assets/layers/play_forest/play_forest.json | 1 - assets/layers/playground/playground.json | 1 - assets/layers/slow_roads/slow_roads.json | 1 - assets/layers/sport_pitch/sport_pitch.json | 1 - assets/layers/surveillance_camera/surveillance_camera.json | 1 - assets/layers/tree_node/tree_node.json | 1 - assets/themes/campersite/campersite.json | 2 -- assets/themes/charging_stations/charging_stations.json | 1 - assets/themes/climbing/climbing.json | 5 ----- assets/themes/facadegardens/facadegardens.json | 1 - assets/themes/fruit_trees/fruit_trees.json | 2 -- assets/themes/grb.json | 1 - assets/themes/hailhydrant/hailhydrant.json | 4 ---- assets/themes/shops/shops.json | 1 - assets/themes/widths/width.json | 1 - scripts/generateLayerOverview.ts | 4 ++++ 27 files changed, 4 insertions(+), 35 deletions(-) diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json index 312b21cfcc..1eacb6f63b 100644 --- a/assets/layers/bench/bench.json +++ b/assets/layers/bench/bench.json @@ -517,7 +517,6 @@ ] } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/benches/bench_poi.svg", "mappings": [] diff --git a/assets/layers/bench_at_pt/bench_at_pt.json b/assets/layers/bench_at_pt/bench_at_pt.json index bb2661e25f..fc80219b38 100644 --- a/assets/layers/bench_at_pt/bench_at_pt.json +++ b/assets/layers/bench_at_pt/bench_at_pt.json @@ -126,7 +126,6 @@ } } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/benches/bench_public_transport.svg" }, diff --git a/assets/layers/bicycle_library/bicycle_library.json b/assets/layers/bicycle_library/bicycle_library.json index d56f3bc428..dd9ec5741c 100644 --- a/assets/layers/bicycle_library/bicycle_library.json +++ b/assets/layers/bicycle_library/bicycle_library.json @@ -210,7 +210,6 @@ }, "description" ], - "hideUnderlayingFeaturesMinPercentage": 1, "presets": [ { "title": { diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json index 30dcb1760a..9bf3d61a82 100644 --- a/assets/layers/bike_cafe/bike_cafe.json +++ b/assets/layers/bike_cafe/bike_cafe.json @@ -293,7 +293,6 @@ } } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/layers/bike_cafe/bike_cafe.svg" }, diff --git a/assets/layers/bike_monitoring_station/bike_monitoring_station.json b/assets/layers/bike_monitoring_station/bike_monitoring_station.json index 34b4d1b630..86209610e3 100644 --- a/assets/layers/bike_monitoring_station/bike_monitoring_station.json +++ b/assets/layers/bike_monitoring_station/bike_monitoring_station.json @@ -63,7 +63,6 @@ } } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/layers/bike_monitoring_station/monitoring_station.svg" }, diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index 7f60ced897..c974ab3395 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -601,7 +601,6 @@ ] } ], - "hideUnderlayingFeaturesMinPercentage": 1, "presets": [ { "title": { diff --git a/assets/layers/bike_themed_object/bike_themed_object.json b/assets/layers/bike_themed_object/bike_themed_object.json index e3960b9d69..bae9e790ec 100644 --- a/assets/layers/bike_themed_object/bike_themed_object.json +++ b/assets/layers/bike_themed_object/bike_themed_object.json @@ -56,7 +56,6 @@ "phone", "opening_hours" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/layers/bike_themed_object/other_services.svg" }, diff --git a/assets/layers/information_board/information_board.json b/assets/layers/information_board/information_board.json index 017f3aeb63..48f0ab6a4a 100644 --- a/assets/layers/information_board/information_board.json +++ b/assets/layers/information_board/information_board.json @@ -29,7 +29,6 @@ "tagRenderings": [ "images" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/layers/information_board/board.svg" }, diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json index 2c3cf3ea74..453a7f0b7f 100644 --- a/assets/layers/map/map.json +++ b/assets/layers/map/map.json @@ -159,7 +159,6 @@ } } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/layers/map/map.svg", "mappings": [ diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json index a0fd58df80..15d6e57f10 100644 --- a/assets/layers/nature_reserve/nature_reserve.json +++ b/assets/layers/nature_reserve/nature_reserve.json @@ -383,7 +383,6 @@ ] } ], - "hideUnderlayingFeaturesMinPercentage": 10, "wayHandling": 2, "icon": { "render": "./assets/themes/buurtnatuur/nature_reserve.svg" diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json index 672e41f07f..a22c76353c 100644 --- a/assets/layers/picnic_table/picnic_table.json +++ b/assets/layers/picnic_table/picnic_table.json @@ -72,7 +72,6 @@ ] } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "circle:#e6cf39;./assets/layers/picnic_table/picnic_table.svg" }, diff --git a/assets/layers/play_forest/play_forest.json b/assets/layers/play_forest/play_forest.json index eed73151f8..5bbc4b5125 100644 --- a/assets/layers/play_forest/play_forest.json +++ b/assets/layers/play_forest/play_forest.json @@ -87,7 +87,6 @@ "render": "{reviews(name, play_forest)}" } ], - "hideUnderlayingFeaturesMinPercentage": 0, "hideFromOverview": false, "icon": { "render": "./assets/layers/play_forest/icon.svg" diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json index ec97eca2bf..f8f4c0027a 100644 --- a/assets/layers/playground/playground.json +++ b/assets/layers/playground/playground.json @@ -437,7 +437,6 @@ "render": "{reviews(name, playground)}" } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/playgrounds/playground.svg" }, diff --git a/assets/layers/slow_roads/slow_roads.json b/assets/layers/slow_roads/slow_roads.json index 7ee9e2ba9c..9c7d6e237d 100644 --- a/assets/layers/slow_roads/slow_roads.json +++ b/assets/layers/slow_roads/slow_roads.json @@ -215,7 +215,6 @@ ] } ], - "hideUnderlayingFeaturesMinPercentage": 0, "width": { "render": "7" }, diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json index 140e222b2a..b871523f70 100644 --- a/assets/layers/sport_pitch/sport_pitch.json +++ b/assets/layers/sport_pitch/sport_pitch.json @@ -383,7 +383,6 @@ "render": "{reviews(name, sportpitch)}" } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "circle:white;./assets/layers/sport_pitch/sport_pitch.svg", "mappings": [ diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index 20f1e77bf0..77fed82afb 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -421,7 +421,6 @@ ] } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/surveillance_cameras/logo.svg", "mappings": [ diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index 1f3cc7fdeb..432e3c634c 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -449,7 +449,6 @@ } } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "circle:#ffffff;./assets/themes/trees/unknown.svg", "mappings": [ diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json index cc248f2780..63192c55bf 100644 --- a/assets/themes/campersite/campersite.json +++ b/assets/themes/campersite/campersite.json @@ -521,7 +521,6 @@ "questions", "reviews" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "circle:white;./assets/themes/campersites/caravan.svg", "mappings": [ @@ -862,7 +861,6 @@ } } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "circle:white;./assets/themes/campersites/sanitary_dump_station.svg" }, diff --git a/assets/themes/charging_stations/charging_stations.json b/assets/themes/charging_stations/charging_stations.json index 16bc127864..3fe101f089 100644 --- a/assets/themes/charging_stations/charging_stations.json +++ b/assets/themes/charging_stations/charging_stations.json @@ -307,7 +307,6 @@ ] } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "pin:#fff;./assets/themes/charging_stations/plug.svg", "mappings": [ diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index fbf13310c3..7b4cc30bc9 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -140,7 +140,6 @@ "phone", "opening_hours" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/climbing/club.svg" }, @@ -280,7 +279,6 @@ "opening_hours", "reviews" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/climbing/climbing_gym.svg" }, @@ -471,7 +469,6 @@ }, "reviews" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "circle:white;./assets/themes/climbing/climbing_route.svg" }, @@ -695,7 +692,6 @@ }, "reviews" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/climbing/climbing_no_rope.svg" }, @@ -850,7 +846,6 @@ } ], "icon": "./assets/themes/climbing/climbing_unknown.svg", - "hideUnderlayingFeaturesMinPercentage": 0, "width": { "render": "2" }, diff --git a/assets/themes/facadegardens/facadegardens.json b/assets/themes/facadegardens/facadegardens.json index 8cc9369815..c69fb08e29 100644 --- a/assets/themes/facadegardens/facadegardens.json +++ b/assets/themes/facadegardens/facadegardens.json @@ -330,7 +330,6 @@ } } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "circle:white;./assets/themes/facadegardens/geveltuin.svg", "mappings": [ diff --git a/assets/themes/fruit_trees/fruit_trees.json b/assets/themes/fruit_trees/fruit_trees.json index d16dd377be..bf12bbeca2 100644 --- a/assets/themes/fruit_trees/fruit_trees.json +++ b/assets/themes/fruit_trees/fruit_trees.json @@ -43,7 +43,6 @@ "tagRenderings": [ "images" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/buurtnatuur/forest.svg" }, @@ -143,7 +142,6 @@ } } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/fruit_trees/fruit_tree.svg" }, diff --git a/assets/themes/grb.json b/assets/themes/grb.json index 7f38732af7..536b694e75 100644 --- a/assets/themes/grb.json +++ b/assets/themes/grb.json @@ -173,7 +173,6 @@ } } ], - "hideUnderlayingFeaturesMinPercentage": 0, "label": { "mappings": [ { diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json index d465b72eb2..fc74cd62c9 100644 --- a/assets/themes/hailhydrant/hailhydrant.json +++ b/assets/themes/hailhydrant/hailhydrant.json @@ -258,7 +258,6 @@ }, "images" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/hailhydrant/hydrant.svg" }, @@ -365,7 +364,6 @@ }, "images" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg" }, @@ -568,7 +566,6 @@ }, "images" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg" }, @@ -744,7 +741,6 @@ }, "images" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/hailhydrant/Twemoji_1f691.svg" }, diff --git a/assets/themes/shops/shops.json b/assets/themes/shops/shops.json index 571d0e1b6d..5acddf6b79 100644 --- a/assets/themes/shops/shops.json +++ b/assets/themes/shops/shops.json @@ -305,7 +305,6 @@ "questions", "reviews" ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/shops/shop.svg" }, diff --git a/assets/themes/widths/width.json b/assets/themes/widths/width.json index 298b9a1281..bf8f9b7665 100644 --- a/assets/themes/widths/width.json +++ b/assets/themes/widths/width.json @@ -144,7 +144,6 @@ "render": "{_width:needed}m nodig in het totaal" } ], - "hideUnderlayingFeaturesMinPercentage": 0, "icon": { "render": "./assets/themes/widths/icon.svg" }, diff --git a/scripts/generateLayerOverview.ts b/scripts/generateLayerOverview.ts index 3ea75e290f..f35f7c6433 100644 --- a/scripts/generateLayerOverview.ts +++ b/scripts/generateLayerOverview.ts @@ -56,6 +56,10 @@ class LayerOverviewUtils { if (path != undefined && path.indexOf(expected) < 0) { errorCount.push("Layer is in an incorrect place. The path is " + path + ", but expected " + expected) } + if(layerJson["hideUnderlayingFeaturesMinPercentage"] !== undefined){ + errorCount.push("Layer "+layer.id+" contains an old 'hideUnderlayingFeaturesMinPercentage'") + } + for (const image of images) { if (image.indexOf("{") >= 0) {