From 58d638f4fea72e7a1b0b46e3bb66ef7a58c9118d Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 18 Feb 2021 15:15:15 -0500 Subject: [PATCH] Restore the filtering in build script, Add skipCollection for categories which should not do it (re: #4906) --- data/brands/amenity/animal_boarding.json | 10 + data/brands/amenity/atm.json | 1 + data/brands/amenity/bar.json | 1 + data/brands/amenity/car_wash.json | 1 + data/brands/amenity/childcare.json | 16 +- data/brands/amenity/college.json | 1 + data/brands/amenity/doctors.json | 3 +- data/brands/amenity/fuel.json | 20 + data/brands/amenity/ice_cream.json | 10 + data/brands/amenity/internet_cafe.json | 10 +- data/brands/amenity/kindergarten.json | 7 +- data/brands/amenity/money_transfer.json | 20 + data/brands/amenity/music_school.json | 6 +- data/brands/amenity/pub.json | 672 ++++++++++++++++++++ data/brands/amenity/recycling.json | 160 +++++ data/brands/amenity/school.json | 1 + data/brands/amenity/university.json | 1 + data/brands/amenity/vehicle_inspection.json | 50 ++ data/brands/craft/carpenter.json | 50 ++ data/brands/craft/electronics_repair.json | 30 + data/brands/craft/plumber.json | 30 + data/brands/leisure/dog_park.json | 4 +- data/brands/leisure/playground.json | 1 + data/brands/leisure/sports_centre.json | 390 ++++++++++++ data/brands/office/energy_supplier.json | 20 + data/brands/shop/lottery.json | 47 +- data/brands/shop/mobile_phone.json | 6 +- data/brands/tourism/caravan_site.json | 30 + data/operators/amenity/bicycle_parking.json | 1 + data/operators/amenity/parking.json | 1 + data/operators/amenity/post_box.json | 1 + data/transit/route/bus.json | 10 + data/transit/route/ferry.json | 150 +++++ lib/file_tree.js | 7 +- schema/items.json | 6 + scripts/build_index.js | 28 +- 36 files changed, 1778 insertions(+), 24 deletions(-) diff --git a/data/brands/amenity/animal_boarding.json b/data/brands/amenity/animal_boarding.json index 9b5f686449b..ed1d9b01311 100644 --- 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 index 3e6b35b5416..60193399cdd 100644 --- 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 index bac7f5fd909..c351e1eb628 100644 --- 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 index a24cd56d9bd..f449b84e6df 100644 --- 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 index edfb56f0f06..a8f4a757574 100644 --- 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 index 3fe408efdec..0f03993e5da 100644 --- 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 index 5a223b9643c..351048f801d 100644 --- 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 index af0065fa766..04ba6051560 100644 --- 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 index 81a0b77c0c6..8b4011e8036 100644 --- 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 index c8ee664a7ad..9f3892b54c0 100644 --- 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 index cccbbc1b028..3e42fb124fd 100644 --- 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 index cc924cc063e..0c5b672eafb 100644 --- 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 index 7e711de5d7b..c412c6795f4 100644 --- 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": [ { diff --git a/data/brands/amenity/pub.json b/data/brands/amenity/pub.json index 708419fb610..773018d9a12 100644 --- a/data/brands/amenity/pub.json +++ b/data/brands/amenity/pub.json @@ -4,6 +4,26 @@ "exclude": {"generic": ["^pub$"]} }, "items": [ + { + "displayName": "Bistrot", + "id": "bistrot-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Bistrot", + "name": "Bistrot" + } + }, + { + "displayName": "Black Horse", + "id": "blackhorse-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Black Horse", + "name": "Black Horse" + } + }, { "displayName": "Brewers Fayre", "id": "brewersfayre-eaed91", @@ -16,6 +36,26 @@ "cuisine": "british" } }, + { + "displayName": "Buvette", + "id": "buvette-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Buvette", + "name": "Buvette" + } + }, + { + "displayName": "Cave", + "id": "cave-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Cave", + "name": "Cave" + } + }, { "displayName": "Chef & Brewer", "id": "chefandbrewer-eaed91", @@ -27,6 +67,36 @@ "brand:wikipedia": "en:Chef & Brewer" } }, + { + "displayName": "Coach and Horses", + "id": "coachandhorses-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Coach and Horses", + "name": "Coach and Horses" + } + }, + { + "displayName": "Cross Keys", + "id": "crosskeys-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Cross Keys", + "name": "Cross Keys" + } + }, + { + "displayName": "Crown Inn", + "id": "crowninn-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Crown Inn", + "name": "Crown Inn" + } + }, { "displayName": "Ezītis miglā", "id": "ezitismigla-f4b906", @@ -83,6 +153,66 @@ "brand:wikipedia": "en:Hungry Horse" } }, + { + "displayName": "Irish Pub", + "id": "irishpub-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Irish Pub", + "name": "Irish Pub" + } + }, + { + "displayName": "Italbolt", + "id": "italbolt-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Italbolt", + "name": "Italbolt" + } + }, + { + "displayName": "Kings Arms", + "id": "kingsarms-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Kings Arms", + "name": "Kings Arms" + } + }, + { + "displayName": "Kings Head", + "id": "kingshead-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Kings Head", + "name": "Kings Head" + } + }, + { + "displayName": "Kocsma", + "id": "kocsma-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Kocsma", + "name": "Kocsma" + } + }, + { + "displayName": "Maquis", + "id": "maquis-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Maquis", + "name": "Maquis" + } + }, { "displayName": "MásQMenos", "id": "masqmenos-575688", @@ -97,6 +227,16 @@ "name": "MásQMenos" } }, + { + "displayName": "New Inn", + "id": "newinn-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "New Inn", + "name": "New Inn" + } + }, { "displayName": "Pitcher & Piano", "id": "pitcherandpiano-eaed91", @@ -109,6 +249,506 @@ "name": "Pitcher & Piano" } }, + { + "displayName": "Prince of Wales", + "id": "princeofwales-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Prince of Wales", + "name": "Prince of Wales" + } + }, + { + "displayName": "Queens Head", + "id": "queenshead-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Queens Head", + "name": "Queens Head" + } + }, + { + "displayName": "Red Lion", + "id": "redlion-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Red Lion", + "name": "Red Lion" + } + }, + { + "displayName": "Rose & Crown", + "id": "roseandcrown-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Rose & Crown", + "name": "Rose & Crown" + } + }, + { + "displayName": "Royal Hotel", + "id": "royalhotel-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Royal Hotel", + "name": "Royal Hotel" + } + }, + { + "displayName": "Royal Oak", + "id": "royaloak-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Royal Oak", + "name": "Royal Oak" + } + }, + { + "displayName": "Söröző", + "id": "sorozo-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "Söröző", + "name": "Söröző" + } + }, + { + "displayName": "The Anchor", + "id": "theanchor-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Anchor", + "name": "The Anchor" + } + }, + { + "displayName": "The Angel", + "id": "theangel-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Angel", + "name": "The Angel" + } + }, + { + "displayName": "The Beehive", + "id": "thebeehive-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Beehive", + "name": "The Beehive" + } + }, + { + "displayName": "The Bell", + "id": "thebell-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Bell", + "name": "The Bell" + } + }, + { + "displayName": "The Bell Inn", + "id": "thebellinn-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Bell Inn", + "name": "The Bell Inn" + } + }, + { + "displayName": "The Black Bull", + "id": "theblackbull-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Black Bull", + "name": "The Black Bull" + } + }, + { + "displayName": "The Black Horse", + "id": "theblackhorse-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Black Horse", + "name": "The Black Horse" + } + }, + { + "displayName": "The Bull", + "id": "thebull-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Bull", + "name": "The Bull" + } + }, + { + "displayName": "The Castle", + "id": "thecastle-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Castle", + "name": "The Castle" + } + }, + { + "displayName": "The Chequers", + "id": "thechequers-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Chequers", + "name": "The Chequers" + } + }, + { + "displayName": "The Cricketers", + "id": "thecricketers-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Cricketers", + "name": "The Cricketers" + } + }, + { + "displayName": "The Cross Keys", + "id": "thecrosskeys-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Cross Keys", + "name": "The Cross Keys" + } + }, + { + "displayName": "The Crown", + "id": "thecrown-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Crown", + "name": "The Crown" + } + }, + { + "displayName": "The Crown Inn", + "id": "thecrowninn-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Crown Inn", + "name": "The Crown Inn" + } + }, + { + "displayName": "The Fox", + "id": "thefox-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Fox", + "name": "The Fox" + } + }, + { + "displayName": "The George", + "id": "thegeorge-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The George", + "name": "The George" + } + }, + { + "displayName": "The Green Man", + "id": "thegreenman-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Green Man", + "name": "The Green Man" + } + }, + { + "displayName": "The Greyhound", + "id": "thegreyhound-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Greyhound", + "name": "The Greyhound" + } + }, + { + "displayName": "The Kings Arms", + "id": "thekingsarms-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Kings Arms", + "name": "The Kings Arms" + } + }, + { + "displayName": "The Kings Head", + "id": "thekingshead-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Kings Head", + "name": "The Kings Head" + } + }, + { + "displayName": "The New Inn", + "id": "thenewinn-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The New Inn", + "name": "The New Inn" + } + }, + { + "displayName": "The Plough", + "id": "theplough-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Plough", + "name": "The Plough" + } + }, + { + "displayName": "The Plough Inn", + "id": "theploughinn-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Plough Inn", + "name": "The Plough Inn" + } + }, + { + "displayName": "The Pub", + "id": "thepub-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Pub", + "name": "The Pub" + } + }, + { + "displayName": "The Queens Head", + "id": "thequeenshead-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Queens Head", + "name": "The Queens Head" + } + }, + { + "displayName": "The Railway", + "id": "therailway-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Railway", + "name": "The Railway" + } + }, + { + "displayName": "The Red Lion", + "id": "theredlion-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Red Lion", + "name": "The Red Lion" + } + }, + { + "displayName": "The Rising Sun", + "id": "therisingsun-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Rising Sun", + "name": "The Rising Sun" + } + }, + { + "displayName": "The Royal Oak", + "id": "theroyaloak-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Royal Oak", + "name": "The Royal Oak" + } + }, + { + "displayName": "The Ship", + "id": "theship-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Ship", + "name": "The Ship" + } + }, + { + "displayName": "The Ship Inn", + "id": "theshipinn-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Ship Inn", + "name": "The Ship Inn" + } + }, + { + "displayName": "The Star", + "id": "thestar-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Star", + "name": "The Star" + } + }, + { + "displayName": "The Star Inn", + "id": "thestarinn-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Star Inn", + "name": "The Star Inn" + } + }, + { + "displayName": "The Sun Inn", + "id": "thesuninn-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Sun Inn", + "name": "The Sun Inn" + } + }, + { + "displayName": "The Swan", + "id": "theswan-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Swan", + "name": "The Swan" + } + }, + { + "displayName": "The Swan Inn", + "id": "theswaninn-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Swan Inn", + "name": "The Swan Inn" + } + }, + { + "displayName": "The Victoria", + "id": "thevictoria-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Victoria", + "name": "The Victoria" + } + }, + { + "displayName": "The Wheatsheaf", + "id": "thewheatsheaf-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Wheatsheaf", + "name": "The Wheatsheaf" + } + }, + { + "displayName": "The White Hart", + "id": "thewhitehart-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The White Hart", + "name": "The White Hart" + } + }, + { + "displayName": "The White Horse", + "id": "thewhitehorse-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The White Horse", + "name": "The White Horse" + } + }, + { + "displayName": "The White Lion", + "id": "thewhitelion-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The White Lion", + "name": "The White Lion" + } + }, + { + "displayName": "The White Swan", + "id": "thewhiteswan-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The White Swan", + "name": "The White Swan" + } + }, + { + "displayName": "The Windmill", + "id": "thewindmill-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "The Windmill", + "name": "The Windmill" + } + }, { "displayName": "Toddy Shop", "id": "toddyshop-fb2db4", @@ -151,6 +791,26 @@ "brand:wikipedia": "en:Wetherspoons" } }, + { + "displayName": "White Hart", + "id": "whitehart-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "White Hart", + "name": "White Hart" + } + }, + { + "displayName": "White Horse", + "id": "whitehorse-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "White Horse", + "name": "White Horse" + } + }, { "displayName": "Young's", "id": "youngs-72d0dd", @@ -209,6 +869,18 @@ "name:ja": "和民" } }, + { + "displayName": "庄や", + "id": "5d7ca5-296a9c", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "pub", + "brand": "庄や", + "brand:ja": "庄や", + "name": "庄や", + "name:ja": "庄や" + } + }, { "displayName": "白木屋", "id": "shirokiya-0435b9", diff --git a/data/brands/amenity/recycling.json b/data/brands/amenity/recycling.json index 1e35eb91983..4a33f6f4e93 100644 --- a/data/brands/amenity/recycling.json +++ b/data/brands/amenity/recycling.json @@ -4,6 +4,96 @@ "exclude": {"generic": ["^recycling$"]} }, "items": [ + { + "displayName": "Bauhof", + "id": "bauhof-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Bauhof", + "name": "Bauhof" + } + }, + { + "displayName": "Biotonne", + "id": "biotonne-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Biotonne", + "name": "Biotonne" + } + }, + { + "displayName": "Déchèterie", + "id": "decheterie-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Déchèterie", + "name": "Déchèterie" + } + }, + { + "displayName": "Déchetterie", + "id": "dechetterie-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Déchetterie", + "name": "Déchetterie" + } + }, + { + "displayName": "Ecocentro", + "id": "ecocentro-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Ecocentro", + "name": "Ecocentro" + } + }, + { + "displayName": "Ecoilha Subterrânea", + "id": "ecoilhasubterranea-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Ecoilha Subterrânea", + "name": "Ecoilha Subterrânea" + } + }, + { + "displayName": "Ecoponto", + "id": "ecoponto-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Ecoponto", + "name": "Ecoponto" + } + }, + { + "displayName": "Glascontainer", + "id": "glascontainer-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Glascontainer", + "name": "Glascontainer" + } + }, + { + "displayName": "Isola Ecologica", + "id": "isolaecologica-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Isola Ecologica", + "name": "Isola Ecologica" + } + }, { "displayName": "Planet Aid", "id": "planetaid-f8d7ba", @@ -19,6 +109,26 @@ "recycling:shoes": "yes" } }, + { + "displayName": "Punto Limpio", + "id": "puntolimpio-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Punto Limpio", + "name": "Punto Limpio" + } + }, + { + "displayName": "Recyclinghof", + "id": "recyclinghof-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Recyclinghof", + "name": "Recyclinghof" + } + }, { "displayName": "Saint Vincent de Paul", "id": "saintvincentdepaul-f8d7ba", @@ -34,6 +144,16 @@ "short_name": "SVdP" } }, + { + "displayName": "Sběrný dvůr", + "id": "sbernydvur-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Sběrný dvůr", + "name": "Sběrný dvůr" + } + }, { "displayName": "The Salvation Army", "id": "thesalvationarmy-f8d7ba", @@ -47,6 +167,46 @@ "name": "The Salvation Army", "recycling:clothes": "yes" } + }, + { + "displayName": "Verre", + "id": "verre-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Verre", + "name": "Verre" + } + }, + { + "displayName": "Wertstoffhof", + "id": "wertstoffhof-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Wertstoffhof", + "name": "Wertstoffhof" + } + }, + { + "displayName": "Экобокс", + "id": "89a4e1-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "Экобокс", + "name": "Экобокс" + } + }, + { + "displayName": "سطل زباله", + "id": "db721a-247680", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "recycling", + "brand": "سطل زباله", + "name": "سطل زباله" + } } ] } diff --git a/data/brands/amenity/school.json b/data/brands/amenity/school.json index ccdde83796d..1082d6867f1 100644 --- a/data/brands/amenity/school.json +++ b/data/brands/amenity/school.json @@ -1,6 +1,7 @@ { "properties": { "path": "brands/amenity/school", + "skipCollection": true, "exclude": {"generic": ["^school$"]} }, "items": [ diff --git a/data/brands/amenity/university.json b/data/brands/amenity/university.json index 4abb9bf79bf..bc5caf489dd 100644 --- a/data/brands/amenity/university.json +++ b/data/brands/amenity/university.json @@ -1,6 +1,7 @@ { "properties": { "path": "brands/amenity/university", + "skipCollection": true, "exclude": {"generic": ["^university$"]} }, "items": [ diff --git a/data/brands/amenity/vehicle_inspection.json b/data/brands/amenity/vehicle_inspection.json index 2096296919e..55036ba53cb 100644 --- a/data/brands/amenity/vehicle_inspection.json +++ b/data/brands/amenity/vehicle_inspection.json @@ -28,6 +28,26 @@ "name": "Autovision" } }, + { + "displayName": "Besikta", + "id": "besikta-96b894", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "vehicle_inspection", + "brand": "Besikta", + "name": "Besikta" + } + }, + { + "displayName": "Besikta Bilprovning", + "id": "besiktabilprovning-96b894", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "vehicle_inspection", + "brand": "Besikta Bilprovning", + "name": "Besikta Bilprovning" + } + }, { "displayName": "Dekra", "id": "dekra-1959a3", @@ -41,6 +61,16 @@ "official_name": "Dekra Automotive" } }, + { + "displayName": "Okręgowa Stacja Kontroli Pojazdów", + "id": "okregowastacjakontrolipojazdow-96b894", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "vehicle_inspection", + "brand": "Okręgowa Stacja Kontroli Pojazdów", + "name": "Okręgowa Stacja Kontroli Pojazdów" + } + }, { "displayName": "Sécuritest", "id": "securitest-53baa7", @@ -52,6 +82,16 @@ "name": "Sécuritest" } }, + { + "displayName": "Stacja Kontroli Pojazdów", + "id": "stacjakontrolipojazdow-96b894", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "vehicle_inspection", + "brand": "Stacja Kontroli Pojazdów", + "name": "Stacja Kontroli Pojazdów" + } + }, { "displayName": "TÜV Hanse", "id": "tuvhanse-da4a1b", @@ -143,6 +183,16 @@ "short_name": "TÜV" } }, + { + "displayName": "Техосмотр", + "id": "ff6f8a-96b894", + "locationSet": {"include": ["001"]}, + "tags": { + "amenity": "vehicle_inspection", + "brand": "Техосмотр", + "name": "Техосмотр" + } + }, { "displayName": "ホリデー車検", "id": "holiday-f4e150", diff --git a/data/brands/craft/carpenter.json b/data/brands/craft/carpenter.json index 58a2cf8583b..af4dab28304 100644 --- a/data/brands/craft/carpenter.json +++ b/data/brands/craft/carpenter.json @@ -4,6 +4,56 @@ "exclude": {"generic": ["^carpenter$"]} }, "items": [ + { + "displayName": "Atelier de Menuiserie", + "id": "atelierdemenuiserie-6a5fd9", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Atelier de Menuiserie", + "craft": "carpenter", + "name": "Atelier de Menuiserie" + } + }, + { + "displayName": "Ebénisterie", + "id": "ebenisterie-6a5fd9", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Ebénisterie", + "craft": "carpenter", + "name": "Ebénisterie" + } + }, + { + "displayName": "Menuiserie", + "id": "menuiserie-6a5fd9", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Menuiserie", + "craft": "carpenter", + "name": "Menuiserie" + } + }, + { + "displayName": "Menuisierie", + "id": "menuisierie-6a5fd9", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Menuisierie", + "craft": "carpenter", + "name": "Menuisierie" + } + }, + { + "displayName": "Menusierie", + "id": "menusierie-6a5fd9", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Menusierie", + "craft": "carpenter", + "name": "Menusierie" + } + }, { "displayName": "プロタイムズ", "id": "protimes-01a309", diff --git a/data/brands/craft/electronics_repair.json b/data/brands/craft/electronics_repair.json index 6283f91d4d0..8f1265796fc 100644 --- a/data/brands/craft/electronics_repair.json +++ b/data/brands/craft/electronics_repair.json @@ -19,6 +19,26 @@ "short_name": "CPR" } }, + { + "displayName": "DNS", + "id": "dns-c874ce", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "DNS", + "craft": "electronics_repair", + "name": "DNS" + } + }, + { + "displayName": "DNS Сервисный центр", + "id": "338c9d-c874ce", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "DNS Сервисный центр", + "craft": "electronics_repair", + "name": "DNS Сервисный центр" + } + }, { "displayName": "Geek Squad", "id": "geeksquad-592655", @@ -32,6 +52,16 @@ "name": "Geek Squad" } }, + { + "displayName": "Repair Café", + "id": "repaircafe-c874ce", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Repair Café", + "craft": "electronics_repair", + "name": "Repair Café" + } + }, { "displayName": "uBreakiFix", "id": "ubreakifix-2e20d7", diff --git a/data/brands/craft/plumber.json b/data/brands/craft/plumber.json index 34da11bf773..29f931d036a 100644 --- a/data/brands/craft/plumber.json +++ b/data/brands/craft/plumber.json @@ -4,6 +4,26 @@ "exclude": {"generic": ["^plumber$"]} }, "items": [ + { + "displayName": "Bademiljø", + "id": "bademiljo-60973d", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Bademiljø", + "craft": "plumber", + "name": "Bademiljø" + } + }, + { + "displayName": "Comfort", + "id": "comfort-60973d", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Comfort", + "craft": "plumber", + "name": "Comfort" + } + }, { "displayName": "Mr. Rooter", "id": "mrrooter-6831b5", @@ -17,6 +37,16 @@ "name": "Mr. Rooter", "official_name": "Mr. Rooter Plumbing" } + }, + { + "displayName": "Varme & Bad", + "id": "varmeandbad-60973d", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Varme & Bad", + "craft": "plumber", + "name": "Varme & Bad" + } } ] } diff --git a/data/brands/leisure/dog_park.json b/data/brands/leisure/dog_park.json index b50fde81cad..7d970b613d3 100644 --- a/data/brands/leisure/dog_park.json +++ b/data/brands/leisure/dog_park.json @@ -1,7 +1,9 @@ { "properties": { "path": "brands/leisure/dog_park", - "exclude": {"generic": ["^dog park$"]} + "exclude": { + "generic": ["^(area cani|dog park)$"] + } }, "items": [ { diff --git a/data/brands/leisure/playground.json b/data/brands/leisure/playground.json index 4c82849c22c..54b98792232 100644 --- a/data/brands/leisure/playground.json +++ b/data/brands/leisure/playground.json @@ -1,6 +1,7 @@ { "properties": { "path": "brands/leisure/playground", + "skipCollection": true, "exclude": {"generic": ["^playground$"]} }, "items": [ diff --git a/data/brands/leisure/sports_centre.json b/data/brands/leisure/sports_centre.json index 0bc4d0900eb..ab86bd76421 100644 --- a/data/brands/leisure/sports_centre.json +++ b/data/brands/leisure/sports_centre.json @@ -4,6 +4,66 @@ "exclude": {"generic": ["^sports centre$"]} }, "items": [ + { + "displayName": "AABB", + "id": "aabb-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "AABB", + "leisure": "sports_centre", + "name": "AABB" + } + }, + { + "displayName": "Boulodrome", + "id": "boulodrome-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Boulodrome", + "leisure": "sports_centre", + "name": "Boulodrome" + } + }, + { + "displayName": "Centro Sportivo", + "id": "centrosportivo-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Centro Sportivo", + "leisure": "sports_centre", + "name": "Centro Sportivo" + } + }, + { + "displayName": "Coliseo", + "id": "coliseo-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Coliseo", + "leisure": "sports_centre", + "name": "Coliseo" + } + }, + { + "displayName": "Complejo Municipal de Deportes", + "id": "complejomunicipaldedeportes-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Complejo Municipal de Deportes", + "leisure": "sports_centre", + "name": "Complejo Municipal de Deportes" + } + }, + { + "displayName": "Complexe Sportif", + "id": "complexesportif-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Complexe Sportif", + "leisure": "sports_centre", + "name": "Complexe Sportif" + } + }, { "displayName": "David Lloyd Clubs", "id": "davidlloydclubs-2b43d7", @@ -16,6 +76,36 @@ "name": "David Lloyd Clubs" } }, + { + "displayName": "Ginásio de Esportes", + "id": "ginasiodeesportes-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Ginásio de Esportes", + "leisure": "sports_centre", + "name": "Ginásio de Esportes" + } + }, + { + "displayName": "Hala Sportowa", + "id": "halasportowa-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Hala Sportowa", + "leisure": "sports_centre", + "name": "Hala Sportowa" + } + }, + { + "displayName": "Hallenbad", + "id": "hallenbad-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Hallenbad", + "leisure": "sports_centre", + "name": "Hallenbad" + } + }, { "displayName": "iFLY", "id": "ifly-ba45e1", @@ -28,6 +118,216 @@ "sport": "indoor_skydiving" } }, + { + "displayName": "Mehrzweckhalle", + "id": "mehrzweckhalle-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Mehrzweckhalle", + "leisure": "sports_centre", + "name": "Mehrzweckhalle" + } + }, + { + "displayName": "Orlik", + "id": "orlik-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Orlik", + "leisure": "sports_centre", + "name": "Orlik" + } + }, + { + "displayName": "Pabellón de Deportes", + "id": "pabellondedeportes-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Pabellón de Deportes", + "leisure": "sports_centre", + "name": "Pabellón de Deportes" + } + }, + { + "displayName": "Pabellón Municipal de Deportes", + "id": "pabellonmunicipaldedeportes-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Pabellón Municipal de Deportes", + "leisure": "sports_centre", + "name": "Pabellón Municipal de Deportes" + } + }, + { + "displayName": "Palazzetto dello Sport", + "id": "palazzettodellosport-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Palazzetto dello Sport", + "leisure": "sports_centre", + "name": "Palazzetto dello Sport" + } + }, + { + "displayName": "Palestra", + "id": "palestra-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Palestra", + "leisure": "sports_centre", + "name": "Palestra" + } + }, + { + "displayName": "Palestra Comunale", + "id": "palestracomunale-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Palestra Comunale", + "leisure": "sports_centre", + "name": "Palestra Comunale" + } + }, + { + "displayName": "Piscina Municipal", + "id": "piscinamunicipal-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Piscina Municipal", + "leisure": "sports_centre", + "name": "Piscina Municipal" + } + }, + { + "displayName": "Piscine Municipale", + "id": "piscinemunicipale-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Piscine Municipale", + "leisure": "sports_centre", + "name": "Piscine Municipale" + } + }, + { + "displayName": "Polideportivo", + "id": "polideportivo-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Polideportivo", + "leisure": "sports_centre", + "name": "Polideportivo" + } + }, + { + "displayName": "Polideportivo Municipal", + "id": "polideportivomunicipal-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Polideportivo Municipal", + "leisure": "sports_centre", + "name": "Polideportivo Municipal" + } + }, + { + "displayName": "Reithalle", + "id": "reithalle-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Reithalle", + "leisure": "sports_centre", + "name": "Reithalle" + } + }, + { + "displayName": "Salle des Sports", + "id": "salledessports-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Salle des Sports", + "leisure": "sports_centre", + "name": "Salle des Sports" + } + }, + { + "displayName": "Schulsporthalle", + "id": "schulsporthalle-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Schulsporthalle", + "leisure": "sports_centre", + "name": "Schulsporthalle" + } + }, + { + "displayName": "Schützenhaus", + "id": "schutzenhaus-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Schützenhaus", + "leisure": "sports_centre", + "name": "Schützenhaus" + } + }, + { + "displayName": "Sokolovna", + "id": "sokolovna-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Sokolovna", + "leisure": "sports_centre", + "name": "Sokolovna" + } + }, + { + "displayName": "Sporthalle", + "id": "sporthalle-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Sporthalle", + "leisure": "sports_centre", + "name": "Sporthalle" + } + }, + { + "displayName": "Sportplatz", + "id": "sportplatz-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Sportplatz", + "leisure": "sports_centre", + "name": "Sportplatz" + } + }, + { + "displayName": "Tennis", + "id": "tennis-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Tennis", + "leisure": "sports_centre", + "name": "Tennis" + } + }, + { + "displayName": "Tennishalle", + "id": "tennishalle-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Tennishalle", + "leisure": "sports_centre", + "name": "Tennishalle" + } + }, + { + "displayName": "Turnhalle", + "id": "turnhalle-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Turnhalle", + "leisure": "sports_centre", + "name": "Turnhalle" + } + }, { "displayName": "YMCA", "id": "ymca-ba45e1", @@ -39,6 +339,96 @@ "leisure": "sports_centre", "name": "YMCA" } + }, + { + "displayName": "ДЮСШ", + "id": "b9c46c-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "ДЮСШ", + "leisure": "sports_centre", + "name": "ДЮСШ" + } + }, + { + "displayName": "Ледовый дворец", + "id": "c0c077-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Ледовый дворец", + "leisure": "sports_centre", + "name": "Ледовый дворец" + } + }, + { + "displayName": "Лыжная база", + "id": "418e3d-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Лыжная база", + "leisure": "sports_centre", + "name": "Лыжная база" + } + }, + { + "displayName": "Олимп", + "id": "b3e0be-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Олимп", + "leisure": "sports_centre", + "name": "Олимп" + } + }, + { + "displayName": "Физкультурно-оздоровительный комплекс", + "id": "6a43e9-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Физкультурно-оздоровительный комплекс", + "leisure": "sports_centre", + "name": "Физкультурно-оздоровительный комплекс" + } + }, + { + "displayName": "ФОК", + "id": "76f3bc-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "ФОК", + "leisure": "sports_centre", + "name": "ФОК" + } + }, + { + "displayName": "سالن ورزشی", + "id": "04885e-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "سالن ورزشی", + "leisure": "sports_centre", + "name": "سالن ورزشی" + } + }, + { + "displayName": "مجموعه ورزشی", + "id": "1ec4e0-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "مجموعه ورزشی", + "leisure": "sports_centre", + "name": "مجموعه ورزشی" + } + }, + { + "displayName": "体育馆", + "id": "1800a8-ba45e1", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "体育馆", + "leisure": "sports_centre", + "name": "体育馆" + } } ] } diff --git a/data/brands/office/energy_supplier.json b/data/brands/office/energy_supplier.json index 754379fafff..a4a899aa085 100644 --- a/data/brands/office/energy_supplier.json +++ b/data/brands/office/energy_supplier.json @@ -16,6 +16,16 @@ "office": "energy_supplier" } }, + { + "displayName": "Enel", + "id": "enel-c494c5", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Enel", + "name": "Enel", + "office": "energy_supplier" + } + }, { "displayName": "Iberdrola", "id": "iberdrola-c494c5", @@ -86,6 +96,16 @@ "office": "energy_supplier" } }, + { + "displayName": "Punto Enel", + "id": "puntoenel-c494c5", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Punto Enel", + "name": "Punto Enel", + "office": "energy_supplier" + } + }, { "displayName": "東京電力", "id": "tepco-c9cbcf", diff --git a/data/brands/shop/lottery.json b/data/brands/shop/lottery.json index bd3819f4268..249c5bdd8c7 100644 --- a/data/brands/shop/lottery.json +++ b/data/brands/shop/lottery.json @@ -1,7 +1,12 @@ { "properties": { "path": "brands/shop/lottery", - "exclude": {"generic": ["^lottery$"]} + "exclude": { + "generic": [ + "^loter(i|í)a( de la (ciudad|provincia))?$", + "^lott(ery|o|ózó)$" + ] + } }, "items": [ { @@ -34,6 +39,46 @@ "shop": "lottery" } }, + { + "displayName": "Paga Todo", + "id": "pagatodo-86935c", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Paga Todo", + "name": "Paga Todo", + "shop": "lottery" + } + }, + { + "displayName": "ΟΠΑΠ", + "id": "942bba-86935c", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "ΟΠΑΠ", + "name": "ΟΠΑΠ", + "shop": "lottery" + } + }, + { + "displayName": "公益彩券", + "id": "572acb-86935c", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "公益彩券", + "name": "公益彩券", + "shop": "lottery" + } + }, + { + "displayName": "台灣彩券", + "id": "4ad149-86935c", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "台灣彩券", + "name": "台灣彩券", + "shop": "lottery" + } + }, { "displayName": "宝くじ", "id": "takarakuji-760f8f", diff --git a/data/brands/shop/mobile_phone.json b/data/brands/shop/mobile_phone.json index 35d2b25b77c..ea2bc965a7f 100644 --- a/data/brands/shop/mobile_phone.json +++ b/data/brands/shop/mobile_phone.json @@ -1166,7 +1166,11 @@ "displayName": "ドコモショップ", "id": "docomoshop-0a8be9", "locationSet": {"include": ["jp"]}, - "matchNames": ["ｄｏｃｏｍｏ", "nttドコモ","NTT docomo"], + "matchNames": [ + "ｄｏｃｏｍｏ", + "ntt docomo", + "nttドコモ" + ], "tags": { "brand": "ドコモショップ", "brand:en": "DoCoMo Shop", diff --git a/data/brands/tourism/caravan_site.json b/data/brands/tourism/caravan_site.json index c8d7ef123c4..2aedccf92d1 100644 --- a/data/brands/tourism/caravan_site.json +++ b/data/brands/tourism/caravan_site.json @@ -4,6 +4,26 @@ "exclude": {"generic": ["^caravan site$"]} }, "items": [ + { + "displayName": "Aire de Camping-car", + "id": "airedecampingcar-86b8bc", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Aire de Camping-car", + "name": "Aire de Camping-car", + "tourism": "caravan_site" + } + }, + { + "displayName": "Área de autocaravanas", + "id": "areadeautocaravanas-86b8bc", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Área de autocaravanas", + "name": "Área de autocaravanas", + "tourism": "caravan_site" + } + }, { "displayName": "Big 4 Holiday Parks", "id": "big4holidayparks-50f355", @@ -70,6 +90,16 @@ "short_name": "KOA", "tourism": "caravan_site" } + }, + { + "displayName": "Park4night", + "id": "park4night-86b8bc", + "locationSet": {"include": ["001"]}, + "tags": { + "brand": "Park4night", + "name": "Park4night", + "tourism": "caravan_site" + } } ] } diff --git a/data/operators/amenity/bicycle_parking.json b/data/operators/amenity/bicycle_parking.json index 3a425a3c429..8876e6c1c83 100644 --- a/data/operators/amenity/bicycle_parking.json +++ b/data/operators/amenity/bicycle_parking.json @@ -1,6 +1,7 @@ { "properties": { "path": "operators/amenity/bicycle_parking", + "skipCollection": true, "exclude": {"generic": ["^bicycle parking$"]} }, "items": [ diff --git a/data/operators/amenity/parking.json b/data/operators/amenity/parking.json index 264d26840e6..af1109d2f85 100644 --- a/data/operators/amenity/parking.json +++ b/data/operators/amenity/parking.json @@ -1,6 +1,7 @@ { "properties": { "path": "operators/amenity/parking", + "skipCollection": true, "exclude": {"generic": ["^parking$"]} }, "items": [ diff --git a/data/operators/amenity/post_box.json b/data/operators/amenity/post_box.json index ba58af0acb0..ac849326ec7 100644 --- a/data/operators/amenity/post_box.json +++ b/data/operators/amenity/post_box.json @@ -1,6 +1,7 @@ { "properties": { "path": "operators/amenity/post_box", + "skipCollection": true, "exclude": {"generic": ["^post box$"]} }, "items": [ diff --git a/data/transit/route/bus.json b/data/transit/route/bus.json index 872826ce490..c71f2f915cb 100644 --- a/data/transit/route/bus.json +++ b/data/transit/route/bus.json @@ -8176,6 +8176,16 @@ "route": "bus" } }, + { + "displayName": "NWN", + "id": "nwn-a45453", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "NWN", + "operator": "NWN", + "route": "bus" + } + }, { "displayName": "NYC Transit", "id": "nyctransit-a21cc9", diff --git a/data/transit/route/ferry.json b/data/transit/route/ferry.json index c568bede2aa..bc335e0ef0e 100644 --- a/data/transit/route/ferry.json +++ b/data/transit/route/ferry.json @@ -41,6 +41,26 @@ "route": "ferry" } }, + { + "displayName": "False Creek Ferries", + "id": "falsecreekferries-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "False Creek Ferries", + "operator": "False Creek Ferries", + "route": "ferry" + } + }, + { + "displayName": "HVV", + "id": "hvv-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "HVV", + "operator": "HVV", + "route": "ferry" + } + }, { "displayName": "Liberty Landing Ferry", "id": "libertylandingferry-0e8a7e", @@ -55,6 +75,26 @@ "route": "ferry" } }, + { + "displayName": "London River Services", + "id": "londonriverservices-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "London River Services", + "operator": "London River Services", + "route": "ferry" + } + }, + { + "displayName": "Maasveren", + "id": "maasveren-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "Maasveren", + "operator": "Maasveren", + "route": "ferry" + } + }, { "displayName": "NY Waterway", "id": "nywaterway-0e8a7e", @@ -69,6 +109,56 @@ "route": "ferry" } }, + { + "displayName": "Réseau Mistral", + "id": "reseaumistral-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "Réseau Mistral", + "operator": "Réseau Mistral", + "route": "ferry" + } + }, + { + "displayName": "Ruter", + "id": "ruter-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "Ruter", + "operator": "Ruter", + "route": "ferry" + } + }, + { + "displayName": "Saaristoliikenne", + "id": "saaristoliikenne-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "Saaristoliikenne", + "operator": "Saaristoliikenne", + "route": "ferry" + } + }, + { + "displayName": "SFBF", + "id": "sfbf-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "SFBF", + "operator": "SFBF", + "route": "ferry" + } + }, + { + "displayName": "SL", + "id": "sl-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "SL", + "operator": "SL", + "route": "ferry" + } + }, { "displayName": "Staten Island Ferry", "id": "statenislandferry-0e8a7e", @@ -97,6 +187,36 @@ "route": "ferry" } }, + { + "displayName": "Ton Paulus Veerbedrijf", + "id": "tonpaulusveerbedrijf-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "Ton Paulus Veerbedrijf", + "operator": "Ton Paulus Veerbedrijf", + "route": "ferry" + } + }, + { + "displayName": "Uit®waarde", + "id": "fa90b7-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "Uit®waarde", + "operator": "Uit®waarde", + "route": "ferry" + } + }, + { + "displayName": "Västtrafik", + "id": "vasttrafik-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "Västtrafik", + "operator": "Västtrafik", + "route": "ferry" + } + }, { "displayName": "Verkehrsbetrieb Potsdam", "id": "verkehrsverbundberlinbrandenburg-0b62ba", @@ -115,6 +235,16 @@ "route": "ferry" } }, + { + "displayName": "VVO", + "id": "vvo-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "VVO", + "operator": "VVO", + "route": "ferry" + } + }, { "displayName": "Washington State Ferries", "id": "washingtonstateferries-06fda1", @@ -128,6 +258,26 @@ "operator:wikipedia": "en:Washington State Ferries", "route": "ferry" } + }, + { + "displayName": "Waterbus Rotterdam-Drechtsteden", + "id": "waterbusrotterdamdrechtsteden-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "Waterbus Rotterdam-Drechtsteden", + "operator": "Waterbus Rotterdam-Drechtsteden", + "route": "ferry" + } + }, + { + "displayName": "Waxholmsbolaget", + "id": "waxholmsbolaget-95f6e9", + "locationSet": {"include": ["001"]}, + "tags": { + "network": "Waxholmsbolaget", + "operator": "Waxholmsbolaget", + "route": "ferry" + } } ] } diff --git a/lib/file_tree.js b/lib/file_tree.js index 1008ac402a7..c4888c37f98 100644 --- a/lib/file_tree.js +++ b/lib/file_tree.js @@ -173,7 +173,6 @@ exports.write = (cache) => { const category = cache.path[tkv]; const parts = tkv.split('/', 3); // tkv = "tree/key/value" - const k = parts[1]; const v = parts[2]; const file = `./data/${tkv}.json`; @@ -257,8 +256,12 @@ exports.write = (cache) => { let cleanedProps = {}; cleanedProps.path = tkv; - cleanedProps.exclude = {}; + if (properties.skipCollection) { + cleanedProps.skipCollection = properties.skipCollection; + } + + cleanedProps.exclude = {}; if (properties.exclude.generic) { cleanedProps.exclude.generic = properties.exclude.generic.map(_cleanLower).sort(withLocale); } else { diff --git a/schema/items.json b/schema/items.json index 20f7faac086..2cdfac7f5fb 100644 --- a/schema/items.json +++ b/schema/items.json @@ -45,7 +45,13 @@ } } } + }, + + "skipCollection": { + "description": "(optional) If 'true', skip the step to collect new items from the OSM planet", + "type": "boolean" } + } }, diff --git a/scripts/build_index.js b/scripts/build_index.js index 8d67819fe61..dd2628dab07 100644 --- a/scripts/build_index.js +++ b/scripts/build_index.js @@ -186,28 +186,28 @@ function filterCollected() { let excluders = {}; for (const kvn in discard) { - const parts = kvn.split('|', 2); // kvn = "key/value|name" + const parts = kvn.split('|', 2); // kvn = "key/value|name" const kv = parts[0]; const n = parts[1]; const tkv = `${t}/${kv}`; const file = `./data/${tkv}.json`; const category = _cache.path[tkv]; - if (!category) continue; // not a category we track in the index, skip + if (!category) continue; // not a category we track in the index, skip + + const props = category.properties || {}; + if (props.skipCollection) continue; // not a category where we want to collect new tags, skip // If we have a category for this k/v pair in the index, move the name from discard -> keep // ...unless the name matches an exclude pattern - const props = category.properties; - if (props) { - if (!excluders[tkv]) { - const exclude = props.exclude || {}; - const excludePatterns = (exclude.generic || []).concat((exclude.named || [])); - excluders[tkv] = excludePatterns.map(s => checkRegex(file, s) || new RegExp(s, 'i')); - } - const isExcluded = excluders[tkv].some(regex => regex.test(n)); - if (!isExcluded) { - keep[kvn] = discard[kvn]; - delete discard[kvn]; - } + if (!excluders[tkv]) { + const exclude = props.exclude || {}; + const excludePatterns = (exclude.generic || []).concat((exclude.named || [])); + excluders[tkv] = excludePatterns.map(s => checkRegex(file, s) || new RegExp(s, 'i')); + } + const isExcluded = excluders[tkv].some(regex => regex.test(n)); + if (!isExcluded) { + keep[kvn] = discard[kvn]; + delete discard[kvn]; } }