Merge pull request osmlab#7604 from iigmir/main

Create and update some brand entries in Taiwan and merge 0424497
davidhicks · Jan 6, 2023 · 13f4b49 · 13f4b49
2 parents 6bfa84b + 0682836
commit 13f4b49
Show file tree

Hide file tree

Showing 9 changed files with 368 additions and 4 deletions.
diff --git a/data/brands/amenity/cafe.json b/data/brands/amenity/cafe.json
@@ -732,6 +732,26 @@
         "takeaway": "yes"
       }
     },
+    {
+      "displayName": "Caffebene咖啡伴",
+      "id": "caffebene-7d270d",
+      "locationSet": {"include": ["tw"]},
+      "matchNames": ["咖啡伴"],
+      "tags": {
+        "amenity": "cafe",
+        "brand": "Caffebene",
+        "brand:en": "Caffé Bene",
+        "brand:ko": "카페베네",
+        "brand:wikidata": "Q5017149",
+        "brand:zh": "Caffebene",
+        "cuisine": "coffee_shop",
+        "name": "Caffebene咖啡伴",
+        "name:en": "Caffé Bene",
+        "name:ko": "카페베네",
+        "name:zh": "Caffebene咖啡伴",
+        "takeaway": "yes"
+      }
+    },
     {
       "displayName": "Caffeine",
       "id": "caffeine-f2627b",
@@ -4314,6 +4334,48 @@
         "takeaway": "yes"
       }
     },
+    {
+      "displayName": "客喜康珈琲館",
+      "id": "kohikan-7d270d",
+      "locationSet": {"include": ["tw"]},
+      "matchNames": [
+        "咖啡館",
+        "客喜康咖啡館"
+      ],
+      "tags": {
+        "amenity": "cafe",
+        "brand": "客喜康珈琲館",
+        "brand:en": "Kohikan",
+        "brand:ja": "珈琲館",
+        "brand:wikidata": "Q11573290",
+        "brand:zh": "客喜康珈琲館",
+        "cuisine": "coffee_shop",
+        "name": "客喜康珈琲館",
+        "name:en": "Kohikan",
+        "name:ja": "珈琲館",
+        "name:zh": "客喜康珈琲館",
+        "takeaway": "yes"
+      }
+    },
+    {
+      "displayName": "客美多咖啡",
+      "id": "komedacoffeeshop-7d270d",
+      "locationSet": {"include": ["tw"]},
+      "tags": {
+        "amenity": "cafe",
+        "brand": "客美多咖啡",
+        "brand:en": "Komeda Coffee Shop",
+        "brand:ja": "コメダ珈琲店",
+        "brand:wikidata": "Q11302679",
+        "brand:zh": "客美多咖啡",
+        "cuisine": "coffee_shop",
+        "name": "客美多咖啡",
+        "name:en": "Komeda Coffee Shop",
+        "name:ja": "コメダ珈琲店",
+        "name:zh": "客美多咖啡",
+        "takeaway": "yes"
+      }
+    },
     {
       "displayName": "幸福堂",
       "id": "xingfutang-7d270d",

diff --git a/data/brands/amenity/car_rental.json b/data/brands/amenity/car_rental.json
@@ -302,6 +302,21 @@
         "name:ja": "ニッポンレンタカー"
       }
     },
+    {
+      "displayName": "和運租車",
+      "id": "hotaileasing-9fc5e0",
+      "locationSet": {"include": ["tw"]},
+      "tags": {
+        "amenity": "car_rental",
+        "brand": "和運租車",
+        "brand:en": "Hotai Leasing",
+        "brand:wikidata": "Q10921690",
+        "brand:zh": "和運租車",
+        "name": "和運租車",
+        "name:en": "Hotai Leasing",
+        "name:zh": "和運租車"
+      }
+    },
     {
       "displayName": "日産レンタカー",
       "id": "nissancarrental-f05847",

diff --git a/data/brands/amenity/cinema.json b/data/brands/amenity/cinema.json
@@ -511,6 +511,22 @@
         "name": "Hoyts"
       }
     },
