From 8bad3e2f4bef4383d4a828862a407c87753526e0 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 9 May 2019 10:12:51 -0400 Subject: [PATCH] Update icon for height restrictor, npm run build for new presets --- data/presets.yaml | 8 +++++++ data/presets/presets.json | 2 ++ .../presets/barrier/height_restrictor.json | 2 +- data/taginfo.json | 2 ++ dist/locales/en.json | 24 ++++++++++++++++++- 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 42013477f..58f67ffa3 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3419,6 +3419,10 @@ en: # barrier=cattle_grid name: Cattle Grid terms: '' + barrier/chain: + # barrier=chain + name: Chain + terms: '' barrier/city_wall: # barrier=city_wall name: City Wall @@ -3456,6 +3460,10 @@ en: # barrier=hedge name: Hedge terms: '' + barrier/height_restrictor: + # barrier=height_restrictor + name: Height Restrictor + terms: '' barrier/kerb: # barrier=kerb name: Curb diff --git a/data/presets/presets.json b/data/presets/presets.json index 199249d35..789bc5abd 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -262,6 +262,7 @@ "barrier/bollard": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex", "line"], "tags": {"barrier": "bollard"}, "name": "Bollard"}, "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"}, "barrier/cattle_grid": {"icon": "maki-barrier", "geometry": ["vertex"], "tags": {"barrier": "cattle_grid"}, "name": "Cattle Grid"}, + "barrier/chain": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "chain"}, "name": "Chain"}, "barrier/city_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "city_wall"}, "name": "City Wall"}, "barrier/cycle_barrier": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "cycle_barrier"}, "name": "Cycle Barrier"}, "barrier/ditch": {"icon": "maki-roadblock", "geometry": ["line", "area"], "tags": {"barrier": "ditch"}, "name": "Trench", "matchScore": 0.25}, @@ -270,6 +271,7 @@ "barrier/gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"}, "barrier/guard_rail": {"icon": "temaki-guard_rail", "fields": ["material"], "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75}, "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25}, + "barrier/height_restrictor": {"icon": "temaki-car_wash", "fields": ["maxheight"], "geometry": ["vertex"], "tags": {"barrier": "height_restrictor"}, "name": "Height Restrictor"}, "barrier/kerb": {"fields": ["kerb", "tactile_paving"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"}, "barrier/kerb/flush": {"icon": "maki-wheelchair", "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "flush"}, "reference": {"key": "kerb", "value": "flush"}, "terms": ["even curb", "level curb", "tactile curb"], "name": "Flush Curb"}, "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"}, diff --git a/data/presets/presets/barrier/height_restrictor.json b/data/presets/presets/barrier/height_restrictor.json index a05758596..072185832 100644 --- a/data/presets/presets/barrier/height_restrictor.json +++ b/data/presets/presets/barrier/height_restrictor.json @@ -1,5 +1,5 @@ { - "icon": "maki-barrier", + "icon": "temaki-car_wash", "fields": [ "maxheight" ], diff --git a/data/taginfo.json b/data/taginfo.json index 3eb2bfda3..9718ed85c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -259,6 +259,7 @@ {"key": "barrier", "value": "bollard", "description": "🄿 Bollard", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "barrier", "value": "border_control", "description": "🄿 Border Control", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "barrier", "value": "cattle_grid", "description": "🄿 Cattle Grid", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"}, + {"key": "barrier", "value": "chain", "description": "🄿 Chain", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"}, {"key": "barrier", "value": "city_wall", "description": "🄿 City Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wall.svg?sanitize=true"}, {"key": "barrier", "value": "cycle_barrier", "description": "🄿 Cycle Barrier", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "barrier", "value": "ditch", "description": "🄿 Trench", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, @@ -267,6 +268,7 @@ {"key": "barrier", "value": "gate", "description": "🄿 Gate", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"}, {"key": "barrier", "value": "guard_rail", "description": "🄿 Guard Rail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/guard_rail.svg?sanitize=true"}, {"key": "barrier", "value": "hedge", "description": "🄿 Hedge", "object_types": ["way", "area"]}, + {"key": "barrier", "value": "height_restrictor", "description": "🄿 Height Restrictor", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/car_wash.svg?sanitize=true"}, {"key": "barrier", "value": "kerb", "description": "🄿 Curb", "object_types": ["node", "way"]}, {"key": "kerb", "value": "flush", "description": "🄿 Flush Curb", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"}, {"key": "kerb", "value": "lowered", "description": "🄿 Lowered Curb", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 70b4fc9db..a759f67b0 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5311,6 +5311,10 @@ "name": "Cattle Grid", "terms": "" }, + "barrier/chain": { + "name": "Chain", + "terms": "" + }, "barrier/city_wall": { "name": "City Wall", "terms": "" @@ -5343,6 +5347,10 @@ "name": "Hedge", "terms": "" }, + "barrier/height_restrictor": { + "name": "Height Restrictor", + "terms": "" + }, "barrier/kerb": { "name": "Curb", "terms": "" @@ -9076,6 +9084,20 @@ "description": "Imagery boundaries and capture dates. Labels appear at zoom level 13 and higher.", "name": "DigitalGlobe Standard Imagery Vintage" }, + "DigitalGlobe-Vivid": { + "attribution": { + "text": "Terms & Feedback" + }, + "description": "DigitalGlobe-Vivid is a mosiac with optimal aesthetics and currency for any area on the globe, 50cm resolution or better, and image currency <20 month average globally.", + "name": "DigitalGlobe Vivid Imagery" + }, + "EOXAT2018CLOUDLESS": { + "attribution": { + "text": "Sentinel-2 cloudless - https://s2maps.eu by EOX IT Services GmbH (Contains modified Copernicus Sentinel data 2017 & 2018)" + }, + "description": "Post-processed Sentinel Satellite imagery.", + "name": "eox.at 2018 cloudless" + }, "EsriWorldImagery": { "attribution": { "text": "Terms & Feedback" @@ -9415,7 +9437,7 @@ "attribution": { "text": "© Stockholm municipality, CC0" }, - "description": "Orthophotos from the municipality of Stockholm 2015, CC0 license", + "description": "Orthophotos from the municipality of Stockholm 2016, CC0 license", "name": "Stockholm Orthophoto" }, "tf-cycle": {