From 7664ec4d26eb6b55473c72a6c7a20344de493ca6 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 11 Nov 2018 09:26:38 -0500 Subject: [PATCH] Change "Shop" -> "Fast Foo" in names of the fast food cuisine presets --- data/presets.yaml | 24 +++++++++---------- data/presets/presets.json | 12 +++++----- .../presets/amenity/fast_food/burger.json | 2 +- .../presets/amenity/fast_food/chicken.json | 2 +- .../amenity/fast_food/fish_and_chips.json | 2 +- .../presets/amenity/fast_food/kebab.json | 2 +- .../presets/amenity/fast_food/pizza.json | 2 +- .../presets/amenity/fast_food/sandwich.json | 2 +- data/taginfo.json | 12 +++++----- dist/locales/en.json | 12 +++++----- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 1c706ae8d..61a9116f9 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2366,34 +2366,34 @@ en: terms: '' amenity/fast_food/burger: # 'amenity=fast_food, cuisine=burger' - name: Burger Shop + name: Burger Fast Food # 'terms: breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table' - terms: '' + terms: '' amenity/fast_food/chicken: # 'amenity=fast_food, cuisine=chicken' - name: Chicken Shop + name: Chicken Fast Food # 'terms: breakfast,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table' - terms: '' + terms: '' amenity/fast_food/fish_and_chips: # 'amenity=fast_food, cuisine=fish_and_chips' - name: Fish & Chips Shop + name: Fish & Chips Fast Food # 'terms: breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,french fries' - terms: '' + terms: '' amenity/fast_food/kebab: # 'amenity=fast_food, cuisine=kebab' - name: Kebab Shop + name: Kebab Fast Food # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table' - terms: '' + terms: '' amenity/fast_food/pizza: # 'amenity=fast_food, cuisine=pizza' - name: Pizza Shop + name: Pizza Fast Food # 'terms: dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice' - terms: '' + terms: '' amenity/fast_food/sandwich: # 'amenity=fast_food, cuisine=sandwich' - name: Sandwich Shop + name: Sandwich Fast Food # 'terms: breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table' - terms: '' + terms: '' amenity/ferry_terminal: # amenity=ferry_terminal name: Ferry Station / Terminal diff --git a/data/presets/presets.json b/data/presets/presets.json index d69629a60..f7ebbce24 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -85,12 +85,12 @@ "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"}, "amenity/embassy": {"icon": "maki-embassy", "fields": ["name", "country", "address", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "embassy"}, "name": "Embassy"}, "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"}, - "amenity/fast_food/burger": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "burger"}, "reference": {"key": "cuisine", "value": "burger"}, "name": "Burger Shop"}, - "amenity/fast_food/chicken": {"icon": "fas-drumstick-bite", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "chicken"}, "reference": {"key": "cuisine", "value": "chicken"}, "name": "Chicken Shop"}, - "amenity/fast_food/fish_and_chips": {"icon": "fas-fish", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "french fries"], "tags": {"amenity": "fast_food", "cuisine": "fish_and_chips"}, "reference": {"key": "cuisine", "value": "fish_and_chips"}, "name": "Fish & Chips Shop"}, - "amenity/fast_food/kebab": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "kebab"}, "reference": {"key": "cuisine", "value": "kebab"}, "name": "Kebab Shop"}, - "amenity/fast_food/pizza": {"icon": "maki-restaurant-pizza", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["dine", "dining", "dinner", "drive-in", "eat", "lunch", "table", "deep dish", "thin crust", "slice"], "tags": {"amenity": "fast_food", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Shop"}, - "amenity/fast_food/sandwich": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "sandwich"}, "reference": {"key": "cuisine", "value": "sandwich"}, "name": "Sandwich Shop"}, + "amenity/fast_food/burger": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "burger"}, "reference": {"key": "cuisine", "value": "burger"}, "name": "Burger Fast Food"}, + "amenity/fast_food/chicken": {"icon": "fas-drumstick-bite", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "chicken"}, "reference": {"key": "cuisine", "value": "chicken"}, "name": "Chicken Fast Food"}, + "amenity/fast_food/fish_and_chips": {"icon": "fas-fish", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "french fries"], "tags": {"amenity": "fast_food", "cuisine": "fish_and_chips"}, "reference": {"key": "cuisine", "value": "fish_and_chips"}, "name": "Fish & Chips Fast Food"}, + "amenity/fast_food/kebab": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "kebab"}, "reference": {"key": "cuisine", "value": "kebab"}, "name": "Kebab Fast Food"}, + "amenity/fast_food/pizza": {"icon": "maki-restaurant-pizza", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["dine", "dining", "dinner", "drive-in", "eat", "lunch", "table", "deep dish", "thin crust", "slice"], "tags": {"amenity": "fast_food", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Fast Food"}, + "amenity/fast_food/sandwich": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "takeaway", "delivery", "drive_through", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "sandwich"}, "reference": {"key": "cuisine", "value": "sandwich"}, "name": "Sandwich Fast Food"}, "amenity/fire_station": {"icon": "maki-fire-station", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "fire_station"}, "name": "Fire Station"}, "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"}, "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "name": "Fountain"}, diff --git a/data/presets/presets/amenity/fast_food/burger.json b/data/presets/presets/amenity/fast_food/burger.json index cc862906a..c281c461e 100644 --- a/data/presets/presets/amenity/fast_food/burger.json +++ b/data/presets/presets/amenity/fast_food/burger.json @@ -36,5 +36,5 @@ "key": "cuisine", "value": "burger" }, - "name": "Burger Shop" + "name": "Burger Fast Food" } diff --git a/data/presets/presets/amenity/fast_food/chicken.json b/data/presets/presets/amenity/fast_food/chicken.json index 4e9228b6c..8196fa817 100644 --- a/data/presets/presets/amenity/fast_food/chicken.json +++ b/data/presets/presets/amenity/fast_food/chicken.json @@ -37,5 +37,5 @@ "key": "cuisine", "value": "chicken" }, - "name": "Chicken Shop" + "name": "Chicken Fast Food" } diff --git a/data/presets/presets/amenity/fast_food/fish_and_chips.json b/data/presets/presets/amenity/fast_food/fish_and_chips.json index d0f4d3f5c..94d0e32c3 100644 --- a/data/presets/presets/amenity/fast_food/fish_and_chips.json +++ b/data/presets/presets/amenity/fast_food/fish_and_chips.json @@ -39,5 +39,5 @@ "key": "cuisine", "value": "fish_and_chips" }, - "name": "Fish & Chips Shop" + "name": "Fish & Chips Fast Food" } diff --git a/data/presets/presets/amenity/fast_food/kebab.json b/data/presets/presets/amenity/fast_food/kebab.json index 2f35f1b07..5bb700b80 100644 --- a/data/presets/presets/amenity/fast_food/kebab.json +++ b/data/presets/presets/amenity/fast_food/kebab.json @@ -40,5 +40,5 @@ "key": "cuisine", "value": "kebab" }, - "name": "Kebab Shop" + "name": "Kebab Fast Food" } diff --git a/data/presets/presets/amenity/fast_food/pizza.json b/data/presets/presets/amenity/fast_food/pizza.json index 4852e0e3d..952b96700 100644 --- a/data/presets/presets/amenity/fast_food/pizza.json +++ b/data/presets/presets/amenity/fast_food/pizza.json @@ -37,5 +37,5 @@ "key": "cuisine", "value": "pizza" }, - "name": "Pizza Shop" + "name": "Pizza Fast Food" } diff --git a/data/presets/presets/amenity/fast_food/sandwich.json b/data/presets/presets/amenity/fast_food/sandwich.json index e1819e493..e450dc1c0 100644 --- a/data/presets/presets/amenity/fast_food/sandwich.json +++ b/data/presets/presets/amenity/fast_food/sandwich.json @@ -38,5 +38,5 @@ "key": "cuisine", "value": "sandwich" }, - "name": "Sandwich Shop" + "name": "Sandwich Fast Food" } diff --git a/data/taginfo.json b/data/taginfo.json index d412b7aa6..2a8d6e273 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -571,42 +571,42 @@ { "key": "cuisine", "value": "burger", - "description": "Burger Shop", + "description": "Burger Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fast-food-15.svg?sanitize=true" }, { "key": "cuisine", "value": "chicken", - "description": "Chicken Shop", + "description": "Chicken Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-drumstick-bite.svg?sanitize=true" }, { "key": "cuisine", "value": "fish_and_chips", - "description": "Fish & Chips Shop", + "description": "Fish & Chips Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-fish.svg?sanitize=true" }, { "key": "cuisine", "value": "kebab", - "description": "Kebab Shop", + "description": "Kebab Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true" }, { "key": "cuisine", "value": "pizza", - "description": "Pizza Shop, Pizza Restaurant", + "description": "Pizza Fast Food, Pizza Restaurant", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-pizza-15.svg?sanitize=true" }, { "key": "cuisine", "value": "sandwich", - "description": "Sandwich Shop", + "description": "Sandwich Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true" }, diff --git a/dist/locales/en.json b/dist/locales/en.json index b05274004..ee73a0156 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3517,27 +3517,27 @@ "terms": "restaurant,takeaway" }, "amenity/fast_food/burger": { - "name": "Burger Shop", + "name": "Burger Fast Food", "terms": "breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table" }, "amenity/fast_food/chicken": { - "name": "Chicken Shop", + "name": "Chicken Fast Food", "terms": "breakfast,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table" }, "amenity/fast_food/fish_and_chips": { - "name": "Fish & Chips Shop", + "name": "Fish & Chips Fast Food", "terms": "breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,french fries" }, "amenity/fast_food/kebab": { - "name": "Kebab Shop", + "name": "Kebab Fast Food", "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table" }, "amenity/fast_food/pizza": { - "name": "Pizza Shop", + "name": "Pizza Fast Food", "terms": "dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice" }, "amenity/fast_food/sandwich": { - "name": "Sandwich Shop", + "name": "Sandwich Fast Food", "terms": "breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table" }, "amenity/fire_station": {