From ab14ee6c80b6017a86840acbc9c0210a14ce254b Mon Sep 17 00:00:00 2001 From: hikemaniac <31667811+hikemaniac@users.noreply.github.com> Date: Wed, 23 Oct 2019 16:11:35 +0200 Subject: [PATCH] Added more common advertising presets --- data/presets.yaml | 12 ++++++++++ data/presets/presets.json | 3 +++ data/presets/presets/advertising/board.json | 14 ++++++++++++ .../presets/advertising/poster_box.json | 13 +++++++++++ data/presets/presets/advertising/totem.json | 16 ++++++++++++++ data/taginfo.json | 3 +++ dist/locales/en.json | 22 +++++++++++++++++++ 7 files changed, 83 insertions(+) create mode 100644 data/presets/presets/advertising/board.json create mode 100644 data/presets/presets/advertising/poster_box.json create mode 100644 data/presets/presets/advertising/totem.json diff --git a/data/presets.yaml b/data/presets.yaml index 2607d38bc..a4a7ab088 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2593,10 +2593,22 @@ en: # advertising=billboard name: Billboard terms: '' + advertising/board: + # advertising=board + name: Notice Board + terms: '' advertising/column: # advertising=column name: Advertising Column terms: '' + advertising/poster_box: + # advertising=poster_box + name: Poster Box + terms: '' + advertising/totem: + # advertising=totem + name: Advertising Totem + terms: '' aerialway: # aerialway=* name: Aerialway diff --git a/data/presets/presets.json b/data/presets/presets.json index fbbed9eb8..bfa3e5549 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -25,7 +25,10 @@ "addr/interpolation": {"fields": ["addr/interpolation"], "geometry": ["line"], "tags": {"addr:interpolation": "*"}, "name": "Address Interpolation", "searchable": false, "matchScore": 0.2}, "address": {"fields": ["address"], "geometry": ["point", "vertex", "area"], "tags": {"addr:*": "*"}, "addTags": {}, "removeTags": {}, "reference": {"key": "addr"}, "name": "Address", "matchScore": 0.15}, "advertising/billboard": {"fields": ["direction", "lit"], "geometry": ["point", "vertex", "line"], "tags": {"advertising": "billboard"}, "name": "Billboard"}, + "advertising/board": {"fields": ["lit", "support", "height"], "geometry": ["point"], "tags": {"advertising": "board"}, "name": "Notice Board"}, "advertising/column": {"icon": "temaki-storage_tank", "fields": ["lit"], "geometry": ["point", "area"], "tags": {"advertising": "column"}, "name": "Advertising Column"}, + "advertising/poster_box": {"fields": ["lit", "height"], "geometry": ["point"], "tags": {"advertising": "poster_box"}, "name": "Poster Box"}, + "advertising/totem": {"fields": ["operator", "lit", "visibility", "direction", "height"], "geometry": ["point"], "tags": {"advertising": "totem"}, "name": "Advertising Totem"}, "aerialway/station": {"icon": "maki-aerialway", "geometry": ["point", "vertex", "area"], "fields": ["aerialway/access", "aerialway/summer/access", "elevation", "building_area"], "tags": {"aerialway": "station"}, "matchScore": 0.95, "name": "Aerialway Station", "searchable": false, "replacement": "public_transport/station_aerialway"}, "aerialway/cable_car": {"icon": "fas-tram", "geometry": ["line"], "terms": ["tramway", "ropeway"], "fields": ["name", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "cable_car"}, "name": "Cable Car"}, "aerialway/chair_lift": {"icon": "temaki-chairlift", "geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "chair_lift"}, "name": "Chair Lift"}, diff --git a/data/presets/presets/advertising/board.json b/data/presets/presets/advertising/board.json new file mode 100644 index 000000000..e04623ad6 --- /dev/null +++ b/data/presets/presets/advertising/board.json @@ -0,0 +1,14 @@ +{ + "fields": [ + "lit", + "support", + "height" + ], + "geometry": [ + "point" + ], + "tags": { + "advertising": "board" + }, + "name": "Notice Board" +} diff --git a/data/presets/presets/advertising/poster_box.json b/data/presets/presets/advertising/poster_box.json new file mode 100644 index 000000000..c93c32dea --- /dev/null +++ b/data/presets/presets/advertising/poster_box.json @@ -0,0 +1,13 @@ +{ + "fields": [ + "lit", + "height" + ], + "geometry": [ + "point" + ], + "tags": { + "advertising": "poster_box" + }, + "name": "Poster Box" +} diff --git a/data/presets/presets/advertising/totem.json b/data/presets/presets/advertising/totem.json new file mode 100644 index 000000000..c4d7e09b0 --- /dev/null +++ b/data/presets/presets/advertising/totem.json @@ -0,0 +1,16 @@ +{ + "fields": [ + "operator", + "lit", + "visibility", + "direction", + "height" + ], + "geometry": [ + "point" + ], + "tags": { + "advertising": "totem" + }, + "name": "Advertising Totem" +} diff --git a/data/taginfo.json b/data/taginfo.json index db9fe23cf..12f4a19f8 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -28,7 +28,10 @@ {"key": "addr:interpolation", "description": "🄿 Address Interpolation (unsearchable)", "object_types": ["way"]}, {"key": "addr:*", "description": "🄿 Address", "object_types": ["node", "area"]}, {"key": "advertising", "value": "billboard", "description": "🄿 Billboard", "object_types": ["node", "way"]}, + {"key": "advertising", "value": "board", "description": "🄿 Notice Board", "object_types": ["node"]}, {"key": "advertising", "value": "column", "description": "🄿 Advertising Column", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/storage_tank.svg"}, + {"key": "advertising", "value": "poster_box", "description": "🄿 Poster Box", "object_types": ["node"]}, + {"key": "advertising", "value": "totem", "description": "🄿 Advertising Totem", "object_types": ["node"]}, {"key": "aerialway", "value": "station", "description": "🄿 Aerialway Station (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"}, {"key": "aerialway", "value": "cable_car", "description": "🄿 Cable Car", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tram.svg"}, {"key": "aerialway", "value": "chair_lift", "description": "🄿 Chair Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/chairlift.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index c7b26a335..02e4219aa 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5019,10 +5019,22 @@ "name": "Billboard", "terms": "" }, + "advertising/board": { + "name": "Notice Board", + "terms": "" + }, "advertising/column": { "name": "Advertising Column", "terms": "" }, + "advertising/poster_box": { + "name": "Poster Box", + "terms": "" + }, + "advertising/totem": { + "name": "Advertising Totem", + "terms": "" + }, "aerialway/station": { "name": "Aerialway Station", "terms": "" @@ -10065,6 +10077,10 @@ "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap", "name": "TIGER Roads 2018" }, + "US-TIGER-Roads-2019": { + "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap", + "name": "TIGER Roads 2019" + }, "USDA-NAIP": { "description": "The most recent year of DOQQs from the National Agriculture Imagery Program (NAIP) for each state in the contiguous United States.", "name": "National Agriculture Imagery Program" @@ -10091,6 +10107,12 @@ }, "name": "UrbIS-Ortho 2018" }, + "UrbISOrtho2019": { + "attribution": { + "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB" + }, + "name": "UrbIS-Ortho 2019" + }, "UrbisAdmFR": { "attribution": { "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB"