From 299858707689f3cb89dc5488dabfb370fad13035 Mon Sep 17 00:00:00 2001 From: mikenath223 Date: Wed, 9 Sep 2020 09:06:16 +0100 Subject: [PATCH 1/2] Add welcome sign preset and derived data for #7846 --- data/presets.yaml | 5 +++++ data/presets/presets.json | 1 + data/presets/presets/place/welcome_sign.json | 15 +++++++++++++++ data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 5 files changed, 26 insertions(+) create mode 100644 data/presets/presets/place/welcome_sign.json diff --git a/data/presets.yaml b/data/presets.yaml index 7b9195453..107c20621 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -7244,6 +7244,11 @@ en: # place=village name: Village terms: '' + place/welcome_sign: + # 'description=A sign welcoming users to a place, place=welcome' + name: Welcome Sign + # 'terms: new location' + terms: '' playground: # playground=* name: Playground Equipment diff --git a/data/presets/presets.json b/data/presets/presets.json index f9d5d0e14..30fd88952 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -939,6 +939,7 @@ "place/suburb": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "suburb"}, "terms": ["boro", "borough", "quarter"], "name": "Borough / Suburb"}, "place/town": {"icon": "maki-town", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "town"}, "name": "Town"}, "place/village": {"icon": "maki-village", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "village"}, "name": "Village"}, + "place/welcome_sign": {"icon": "maki-lighthouse", "geometry": ["point", "area"], "terms": ["new location"], "tags": {"description": "A sign welcoming users to a place", "place": "welcome"}, "name": "Welcome Sign"}, "playground/balance_beam": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "balancebeam"}, "name": "Play Balance Beam"}, "playground/basket_spinner": {"icon": "maki-playground", "geometry": ["point"], "terms": ["basket rotator"], "tags": {"playground": "basketrotator"}, "name": "Basket Spinner"}, "playground/basket_swing": {"icon": "maki-playground", "geometry": ["point"], "tags": {"playground": "basketswing"}, "name": "Basket Swing"}, diff --git a/data/presets/presets/place/welcome_sign.json b/data/presets/presets/place/welcome_sign.json new file mode 100644 index 000000000..a3b599932 --- /dev/null +++ b/data/presets/presets/place/welcome_sign.json @@ -0,0 +1,15 @@ +{ + "icon": "maki-lighthouse", + "geometry": [ + "point", + "area" + ], + "terms": [ + "new location" + ], + "tags": { + "description": "A sign welcoming users to a place", + "place": "welcome" + }, + "name": "Welcome Sign" +} \ No newline at end of file diff --git a/data/taginfo.json b/data/taginfo.json index 861dae55f..692f9274d 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -917,6 +917,7 @@ {"key": "place", "value": "suburb", "description": "🄿 Borough / Suburb", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/triangle-stroked-15.svg"}, {"key": "place", "value": "town", "description": "🄿 Town", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-15.svg"}, {"key": "place", "value": "village", "description": "🄿 Village", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/village-15.svg"}, + {"key": "place", "value": "welcome", "description": "🄿 Welcome Sign", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lighthouse-15.svg"}, {"key": "playground", "value": "balancebeam", "description": "🄿 Play Balance Beam", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, {"key": "playground", "value": "basketrotator", "description": "🄿 Basket Spinner", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, {"key": "playground", "value": "basketswing", "description": "🄿 Basket Swing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index f9f35db51..9eb14863f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8924,6 +8924,10 @@ "name": "Village", "terms": "" }, + "place/welcome_sign": { + "name": "Welcome Sign", + "terms": "new location" + }, "playground/balance_beam": { "name": "Play Balance Beam", "terms": "" From 0af9069f9ae3d78101375cfa7895b6e36db66688 Mon Sep 17 00:00:00 2001 From: mikenath223 Date: Wed, 16 Sep 2020 23:33:17 +0100 Subject: [PATCH 2/2] Make all requested changes, move file as required --- data/presets.yaml | 10 +++++----- data/presets/presets.json | 2 +- data/presets/presets/place/welcome_sign.json | 15 --------------- .../tourism/information/board/welcome_sign.json | 15 +++++++++++++++ data/taginfo.json | 2 +- dist/locales/en.json | 8 ++++---- 6 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 data/presets/presets/place/welcome_sign.json create mode 100644 data/presets/presets/tourism/information/board/welcome_sign.json diff --git a/data/presets.yaml b/data/presets.yaml index 107c20621..de7466667 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -7244,11 +7244,6 @@ en: # place=village name: Village terms: '' - place/welcome_sign: - # 'description=A sign welcoming users to a place, place=welcome' - name: Welcome Sign - # 'terms: new location' - terms: '' playground: # playground=* name: Playground Equipment @@ -8744,6 +8739,11 @@ en: # 'tourism=information, information=board' name: Information Board terms: '' + tourism/information/board/welcome_sign: + # 'tourism=information, information=board, board_type=welcome_sign' + name: Welcome Sign + # 'terms: new location' + terms: '' tourism/information/guidepost: # 'tourism=information, information=guidepost' name: Guidepost diff --git a/data/presets/presets.json b/data/presets/presets.json index 30fd88952..ca6de1dea 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -939,7 +939,6 @@ "place/suburb": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "suburb"}, "terms": ["boro", "borough", "quarter"], "name": "Borough / Suburb"}, "place/town": {"icon": "maki-town", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "town"}, "name": "Town"}, "place/village": {"icon": "maki-village", "fields": ["name", "population"], "moreFields": ["{place}", "website"], "geometry": ["point", "area"], "tags": {"place": "village"}, "name": "Village"}, - "place/welcome_sign": {"icon": "maki-lighthouse", "geometry": ["point", "area"], "terms": ["new location"], "tags": {"description": "A sign welcoming users to a place", "place": "welcome"}, "name": "Welcome Sign"}, "playground/balance_beam": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "balancebeam"}, "name": "Play Balance Beam"}, "playground/basket_spinner": {"icon": "maki-playground", "geometry": ["point"], "terms": ["basket rotator"], "tags": {"playground": "basketrotator"}, "name": "Basket Spinner"}, "playground/basket_swing": {"icon": "maki-playground", "geometry": ["point"], "tags": {"playground": "basketswing"}, "name": "Basket Swing"}, @@ -1255,6 +1254,7 @@ "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "bar", "stars"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "terms": ["concierge", "lodge", "lodging", "overnight accommodations"], "name": "Hotel"}, "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "moreFields": ["level"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"}, "tourism/information/board": {"icon": "temaki-info_board", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"}, + "tourism/information/board/welcome_sign": {"icon": "maki-embassy", "geometry": ["point"], "terms": ["new location"], "tags": {"tourism": "information", "information": "board", "board_type": "welcome_sign"}, "name": "Welcome Sign"}, "tourism/information/guidepost": {"icon": "fas-map-signs", "fields": ["name", "ele_node", "operator", "ref"], "moreFields": ["material"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"}, "tourism/information/map": {"icon": "fas-map", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"}, "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "terms": ["information office", "tour guide", "tourism office", "tourist information center", "visitors center", "visitors information center", "welcome center"], "name": "Visitor Center"}, diff --git a/data/presets/presets/place/welcome_sign.json b/data/presets/presets/place/welcome_sign.json deleted file mode 100644 index a3b599932..000000000 --- a/data/presets/presets/place/welcome_sign.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "icon": "maki-lighthouse", - "geometry": [ - "point", - "area" - ], - "terms": [ - "new location" - ], - "tags": { - "description": "A sign welcoming users to a place", - "place": "welcome" - }, - "name": "Welcome Sign" -} \ No newline at end of file diff --git a/data/presets/presets/tourism/information/board/welcome_sign.json b/data/presets/presets/tourism/information/board/welcome_sign.json new file mode 100644 index 000000000..e3aa872b0 --- /dev/null +++ b/data/presets/presets/tourism/information/board/welcome_sign.json @@ -0,0 +1,15 @@ +{ + "icon": "maki-embassy", + "geometry": [ + "point" + ], + "terms": [ + "new location" + ], + "tags": { + "tourism": "information", + "information": "board", + "board_type": "welcome_sign" + }, + "name": "Welcome Sign" +} \ No newline at end of file diff --git a/data/taginfo.json b/data/taginfo.json index 692f9274d..496bfba3e 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -917,7 +917,6 @@ {"key": "place", "value": "suburb", "description": "🄿 Borough / Suburb", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/triangle-stroked-15.svg"}, {"key": "place", "value": "town", "description": "🄿 Town", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-15.svg"}, {"key": "place", "value": "village", "description": "🄿 Village", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/village-15.svg"}, - {"key": "place", "value": "welcome", "description": "🄿 Welcome Sign", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lighthouse-15.svg"}, {"key": "playground", "value": "balancebeam", "description": "🄿 Play Balance Beam", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, {"key": "playground", "value": "basketrotator", "description": "🄿 Basket Spinner", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, {"key": "playground", "value": "basketswing", "description": "🄿 Basket Swing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, @@ -1200,6 +1199,7 @@ {"key": "tourism", "value": "hotel", "description": "🄿 Hotel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-concierge-bell.svg"}, {"key": "tourism", "value": "information", "description": "🄿 Information", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"}, {"key": "information", "value": "board", "description": "🄿 Information Board", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/info_board.svg"}, + {"key": "board_type", "value": "welcome_sign", "description": "🄿 Welcome Sign", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/embassy-15.svg"}, {"key": "information", "value": "guidepost", "description": "🄿 Guidepost", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-map-signs.svg"}, {"key": "information", "value": "map", "description": "🄿 Map", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-map.svg"}, {"key": "information", "value": "office", "description": "🄿 Visitor Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 9eb14863f..20727df9b 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8924,10 +8924,6 @@ "name": "Village", "terms": "" }, - "place/welcome_sign": { - "name": "Welcome Sign", - "terms": "new location" - }, "playground/balance_beam": { "name": "Play Balance Beam", "terms": "" @@ -10174,6 +10170,10 @@ "name": "Information Board", "terms": "" }, + "tourism/information/board/welcome_sign": { + "name": "Welcome Sign", + "terms": "new location" + }, "tourism/information/guidepost": { "name": "Guidepost", "terms": "signpost"