Restore the filtering in build script,

Add skipCollection for categories which should not do it (re: #4906)
osmlab · Feb 18, 2021 · 58d638f · 58d638f
1 parent 20e929f
commit 58d638f
Show file tree

Hide file tree

Showing 36 changed files with 1,778 additions and 24 deletions.
diff --git a/data/brands/amenity/animal_boarding.json b/data/brands/amenity/animal_boarding.json
@@ -4,6 +4,16 @@
     "exclude": {"generic": ["^animal boarding$"]}
   },
   "items": [
+    {
+      "displayName": "Kandang Ayam",
+      "id": "kandangayam-cc7864",
+      "locationSet": {"include": ["001"]},
+      "tags": {
+        "amenity": "animal_boarding",
+        "brand": "Kandang Ayam",
+        "name": "Kandang Ayam"
+      }
+    },
     {
       "displayName": "PetsHotel",
       "id": "petshotel-03770a",

diff --git a/data/brands/amenity/atm.json b/data/brands/amenity/atm.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/atm",
+    "skipCollection": true,
     "exclude": {"generic": ["^atm$"]}
   },
   "items": [

diff --git a/data/brands/amenity/bar.json b/data/brands/amenity/bar.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/bar",
+    "skipCollection": true,
     "exclude": {
       "generic": ["^bar$"],
       "named": ["^уют$"]

diff --git a/data/brands/amenity/car_wash.json b/data/brands/amenity/car_wash.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/car_wash",
+    "skipCollection": true,
     "exclude": {"generic": ["^car wash$"]}
   },
   "items": [

diff --git a/data/brands/amenity/childcare.json b/data/brands/amenity/childcare.json
@@ -1,9 +1,23 @@
 {
   "properties": {
     "path": "brands/amenity/childcare",
-    "exclude": {"generic": ["^childcare$"]}
+    "exclude": {
+      "generic": [
+        "^(childcare|day\\s?care center)$"
+      ]
+    }
   },
   "items": [
+    {
+      "displayName": "CEN-CINAI",
+      "id": "cencinai-bc5258",
+      "locationSet": {"include": ["001"]},
+      "tags": {
+        "amenity": "childcare",
+        "brand": "CEN-CINAI",
+        "name": "CEN-CINAI"
+      }
+    },
     {
       "displayName": "Kidango",
       "id": "kidango-fd7b3f",

diff --git a/data/brands/amenity/college.json b/data/brands/amenity/college.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/college",
+    "skipCollection": true,
     "exclude": {"generic": ["^college$"]}
   },
   "items": [

diff --git a/data/brands/amenity/doctors.json b/data/brands/amenity/doctors.json
@@ -1,7 +1,8 @@
 {
   "properties": {
     "path": "brands/amenity/doctors",
-    "exclude": {"generic": ["^doctors$"]}
+    "skipCollection": true,
+    "exclude": {"generic": ["^doctors?$"]}
   },
   "items": [
     {

diff --git a/data/brands/amenity/fuel.json b/data/brands/amenity/fuel.json
@@ -3050,6 +3050,16 @@
         "name": "Pompe Bianche"
       }
     },
+    {
+      "displayName": "Posto Petrobras",
+      "id": "postopetrobras-b3d110",
+      "locationSet": {"include": ["001"]},
+      "tags": {
+        "amenity": "fuel",
+        "brand": "Posto Petrobras",
+        "name": "Posto Petrobras"
+      }
+    },
     {
       "displayName": "Power",
       "id": "power-a23ac0",
@@ -3648,6 +3658,16 @@
         "name": "SP"
       }
     },
+    {
+      "displayName": "SPBU Pertamina",
+      "id": "spbupertamina-b3d110",
+      "locationSet": {"include": ["001"]},
+      "tags": {
+        "amenity": "fuel",
+        "brand": "SPBU Pertamina",
+        "name": "SPBU Pertamina"
+      }
+    },
     {
       "displayName": "Speedway",
       "id": "speedway-b3d110",

diff --git a/data/brands/amenity/ice_cream.json b/data/brands/amenity/ice_cream.json
@@ -197,6 +197,16 @@
         "name": "D'Onofrio"
       }
     },
+    {
+      "displayName": "Eiscafé Venezia",
+      "id": "eiscafevenezia-87d971",
+      "locationSet": {"include": ["001"]},
+      "tags": {
+        "amenity": "ice_cream",
+        "brand": "Eiscafé Venezia",
+        "name": "Eiscafé Venezia"
+      }
+    },
     {
       "displayName": "Freddo",
       "id": "freddo-3a94a6",

diff --git a/data/brands/amenity/internet_cafe.json b/data/brands/amenity/internet_cafe.json
@@ -1,13 +1,21 @@
 {
   "properties": {
     "path": "brands/amenity/internet_cafe",
-    "exclude": {"generic": ["^internet cafe$"]}
+    "exclude": {
+      "generic": [
+        "^(internet|cyber)\\s?(caf(e|é))?$"
+      ]
+    }
   },
   "items": [
     {
       "displayName": "Akshaya",
       "id": "akshaya-ec41bc",
       "locationSet": {"include": ["in"]},
+      "matchNames": [
+        "akshaya center",
+        "akshaya centre"
+      ],
       "tags": {
         "amenity": "internet_cafe",
         "brand": "Akshaya",

diff --git a/data/brands/amenity/kindergarten.json b/data/brands/amenity/kindergarten.json
@@ -1,7 +1,12 @@
 {
   "properties": {
     "path": "brands/amenity/kindergarten",
-    "exclude": {"generic": ["^kindergarten$"]}
+    "skipCollection": true,
+    "exclude": {
+      "generic": [
+        "^(kindergarten|day\\s?care center)$"
+      ]
+    }
   },
   "items": [
     {

diff --git a/data/brands/amenity/money_transfer.json b/data/brands/amenity/money_transfer.json
@@ -33,6 +33,26 @@
         "name:vi": "Hoa Phát"
       }
     },
+    {
+      "displayName": "Mobil Money",
+      "id": "mobilmoney-1032f8",
+      "locationSet": {"include": ["001"]},
+      "tags": {
+        "amenity": "money_transfer",
+        "brand": "Mobil Money",
+        "name": "Mobil Money"
+      }
+    },
+    {
+      "displayName": "Mobile Money",
+      "id": "mobilemoney-1032f8",
+      "locationSet": {"include": ["001"]},
+      "tags": {
+        "amenity": "money_transfer",
+        "brand": "Mobile Money",
+        "name": "Mobile Money"
+      }
+    },
     {
       "displayName": "MoneyGram",
       "id": "moneygram-11f94e",

diff --git a/data/brands/amenity/music_school.json b/data/brands/amenity/music_school.json
@@ -1,7 +1,11 @@
 {
   "properties": {
     "path": "brands/amenity/music_school",
-    "exclude": {"generic": ["^music school$"]}
+    "exclude": {
+      "generic": [
+        "^(music school|école de musique|музыкальная школа)$"
+      ]
+    }
   },
   "items": [
     {