From ce87edf80009bd65c9f185d9ff68b023c5486adc Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Thu, 19 Sep 2024 18:48:03 +0200
Subject: [PATCH] Fix: don't add buildings to database, reevaluate builddb
 script

---
 assets/themes/grb/grb.json                         | 2 +-
 assets/themes/healthcare/healthcare.json           | 2 +-
 assets/themes/openlovemap/openlovemap.json         | 8 ++++----
 assets/themes/velopark/velopark.json               | 4 ++--
 assets/themes/vending_machine/vending_machine.json | 8 ++++----
 scripts/osm2pgsql/generateBuildDbScript.ts         | 4 +++-
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/assets/themes/grb/grb.json b/assets/themes/grb/grb.json
index 9dcdca18a..7da6995b4 100644
--- a/assets/themes/grb/grb.json
+++ b/assets/themes/grb/grb.json
@@ -789,7 +789,7 @@
   ],
   "overrideAll": {
     "minzoom": 17,
-    "doCount": false
+    "isCounted": false
   },
   "overpassMaxZoom": 15,
   "osmApiTileSize": 17,
diff --git a/assets/themes/healthcare/healthcare.json b/assets/themes/healthcare/healthcare.json
index afbdb3bfa..41b9686f8 100644
--- a/assets/themes/healthcare/healthcare.json
+++ b/assets/themes/healthcare/healthcare.json
@@ -120,7 +120,7 @@
       "override": {
         "=presets": [],
         "name": null,
-        "doCount": false,
+        "isCounted": false,
         "minzoom": 18
       }
     }
diff --git a/assets/themes/openlovemap/openlovemap.json b/assets/themes/openlovemap/openlovemap.json
index 869e3d830..e84eefafe 100644
--- a/assets/themes/openlovemap/openlovemap.json
+++ b/assets/themes/openlovemap/openlovemap.json
@@ -112,7 +112,7 @@
         "minzoom": 18,
         "=presets": [],
         "=name": null,
-        "doCount": false,
+        "isCounted": false,
         "=filter": {
           "sameAs": "erotic_shop"
         }
@@ -188,7 +188,7 @@
       "override": {
         "minzoom": 18,
         "=presets": [],
-        "doCount": false,
+        "isCounted": false,
         "=name": null
       }
     },
@@ -267,7 +267,7 @@
       "override": {
         "minzoom": 18,
         "=presets": [],
-        "doCount": false,
+        "isCounted": false,
         "=name": null
       }
     },
@@ -302,7 +302,7 @@
             ]
           }
         ],
-        "doCount": false,
+        "isCounted": false,
         "=presets": []
       }
     }
diff --git a/assets/themes/velopark/velopark.json b/assets/themes/velopark/velopark.json
index 47799add7..a27ccf7b0 100644
--- a/assets/themes/velopark/velopark.json
+++ b/assets/themes/velopark/velopark.json
@@ -397,7 +397,7 @@
         "leftover-questions"
       ],
       "override": {
-        "doCount": false,
+        "isCounted": false,
         "minzoom": 14,
         "+tagRenderings": [
           "questions",
@@ -427,7 +427,7 @@
         "+tagRenderings": [
           "questions"
         ],
-        "doCount": false,
+        "isCounted": false,
         "minzoom": 18
       }
     },
diff --git a/assets/themes/vending_machine/vending_machine.json b/assets/themes/vending_machine/vending_machine.json
index 6806429f9..2dd0bd3b4 100644
--- a/assets/themes/vending_machine/vending_machine.json
+++ b/assets/themes/vending_machine/vending_machine.json
@@ -35,7 +35,7 @@
       "override": {
         "id": "all_vending_machine",
         "name": null,
-        "doCount": false,
+        "isCounted": false,
         "filter": {
           "sameAs": "vending_machine"
         },
@@ -54,7 +54,7 @@
     {
       "builtin": "parking_ticket_machine",
       "override": {
-        "doCount": false,
+        "isCounted": false,
         "name": null,
         "minzoom": 18
       }
@@ -62,7 +62,7 @@
     {
       "builtin": "elongated_coin",
       "override": {
-        "doCount": false,
+        "isCounted": false,
         "name": null,
         "minzoom": 18
       }
@@ -70,7 +70,7 @@
     {
       "builtin": "ticket_machine",
       "override": {
-        "doCount": false,
+        "isCounted": false,
         "name": null,
         "minzoom": 18
       }
diff --git a/scripts/osm2pgsql/generateBuildDbScript.ts b/scripts/osm2pgsql/generateBuildDbScript.ts
index 8a727a6a6..4eee2e69b 100644
--- a/scripts/osm2pgsql/generateBuildDbScript.ts
+++ b/scripts/osm2pgsql/generateBuildDbScript.ts
@@ -43,9 +43,11 @@ class LuaSnippets {
                 or.push(new RegexTag(k, v))
             })
         })
+       const features = or.map((t) => t.asHumanString(false, false, {}))
+        features.sort()
         console.log(
             "Polygon features are:",
-            or.map((t) => t.asHumanString(false, false, {}))
+            features
         )
         return { blacklist: new Or(blacklisted), whitelisted: new Or(or) }
     }