diff --git a/data/presets.yaml b/data/presets.yaml index ebf3c4455..ac17a1249 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -7588,9 +7588,9 @@ en: terms: '' shop/craft: # shop=craft - name: Arts and Crafts Store + name: Arts & Crafts Store # 'terms: art*,paint*,frame' - terms: '' + terms: '' shop/curtain: # shop=curtain name: Curtain Store diff --git a/data/presets/presets.json b/data/presets/presets.json index 9999103bb..7ae257531 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1067,7 +1067,7 @@ "shop/copyshop": {"icon": "fas-print", "geometry": ["point", "area"], "tags": {"shop": "copyshop"}, "terms": ["print", "scan"], "name": "Copy Store"}, "shop/cosmetics": {"icon": "temaki-lipstick", "geometry": ["point", "area"], "tags": {"shop": "cosmetics"}, "terms": ["make-up", "makeup"], "name": "Cosmetics Store"}, "shop/country_store": {"icon": "fas-hat-cowboy-side", "geometry": ["point", "area"], "tags": {"shop": "country_store"}, "name": "Country Store"}, - "shop/craft": {"icon": "fas-palette", "geometry": ["point", "area"], "tags": {"shop": "craft"}, "terms": ["art*", "paint*", "frame"], "name": "Arts and Crafts Store"}, + "shop/craft": {"icon": "fas-palette", "geometry": ["point", "area"], "tags": {"shop": "craft"}, "terms": ["art*", "paint*", "frame"], "name": "Arts & Crafts Store"}, "shop/curtain": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["drape*", "window"], "tags": {"shop": "curtain"}, "name": "Curtain Store"}, "shop/dairy": {"icon": "fas-cheese", "geometry": ["point", "area"], "terms": ["milk", "egg", "cheese"], "tags": {"shop": "dairy"}, "name": "Dairy Store"}, "shop/deli": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["lunch", "meat", "sandwich"], "tags": {"shop": "deli"}, "name": "Deli"}, diff --git a/data/presets/presets/shop/craft.json b/data/presets/presets/shop/craft.json index 7225201c9..0f0f4a236 100644 --- a/data/presets/presets/shop/craft.json +++ b/data/presets/presets/shop/craft.json @@ -12,5 +12,5 @@ "paint*", "frame" ], - "name": "Arts and Crafts Store" + "name": "Arts & Crafts Store" } diff --git a/data/taginfo.json b/data/taginfo.json index bb0715820..87fd0a158 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1010,7 +1010,7 @@ {"key": "shop", "value": "copyshop", "description": "🄿 Copy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-print.svg"}, {"key": "shop", "value": "cosmetics", "description": "🄿 Cosmetics Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/lipstick.svg"}, {"key": "shop", "value": "country_store", "description": "🄿 Country Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hat-cowboy-side.svg"}, - {"key": "shop", "value": "craft", "description": "🄿 Arts and Crafts Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-palette.svg"}, + {"key": "shop", "value": "craft", "description": "🄿 Arts & Crafts Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-palette.svg"}, {"key": "shop", "value": "curtain", "description": "🄿 Curtain Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "dairy", "description": "🄿 Dairy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cheese.svg"}, {"key": "shop", "value": "deli", "description": "🄿 Deli", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 0c8a05c8c..7c9118b5e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -9047,7 +9047,7 @@ "terms": "" }, "shop/craft": { - "name": "Arts and Crafts Store", + "name": "Arts & Crafts Store", "terms": "art*,paint*,frame" }, "shop/curtain": {