Remove all old 'hideUnderlayingFeaturePercentages' as they aren't used anymore; check in script; fix #431

2021-07-26 10:37:11 +02:00 · 2021-07-26 10:37:11 +02:00 · 00e2f56d3e
commit 00e2f56d3e
parent 177649614d
27 changed files with 4 additions and 35 deletions
--- 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": []
--- 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"
  },
--- 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": {
--- 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"
  },
--- 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"
  },
--- a/assets/layers/bike_shop/bike_shop.json
+++ b/assets/layers/bike_shop/bike_shop.json
@ -601,7 +601,6 @@
      ]
    }
  ],
-  "hideUnderlayingFeaturesMinPercentage": 1,
  "presets": [
    {
      "title": {
--- 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"
  },
--- 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"
  },
--- 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": [
--- 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"
--- 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"
  },
--- 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"
--- 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"
  },
--- 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"
  },
--- 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": [
--- 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": [
--- 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": [
--- 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"
      },
--- 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": [
--- 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"
      },
--- 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": [
--- 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"
      },
--- a/assets/themes/grb.json
+++ b/assets/themes/grb.json
@ -173,7 +173,6 @@
          }
        }
      ],
-      "hideUnderlayingFeaturesMinPercentage": 0,
      "label": {
        "mappings": [
          {
--- 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"
      },
--- 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"
      },
--- a/assets/themes/widths/width.json
+++ b/assets/themes/widths/width.json
@ -144,7 +144,6 @@
          "render": "<span style='border: 1px solid black; border-radius: 0.5em; padding: 0.25em;'><b>{_width:needed}m</b> nodig in het totaal</span>"
        }
      ],
-      "hideUnderlayingFeaturesMinPercentage": 0,
      "icon": {
        "render": "./assets/themes/widths/icon.svg"
      },
--- 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) {