Merge branch 'osmlab:main' into main

gosgtan · Mar 21, 2024 · 8fc0a95 · 8fc0a95
2 parents c84a2af + d3ceca5
commit 8fc0a95
Show file tree

Hide file tree

Showing 14 changed files with 101 additions and 52 deletions.
diff --git a/data/brands/amenity/cafe.json b/data/brands/amenity/cafe.json
@@ -2124,6 +2124,7 @@
     },
     {
       "displayName": "Janji Jiwa",
+      "id": "janjijiwa-4ccab9",
       "locationSet": {"include": ["id"]},
       "tags": {
         "amenity": "cafe",

diff --git a/data/brands/amenity/car_wash.json b/data/brands/amenity/car_wash.json
@@ -145,6 +145,17 @@
         "name": "Circle K"
       }
     },
+    {
+      "displayName": "Costco",
+      "id": "costco-244496",
+      "locationSet": {"include": ["us"]},
+      "tags": {
+        "amenity": "car_wash",
+        "brand": "Costco",
+        "brand:wikidata": "Q715583",
+        "name": "Costco"
+      }
+    },
     {
       "displayName": "Ehrle",
       "id": "ehrle-43b899",

diff --git a/data/brands/amenity/cinema.json b/data/brands/amenity/cinema.json
@@ -185,6 +185,7 @@
     },
     {
       "displayName": "Cinema XXI",
+      "id": "cinemaxxi-ee9238",
       "locationSet": {"include": ["id"]},
       "tags": {
         "amenity": "cinema",
@@ -389,8 +390,8 @@
     },
     {
       "displayName": "CJ CGV",
-      "id": "cgvcinema-c6663f",
-      "locationSet": {"include": ["kr","id"]},
+      "id": "cgvcinema-963a2a",
+      "locationSet": {"include": ["id", "kr"]},
       "matchNames": ["cgv"],
       "tags": {
         "amenity": "cinema",

diff --git a/data/brands/amenity/fuel.json b/data/brands/amenity/fuel.json
@@ -4177,8 +4177,10 @@
     },
     {
       "displayName": "Preem",
-      "id": "preem-a611ce",
-      "locationSet": {"include": ["pl", "se"]},
+      "id": "preem-906b06",
+      "locationSet": {
+        "include": ["dk", "no", "pl", "se"]
+      },
       "tags": {
         "amenity": "fuel",
         "brand": "Preem",
@@ -5415,7 +5417,7 @@
       }
     },
     {
-      "displayName": "Tom Thumb",
+      "displayName": "Tom Thumb (US TX)",
       "id": "tomthumb-bc7b86",
       "locationSet": {
         "include": ["us-tx.geojson"]
@@ -5427,6 +5429,24 @@
         "name": "Tom Thumb"
       }
     },
+    {
+      "displayName": "TomThumb (US AL, FL, MS, TN)",
+      "id": "tomthumb-06d38e",
+      "locationSet": {
+        "include": [
+          "us-al.geojson",
+          "us-fl.geojson",
+          "us-ms.geojson",
+          "us-tn.geojson"
+        ]
+      },
+      "tags": {
+        "amenity": "fuel",
+        "brand": "TomThumb",
+        "brand:wikidata": "Q123012206",
+        "name": "TomThumb"
+      }
+    },
     {
       "displayName": "Top",
       "id": "top-5afa7a",
@@ -5711,8 +5731,8 @@
     },
     {
       "displayName": "Uno-X",
-      "id": "unox-0b8509",
-      "locationSet": {"include": ["dk"]},
+      "id": "unox-9449e0",
+      "locationSet": {"include": ["dk", "no"]},
       "tags": {
         "amenity": "fuel",
         "brand": "Uno-X",
@@ -5991,11 +6011,13 @@
     },
     {
       "displayName": "YX",
-      "id": "yx-b3d110",
-      "locationSet": {"include": ["001"]},
+      "id": "yx-9449e0",
+      "locationSet": {"include": ["dk", "no"]},
+      "matchNames": ["yx energi"],
       "tags": {
         "amenity": "fuel",
         "brand": "YX",
+        "brand:wikidata": "Q4580519",
         "name": "YX"
       }
     },
@@ -6009,17 +6031,6 @@
         "name": "YX 7-Eleven"
       }
     },
-    {
-      "displayName": "YX Energi",
-      "id": "yxenergi-9449e0",
-      "locationSet": {"include": ["dk", "no"]},
-      "tags": {
-        "amenity": "fuel",
-        "brand": "YX Energi",
-        "brand:wikidata": "Q4580519",
-        "name": "YX Energi"
-      }
-    },
     {
       "displayName": "Z",
       "id": "z-088dbb",

diff --git a/data/brands/amenity/ice_cream.json b/data/brands/amenity/ice_cream.json
@@ -244,6 +244,10 @@
       "displayName": "Creams",
       "id": "creams-546be0",
       "locationSet": {"include": ["gb"]},
+      "matchNames": [
+        "creams gelato",
+        "creams gelato co"
+      ],
       "tags": {
         "amenity": "ice_cream",
         "brand": "Creams",

diff --git a/data/brands/amenity/pharmacy.json b/data/brands/amenity/pharmacy.json
@@ -270,6 +270,7 @@
     },
     {
       "displayName": "Apotek K-24",
+      "id": "apotekk24-5c6039",
       "locationSet": {"include": ["id"]},
       "matchNames": ["k-24"],
       "tags": {
@@ -768,8 +769,8 @@
     },
     {
       "displayName": "Costco Pharmacy",
-      "id": "costcopharmacy-3ab288",
-      "locationSet": {"include": ["us"]},
+      "id": "costcopharmacy-5d3b40",
+      "locationSet": {"include": ["ca", "us"]},
       "tags": {
         "amenity": "pharmacy",
         "brand": "Costco Pharmacy",

diff --git a/data/brands/amenity/post_office.json b/data/brands/amenity/post_office.json
@@ -170,7 +170,7 @@
     },
     {
       "displayName": "Mail Boxes Etc.",
-      "id": "mailboxesetc-58efc1",
+      "id": "mailboxesetc-187121",
       "locationSet": {
         "include": ["001"],
         "exclude": ["ca", "gb", "us"]
@@ -186,6 +186,7 @@
     },
     {
       "displayName": "Mail Boxes Etc. (UK & Ireland)",
+      "id": "mailboxesetcukandireland-a028f7",
       "locationSet": {"include": ["gb"]},
       "matchTags": ["shop/copyshop"],
       "tags": {

diff --git a/data/brands/office/insurance.json b/data/brands/office/insurance.json
@@ -873,6 +873,21 @@
         "office": "insurance"
       }
     },
+    {
+      "displayName": "Generali Tranquilidade",
+      "id": "generalitranquilidade-629ea0",
+      "locationSet": {"include": ["pt"]},
+      "matchNames": [
+        "tranquilidade",
+        "tranquilidade seguros"
+      ],
+      "tags": {
+        "brand": "Generali Tranquilidade",
+        "brand:wikidata": "Q7833457",
+        "name": "Generali Tranquilidade",
+        "office": "insurance"
+      }
+    },
     {
       "displayName": "GMF",
       "id": "gmf-6ae572",
@@ -1808,18 +1823,6 @@
         "short_name": "Standard"
       }
     },
-    {
-      "displayName": "Generali Tranquilidade",
-      "id": "tranquilidade-629ea0",
-      "locationSet": {"include": ["pt"]},
-      "matchNames": ["Tranquilidade Seguros", "Tranquilidade"],
-      "tags": {
-        "brand": "Generali Tranquilidade",
-        "brand:wikidata": "Q7833457",
-        "name": "Generali Tranquilidade",
-        "office": "insurance"
-      }
-    },
     {
       "displayName": "Union",
       "id": "union-780b74",

diff --git a/data/brands/shop/bakery.json b/data/brands/shop/bakery.json
@@ -1426,6 +1426,7 @@
     },
     {
       "displayName": "MAKO Cake and Bakery",
+      "id": "makocakeandbakery-a78b8f",
       "locationSet": {"include": ["id"]},
       "tags": {
         "brand": "MAKO Cake and Bakery",

diff --git a/data/brands/shop/hearing_aids.json b/data/brands/shop/hearing_aids.json
@@ -108,8 +108,10 @@
     },
     {
       "displayName": "Costco Hearing Aid Center",
-      "id": "costcohearingaidcenter-2a109a",
-      "locationSet": {"include": ["us"]},
+      "id": "costcohearingaidcenter-39cb4e",
+      "locationSet": {
+        "include": ["ca", "gb", "us"]
+      },
       "tags": {
         "brand": "Costco",
         "brand:wikidata": "Q715583",

diff --git a/data/brands/shop/optician.json b/data/brands/shop/optician.json
@@ -228,8 +228,10 @@
     },
     {
       "displayName": "Costco Optical",
-      "id": "costcooptical-5b6831",
-      "locationSet": {"include": ["us"]},
+      "id": "costcooptical-f59838",
+      "locationSet": {
+        "include": ["ca", "gb", "us"]
+      },
       "tags": {
         "brand": "Costco",
         "brand:wikidata": "Q715583",

diff --git a/data/brands/shop/trade.json b/data/brands/shop/trade.json
@@ -6,17 +6,6 @@
     }
   },
   "items": [
-    {
-      "displayName": "Linde Welding Gas & Equipment Center",
-      "locationSet": {"include": ["us"]},
-      "matchNames": ["Praxair"],
-      "tags": {
-        "brand": "Linde",
-        "brand:wikidata": "Q902780",
-        "name": "Linde Welding Gas & Equipment Center",
-        "shop": "trade"
-      }
-    },
     {
       "displayName": "84 Lumber",
       "id": "84lumber-4e950c",
@@ -634,6 +623,18 @@
         "shop": "trade"
       }
     },
+    {
+      "displayName": "Linde Welding Gas & Equipment Center",
+      "id": "lindeweldinggasandequipmentcenter-4e950c",
+      "locationSet": {"include": ["us"]},
+      "matchNames": ["praxair"],
+      "tags": {
+        "brand": "Linde",
+        "brand:wikidata": "Q902780",
+        "name": "Linde Welding Gas & Equipment Center",
+        "shop": "trade"
+      }
+    },
     {
       "displayName": "Louisiana CAT",
       "id": "louisianacat-052d4d",

diff --git a/data/brands/shop/watches.json b/data/brands/shop/watches.json
@@ -71,7 +71,7 @@
     },
     {
       "displayName": "Fossil",
-      "id": "fossil-86cc90",
+      "id": "fossil-101248",
       "locationSet": {"include": ["001"]},
       "matchTags": [
         "shop/bag",
@@ -127,7 +127,7 @@
     },
     {
       "displayName": "Longines",
-      "id": "longines-691196",
+      "id": "longines-101248",
       "locationSet": {"include": ["001"]},
       "matchTags": ["shop/jewelry"],
       "tags": {

diff --git a/data/transit/railway/station.json b/data/transit/railway/station.json
@@ -6,6 +6,16 @@
     "exclude": {"generic": ["^station$"]}
   },
   "items": [
+    {
+      "note": "Auto create railway/station for all route/subway too - #9320",
+      "templateSource": "transit/route/subway",
+      "templateTags": {
+        "public_transport": "station",
+        "railway": "station",
+        "route": "",
+        "subway": "yes"
+      }
+    },
     {
       "note": "Auto create railway/station for all route/train - #7576, #4765",
       "templateSource": "transit/route/train",