Fix: use 'isCounted' instead of 'doCount', add check for this

pietervdvn · Sep 19, 2024 · 3a8fc42 · 3a8fc42
1 parent a6598fd
commit 3a8fc42
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/assets/layers/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json
@@ -153,5 +153,5 @@
     "en": "a wall, cliff or rock",
     "de": "eine Wand, eine Klippe oder einen Felsen"
   },
-  "doCount": false
+  "isCounted": false
 }
diff --git a/assets/themes/atm/atm.json b/assets/themes/atm/atm.json
@@ -63,7 +63,7 @@
         "filter": {
           "sameAs": "banks_with_atm"
         },
-        "doCount": false
+        "isCounted": false
       }
     },
     {

diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json
@@ -56,7 +56,7 @@
         "osmTags": "building~*"
       },
       "minzoom": 18,
-      "doCount": false,
+      "isCounted": false,
       "calculatedTags": [
         "_surface:strict:=feat(get)('_surface')"
       ],
@@ -152,7 +152,8 @@
           }
         }
       ],
-      "allowMove": false
+      "allowMove": false,
+      "isCounted": false
     },
     {
       "id": "osm_adresses",
@@ -171,7 +172,6 @@
         }
       },
       "minzoom": 18,
-      "doCount": false,
       "pointRendering": [
         {
           "label": {
@@ -191,7 +191,8 @@
           }
         }
       ],
-      "allowMove": false
+      "allowMove": false,
+      "isCounted": false
     },
     {
       "id": "bag_pand",

diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json
@@ -395,7 +395,7 @@
         },
         "minzoom": 16,
         "name": null,
-        "doCount": false,
+        "isCounted": false,
         "+tagRenderings": [
           {
             "id": "repairs_climbing_shoes",
@@ -470,7 +470,7 @@
       ],
       "override": {
         "minzoom": 15,
-        "doCount": false,
+        "isCounted": false,
         "pointRendering": [
           {
             "iconSize": "30,30"

diff --git a/assets/themes/grb/grb.json b/assets/themes/grb/grb.json
@@ -275,7 +275,8 @@
           }
         }
       ],
-      "allowMove": false
+      "allowMove": false,
+      "isCounted": false
     },
     {
       "id": "grb",
@@ -606,7 +607,8 @@
           "fill": "no"
         }
       ],
-      "allowMove": false
+      "allowMove": false,
+      "isCounted": false
     },
     "address",
     {

diff --git a/src/Models/ThemeConfig/Conversion/PrevalidateLayer.ts b/src/Models/ThemeConfig/Conversion/PrevalidateLayer.ts
@@ -88,6 +88,10 @@ export class PrevalidateLayer extends DesugaringStep<LayerConfigJson> {
             }
         }
 
+        if(json["doCount"] !== undefined){
+            context.err("Detected 'doCount'. did you mean: isCounted ?")
+        }
+
         if (
             json.syncSelection !== undefined &&
             LayerConfig.syncSelectionAllowed.indexOf(json.syncSelection) < 0