From 2744fb560c53774400ee758381882b9ebd731a55 Mon Sep 17 00:00:00 2001 From: Nisarg Date: Sun, 12 Jul 2020 01:28:46 -0400 Subject: [PATCH 1/2] Model Shop Preset Added --- data/presets.yaml | 5 +++++ data/presets/presets.json | 1 + data/presets/presets/shop/model.json | 9 +++++++++ data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 5 files changed, 20 insertions(+) create mode 100644 data/presets/presets/shop/model.json diff --git a/data/presets.yaml b/data/presets.yaml index e056721dc..186948a8b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -8230,6 +8230,11 @@ en: # shop=mobile_phone name: Mobile Phone Store terms: '' + shop/model: + # shop=model + name: Model Shop + # 'terms: manga,figurine,hobby' + terms: '' shop/money_lender: # shop=money_lender name: Money Lender diff --git a/data/presets/presets.json b/data/presets/presets.json index c9d393404..9596e403b 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1155,6 +1155,7 @@ "shop/medical_supply": {"icon": "fas-crutch", "geometry": ["point", "area"], "tags": {"shop": "medical_supply"}, "name": "Medical Supply Store"}, "shop/military_surplus": {"icon": "temaki-military", "geometry": ["point", "area"], "terms": ["armor", "army-navy store", "army surplus", "navy surplus", "tactical gear", "war surplus shop", "weapons"], "tags": {"shop": "military_surplus"}, "name": "Military Surplus Store"}, "shop/mobile_phone": {"icon": "fas-mobile-alt", "geometry": ["point", "area"], "tags": {"shop": "mobile_phone"}, "name": "Mobile Phone Store"}, + "shop/model": {"icon": "fas-dragon", "geometry": ["point", "area"], "tags": {"shop": "model"}, "terms": ["manga", "figurine", "hobby"], "name": "Model Shop"}, "shop/money_lender": {"icon": "temaki-money_hand", "fields": ["{shop}", "currency_multi"], "geometry": ["point", "area"], "tags": {"shop": "money_lender"}, "name": "Money Lender"}, "shop/motorcycle_repair": {"icon": "temaki-motorcycle_repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto", "bike", "garage", "motorcycle", "repair", "service"], "tags": {"shop": "motorcycle_repair"}, "name": "Motorcycle Repair Shop"}, "shop/motorcycle": {"icon": "fas-motorcycle", "fields": ["name", "brand", "{shop}"], "geometry": ["point", "area"], "terms": ["bike"], "tags": {"shop": "motorcycle"}, "name": "Motorcycle Dealership"}, diff --git a/data/presets/presets/shop/model.json b/data/presets/presets/shop/model.json new file mode 100644 index 000000000..8e60f9517 --- /dev/null +++ b/data/presets/presets/shop/model.json @@ -0,0 +1,9 @@ +{ + "icon": "fas-dragon", + "geometry": ["point", "area"], + "tags": { + "shop": "model" + }, + "terms": ["manga", "figurine", "hobby"], + "name": "Model Shop" +} diff --git a/data/taginfo.json b/data/taginfo.json index aa63944fd..7930fda78 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1100,6 +1100,7 @@ {"key": "shop", "value": "medical_supply", "description": "🄿 Medical Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-crutch.svg"}, {"key": "shop", "value": "military_surplus", "description": "🄿 Military Surplus Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/military.svg"}, {"key": "shop", "value": "mobile_phone", "description": "🄿 Mobile Phone Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-mobile-alt.svg"}, + {"key": "shop", "value": "model", "description": "🄿 Model Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-dragon.svg"}, {"key": "shop", "value": "money_lender", "description": "🄿 Money Lender", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/money_hand.svg"}, {"key": "shop", "value": "motorcycle_repair", "description": "🄿 Motorcycle Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/motorcycle_repair.svg"}, {"key": "shop", "value": "motorcycle", "description": "🄿 Motorcycle Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-motorcycle.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 40a84851f..45cd23a32 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -9703,6 +9703,10 @@ "name": "Mobile Phone Store", "terms": "" }, + "shop/model": { + "name": "Model Shop", + "terms": "manga,figurine,hobby" + }, "shop/money_lender": { "name": "Money Lender", "terms": "" From a338ad5e74f82e37de140835d1e3903d3726ce58 Mon Sep 17 00:00:00 2001 From: Nisarg Date: Tue, 14 Jul 2020 01:33:54 -0400 Subject: [PATCH 2/2] Changed tag and icon --- data/presets.yaml | 2 +- data/presets/presets.json | 2 +- data/presets/presets/shop/model.json | 4 ++-- data/taginfo.json | 2 +- dist/locales/en.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 186948a8b..fb93cbb62 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -8233,7 +8233,7 @@ en: shop/model: # shop=model name: Model Shop - # 'terms: manga,figurine,hobby' + # 'terms: Toys,Games,Crafts' terms: '' shop/money_lender: # shop=money_lender diff --git a/data/presets/presets.json b/data/presets/presets.json index 9596e403b..93459b1fd 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1155,7 +1155,7 @@ "shop/medical_supply": {"icon": "fas-crutch", "geometry": ["point", "area"], "tags": {"shop": "medical_supply"}, "name": "Medical Supply Store"}, "shop/military_surplus": {"icon": "temaki-military", "geometry": ["point", "area"], "terms": ["armor", "army-navy store", "army surplus", "navy surplus", "tactical gear", "war surplus shop", "weapons"], "tags": {"shop": "military_surplus"}, "name": "Military Surplus Store"}, "shop/mobile_phone": {"icon": "fas-mobile-alt", "geometry": ["point", "area"], "tags": {"shop": "mobile_phone"}, "name": "Mobile Phone Store"}, - "shop/model": {"icon": "fas-dragon", "geometry": ["point", "area"], "tags": {"shop": "model"}, "terms": ["manga", "figurine", "hobby"], "name": "Model Shop"}, + "shop/model": {"icon": "fas-dice", "geometry": ["point", "area"], "tags": {"shop": "model"}, "terms": ["Toys", "Games", "Crafts"], "name": "Model Shop"}, "shop/money_lender": {"icon": "temaki-money_hand", "fields": ["{shop}", "currency_multi"], "geometry": ["point", "area"], "tags": {"shop": "money_lender"}, "name": "Money Lender"}, "shop/motorcycle_repair": {"icon": "temaki-motorcycle_repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto", "bike", "garage", "motorcycle", "repair", "service"], "tags": {"shop": "motorcycle_repair"}, "name": "Motorcycle Repair Shop"}, "shop/motorcycle": {"icon": "fas-motorcycle", "fields": ["name", "brand", "{shop}"], "geometry": ["point", "area"], "terms": ["bike"], "tags": {"shop": "motorcycle"}, "name": "Motorcycle Dealership"}, diff --git a/data/presets/presets/shop/model.json b/data/presets/presets/shop/model.json index 8e60f9517..84c0a89a9 100644 --- a/data/presets/presets/shop/model.json +++ b/data/presets/presets/shop/model.json @@ -1,9 +1,9 @@ { - "icon": "fas-dragon", + "icon": "fas-dice", "geometry": ["point", "area"], "tags": { "shop": "model" }, - "terms": ["manga", "figurine", "hobby"], + "terms": ["Toys", "Games", "Crafts"], "name": "Model Shop" } diff --git a/data/taginfo.json b/data/taginfo.json index 7930fda78..83b766d96 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1100,7 +1100,7 @@ {"key": "shop", "value": "medical_supply", "description": "🄿 Medical Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-crutch.svg"}, {"key": "shop", "value": "military_surplus", "description": "🄿 Military Surplus Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/military.svg"}, {"key": "shop", "value": "mobile_phone", "description": "🄿 Mobile Phone Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-mobile-alt.svg"}, - {"key": "shop", "value": "model", "description": "🄿 Model Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-dragon.svg"}, + {"key": "shop", "value": "model", "description": "🄿 Model Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-dice.svg"}, {"key": "shop", "value": "money_lender", "description": "🄿 Money Lender", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/money_hand.svg"}, {"key": "shop", "value": "motorcycle_repair", "description": "🄿 Motorcycle Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/motorcycle_repair.svg"}, {"key": "shop", "value": "motorcycle", "description": "🄿 Motorcycle Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-motorcycle.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 45cd23a32..afab62a38 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -9705,7 +9705,7 @@ }, "shop/model": { "name": "Model Shop", - "terms": "manga,figurine,hobby" + "terms": "Toys,Games,Crafts" }, "shop/money_lender": { "name": "Money Lender",