From 045cc82a1525ae3f700bd794ffac3bf0bb7f6b32 Mon Sep 17 00:00:00 2001 From: iigmir Date: Thu, 5 Jan 2023 22:26:22 +0800 Subject: [PATCH] Fix my inconsistent entries of brand and name --- data/brands/amenity/cafe.json | 14 ++++++-------- data/brands/amenity/fuel.json | 4 +++- data/brands/amenity/ice_cream.json | 4 ++-- data/brands/amenity/karaoke_box.json | 4 ++-- data/brands/amenity/music_school.json | 27 ++++++++++++++++++++++----- 5 files changed, 35 insertions(+), 18 deletions(-) diff --git a/data/brands/amenity/cafe.json b/data/brands/amenity/cafe.json index ff74a314ab6..4bb718c6406 100644 --- a/data/brands/amenity/cafe.json +++ b/data/brands/amenity/cafe.json @@ -739,13 +739,13 @@ "matchNames": ["咖啡伴"], "tags": { "amenity": "cafe", - "brand": "카페베네", + "brand": "Caffebene", "brand:en": "Caffé Bene", "brand:ko": "카페베네", "brand:wikidata": "Q5017149", "brand:zh": "Caffebene", "cuisine": "coffee_shop", - "name": "카페베네", + "name": "Caffebene咖啡伴", "name:en": "Caffé Bene", "name:ko": "카페베네", "name:zh": "Caffebene咖啡伴", @@ -3869,12 +3869,10 @@ "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" } }, @@ -4342,13 +4340,13 @@ "locationSet": {"include": ["tw"]}, "tags": { "amenity": "cafe", - "brand": "珈琲館", + "brand": "客喜康珈琲館", "brand:en": "Kohikan", "brand:ja": "珈琲館", "brand:wikidata": "Q11573290", "brand:zh": "客喜康珈琲館", "cuisine": "coffee_shop", - "name": "珈琲館", + "name": "客喜康珈琲館", "name:en": "Kohikan", "name:ja": "珈琲館", "name:zh": "客喜康珈琲館", @@ -4361,13 +4359,13 @@ "locationSet": {"include": ["tw"]}, "tags": { "amenity": "cafe", - "brand": "コメダ珈琲店", + "brand": "客美多咖啡", "brand:en": "Komeda Coffee Shop", "brand:ja": "コメダ珈琲店", "brand:wikidata": "Q11302679", "brand:zh": "客美多咖啡", "cuisine": "coffee_shop", - "name": "コメダ珈琲店", + "name": "客美多咖啡", "name:en": "Komeda Coffee Shop", "name:ja": "コメダ珈琲店", "name:zh": "客美多咖啡", diff --git a/data/brands/amenity/fuel.json b/data/brands/amenity/fuel.json index 0e66c08ee2b..3f6b7a8fe7a 100644 --- a/data/brands/amenity/fuel.json +++ b/data/brands/amenity/fuel.json @@ -6544,9 +6544,11 @@ "amenity": "fuel", "brand": "好市多加油站", "brand:en": "Costco Gasoline", + "brand:zh": "好市多加油站", "brand:wikidata": "Q715583", "name": "好市多加油站", - "name:en": "Costco Gasoline" + "name:en": "Costco Gasoline", + "name:zh": "好市多加油站" } }, { diff --git a/data/brands/amenity/ice_cream.json b/data/brands/amenity/ice_cream.json index 95f3f58e755..bed35c01da6 100644 --- a/data/brands/amenity/ice_cream.json +++ b/data/brands/amenity/ice_cream.json @@ -19,13 +19,13 @@ "locationSet": {"include": ["tw"]}, "tags": { "amenity": "ice_cream", - "brand": "バスキン・ロビンス", + "brand": "31冰淇淋", "brand:en": "Baskin-Robbins", "brand:ja": "バスキン・ロビンス", "brand:wikidata": "Q584601", "brand:zh": "31冰淇淋", "cuisine": "ice_cream", - "name": "サーティワンアイスクリーム", + "name": "31冰淇淋", "name:en": "Baskin-Robbins", "name:ja": "サーティワンアイスクリーム", "name:zh": "31冰淇淋" diff --git a/data/brands/amenity/karaoke_box.json b/data/brands/amenity/karaoke_box.json index b8f19172a77..614b5d183ff 100644 --- a/data/brands/amenity/karaoke_box.json +++ b/data/brands/amenity/karaoke_box.json @@ -153,14 +153,14 @@ "locationSet": {"include": ["tw"]}, "tags": { "amenity": "karaoke_box", - "brand": "錢櫃", + "brand": "錢櫃Partyworld", "brand:en": "Cashbox Partyworld", "brand:wikidata": "Q15916325", "brand:zh": "錢櫃Partyworld", "fee": "yes", "name": "錢櫃Partyworld", "name:en": "Cashbox Partyworld", - "name:zh": "錢櫃" + "name:zh": "錢櫃Partyworld" } } ] diff --git a/data/brands/amenity/music_school.json b/data/brands/amenity/music_school.json index 166babc317b..69b578cc4f8 100644 --- a/data/brands/amenity/music_school.json +++ b/data/brands/amenity/music_school.json @@ -29,14 +29,33 @@ "tw", "us", "za" + ], + "exclude": [ + "tw" ] }, "tags": { "amenity": "music_school", "brand": "School of Rock", "brand:wikidata": "Q7756376", + "name": "School of Rock" + } + }, + { + "displayName": "搖滾教室", + "locationSet": { + "include": [ + "tw" + ] + }, + "tags": { + "amenity": "music_school", + "brand": "搖滾教室", + "brand:en": "School of Rock", "brand:zh": "搖滾教室", - "name": "School of Rock", + "brand:wikidata": "Q7756376", + "name": "搖滾教室", + "name:en": "School of Rock", "name:zh": "搖滾教室" } }, @@ -46,16 +65,14 @@ "locationSet": {"include": ["tw"]}, "tags": { "amenity": "music_school", - "brand": "ヤマハ音楽教室", + "brand": "Yamaha音樂教室", "brand:en": "Yamaha Music School", "brand:ja": "ヤマハ音楽教室", - "brand:ja-Latn": "Yamaha Ongaku Kyōshitsu", "brand:wikidata": "Q90327852", "brand:zh": "Yamaha音樂教室", - "name": "ヤマハ音楽教室", + "name": "Yamaha音樂教室", "name:en": "Yamaha Music School", "name:ja": "ヤマハ音楽教室", - "name:ja-Latn": "Yamaha Ongaku Kyōshitsu", "name:zh": "Yamaha音樂教室" } },