+    {
+      "displayName": "In89豪華數位影城",
+      "id": "in89cinemax-4205fd",
+      "locationSet": {"include": ["tw"]},
+      "matchNames": ["豪華大戲院"],
+      "tags": {
+        "amenity": "cinema",
+        "brand": "In89豪華數位影城",
+        "brand:en": "in89 Cinemax",
+        "brand:wikidata": "Q10851078",
+        "brand:zh": "In89豪華數位影院",
+        "name": "In89豪華數位影城",
+        "name:en": "in89 Cinemax",
+        "name:zh": "In89豪華數位影院"
+      }
+    },
     {
       "displayName": "INOX Leisure",
       "id": "inoxleisure-41b2b7",
@@ -1107,6 +1123,66 @@
         "name:zh": "中影国际影城"
       }
     },
+    {
+      "displayName": "喜樂時代影城",
+      "id": "centuryasiacinemas-4205fd",
+      "locationSet": {"include": ["tw"]},
+      "tags": {
+        "amenity": "cinema",
+        "brand": "喜樂時代影城",
+        "brand:en": "Century Asia Cinemas",
+        "brand:wikidata": "Q22097589",
+        "brand:zh": "喜樂時代影城",
+        "name": "喜樂時代影城",
+        "name:en": "Century Asia Cinemas",
+        "name:zh": "喜樂時代影城"
+      }
+    },
+    {
+      "displayName": "國賓影城",
+      "id": "ambassadortheatres-4205fd",
+      "locationSet": {"include": ["tw"]},
+      "tags": {
+        "amenity": "cinema",
+        "brand": "國賓影城",
+        "brand:en": "Ambassador Theatres",
+        "brand:wikidata": "Q9689764",
+        "brand:zh": "國賓影城",
+        "name": "國賓影城",
+        "name:en": "Ambassador Theatres",
+        "name:zh": "國賓影城"
+      }
+    },
+    {
+      "displayName": "威秀影城",
+      "id": "vieshowcinemas-4205fd",
+      "locationSet": {"include": ["tw"]},
+      "tags": {
+        "amenity": "cinema",
+        "brand": "威秀影城",
+        "brand:en": "Vie Show Cinemas",
+        "brand:wikidata": "Q67934947",
+        "brand:zh": "威秀影城",
+        "name": "威秀影城",
+        "name:en": "Vie Show Cinemas",
+        "name:zh": "威秀影城"
+      }
+    },
+    {
+      "displayName": "新光影城",
+      "id": "shinkongcinemas-4205fd",
+      "locationSet": {"include": ["tw"]},
+      "tags": {
+        "amenity": "cinema",
+        "brand": "新光影城",
+        "brand:en": "Shin Kong Cinemas",
+        "brand:wikidata": "Q11081118",
+        "brand:zh": "新光影城",
+        "name": "新光影城",
+        "name:en": "Shin Kong Cinemas",
+        "name:zh": "新光影城"
+      }
+    },
     {
       "displayName": "洲立影藝 MCL Cinema",
       "id": "mclcinema-74d7ca",
@@ -1157,6 +1233,36 @@
         "name:zh": "百老汇影城"
       }
     },
+    {
+      "displayName": "秀泰影城",
+      "id": "showtimecinemas-4205fd",
+      "locationSet": {"include": ["tw"]},
+      "tags": {
+        "amenity": "cinema",
+        "brand": "秀泰影城",
+        "brand:en": "Showtime Cinemas",
+        "brand:wikidata": "Q15906317",
+        "brand:zh": "秀泰影城",
+        "name": "秀泰影城",
+        "name:en": "Showtime Cinemas",
+        "name:zh": "秀泰影城"
+      }
+    },
+    {
+      "displayName": "美麗新影城",
+      "id": "miranewcinemas-4205fd",
+      "locationSet": {"include": ["tw"]},
+      "tags": {
+        "amenity": "cinema",
+        "brand": "美麗新影城",
+        "brand:en": "Miranew Cinemas",
+        "brand:wikidata": "Q60996073",
+        "brand:zh": "美麗新影城",
+        "name": "美麗新影城",
+        "name:en": "Miranew Cinemas",
+        "name:zh": "美麗新影城"
+      }
+    },
     {
       "displayName": "英皇戲院 Emperor Cinemas",
       "id": "emperorcinemas-03b75b",

diff --git a/data/brands/amenity/fast_food.json b/data/brands/amenity/fast_food.json
@@ -4402,6 +4402,28 @@
         "takeaway": "yes"
       }
     },
+    {
+      "displayName": "Mister Donut",
+      "id": "misterdonut-60a4d5",
+      "locationSet": {"include": ["tw"]},
+      "matchNames": ["唐先生圓圓圈", "美仕唐納滋"],
+      "tags": {
+        "amenity": "fast_food",
+        "brand": "Mister Donut",
+        "brand:en": "Mister Donut",
+        "brand:ja": "ミスタードーナツ",
+        "brand:wikidata": "Q1065819",
+        "brand:zh": "Mister Donut",
+        "cuisine": "donut",
+        "name": "Mister Donut",
+        "name:en": "Mister Donut",
+        "name:ja": "ミスタードーナツ",
+        "name:zh": "Mister Donut",
+        "operator": "統一多拿滋股份有限公司",
+        "operator:wikidata": "Q15934112",
+        "takeaway": "yes"
+      }
+    },
     {
       "displayName": "Mizzoni's Pizza",
       "id": "mizzonispizza-f334ca",

diff --git a/data/brands/amenity/fuel.json b/data/brands/amenity/fuel.json
@@ -6530,6 +6530,26 @@
         "name:zh": "国家管网"
       }
     },
+    {
+      "displayName": "好市多加油站",
+      "id": "costcogasoline-db3418",
+      "locationSet": {"include": ["tw"]},
+      "matchNames": [
+        "costco",
+        "costco gas",
+        "costco wholesale"
+      ],
+      "tags": {
+        "amenity": "fuel",
+        "brand": "好市多加油站",
+        "brand:en": "Costco Gasoline",
+        "brand:wikidata": "Q715583",
+        "brand:zh": "好市多加油站",
+        "name": "好市多加油站",
+        "name:en": "Costco Gasoline",
+        "name:zh": "好市多加油站"
+      }
+    },
     {
       "displayName": "广西交投",
       "id": "cd5eeb-e4b6c0",

diff --git a/data/brands/amenity/ice_cream.json b/data/brands/amenity/ice_cream.json
@@ -13,6 +13,24 @@
     }
   },
   "items": [
+    {
+      "displayName": "31冰淇淋",
+      "id": "baskinrobbins-cc8b8b",
+      "locationSet": {"include": ["tw"]},
+      "tags": {
+        "amenity": "ice_cream",
+        "brand": "31冰淇淋",
+        "brand:en": "Baskin-Robbins",
+        "brand:ja": "バスキン・ロビンス",
+        "brand:wikidata": "Q584601",
+        "brand:zh": "31冰淇淋",
+        "cuisine": "ice_cream",
+        "name": "31冰淇淋",
+        "name:en": "Baskin-Robbins",
+        "name:ja": "サーティワンアイスクリーム",
+        "name:zh": "31冰淇淋"
+      }
+    },
     {
       "displayName": "33 пингвина",
       "id": "fd1d7e-3c9560",
@@ -120,8 +138,11 @@
     },
     {
       "displayName": "Baskin-Robbins",
-      "id": "baskinrobbins-87d971",
-      "locationSet": {"include": ["001"]},
+      "id": "baskinrobbins-6ae11c",
+      "locationSet": {
+        "include": ["001"],
+        "exclude": ["jp", "tw"]
+      },
       "tags": {
         "amenity": "ice_cream",
         "brand": "Baskin-Robbins",

diff --git a/data/brands/amenity/karaoke_box.json b/data/brands/amenity/karaoke_box.json
@@ -130,6 +130,38 @@
         "name:en": "Big Echo",
         "name:ja": "ビッグエコー"
       }
+    },
+    {
+      "displayName": "好樂迪KTV",
+      "id": "holiday-54981d",
+      "locationSet": {"include": ["tw"]},
+      "tags": {
+        "amenity": "karaoke_box",
+        "brand": "好樂迪KTV",
+        "brand:en": "Holiday KTV",
+        "brand:wikidata": "Q10942898",
+        "brand:zh": "好樂迪KTV",
+        "fee": "yes",
+        "name": "好樂迪",
+        "name:en": "Holiday",
+        "name:zh": "好樂迪"
+      }
+    },
+    {
+      "displayName": "錢櫃Partyworld",
+      "id": "cashboxpartyworld-54981d",
+      "locationSet": {"include": ["tw"]},
+      "tags": {
+        "amenity": "karaoke_box",
+        "brand": "錢櫃Partyworld",
+        "brand:en": "Cashbox Partyworld",
+        "brand:wikidata": "Q15916325",
+        "brand:zh": "錢櫃Partyworld",
+        "fee": "yes",
+        "name": "錢櫃Partyworld",
+        "name:en": "Cashbox Partyworld",
+        "name:zh": "錢櫃Partyworld"
+      }
     }
   ]
 }