From e97240e35ef8c2a8c15be005869d50a450a404fb Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Fri, 17 May 2019 15:46:20 -0400 Subject: [PATCH] Allow `natural=bay` on lines (closes #6379) --- css/25_areas.css | 2 ++ data/presets/presets.json | 2 +- data/presets/presets/natural/bay.json | 1 + data/taginfo.json | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/css/25_areas.css b/css/25_areas.css index b76c616ee..6cd355679 100644 --- a/css/25_areas.css +++ b/css/25_areas.css @@ -63,11 +63,13 @@ path.fill.tag-barrier-hedge { /* Blue things */ path.stroke.tag-amenity-fountain, path.stroke.tag-leisure-swimming_pool, +path.stroke.tag-natural-bay, path.stroke.tag-natural-water { stroke: rgb(119, 211, 222); } path.fill.tag-amenity-fountain, path.fill.tag-leisure-swimming_pool, +path.fill.tag-natural-bay, path.fill.tag-natural-water { stroke: rgba(119, 211, 222, 0.3); fill: rgba(119, 211, 222, 0.3); diff --git a/data/presets/presets.json b/data/presets/presets.json index 1f143b882..705ee9225 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -728,7 +728,7 @@ "manhole/drain": {"icon": "maki-water", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "addTags": {"man_made": "manhole", "manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"}, "manhole/telecom": {"icon": "maki-circle-stroked", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "addTags": {"man_made": "manhole", "manhole": "telecom"}, "terms": ["cover", "phone", "hole", "telecom", "telephone", "bt"], "name": "Telecom Manhole"}, "natural/bare_rock": {"geometry": ["area"], "tags": {"natural": "bare_rock"}, "terms": ["rock"], "name": "Bare Rock"}, - "natural/bay": {"icon": "temaki-beach", "geometry": ["point", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"}, + "natural/bay": {"icon": "temaki-beach", "geometry": ["point", "line", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"}, "natural/beach": {"icon": "temaki-beach", "fields": ["surface"], "geometry": ["point", "area"], "tags": {"natural": "beach"}, "terms": ["shore"], "name": "Beach"}, "natural/cape": {"icon": "temaki-beach", "fields": ["name", "elevation", "description"], "geometry": ["point"], "tags": {"natural": "cape"}, "terms": ["bay", "coastline", "erosion", "headland", "promontory"], "name": "Cape"}, "natural/cave_entrance": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "elevation", "access_simple", "direction", "fee", "payment_multi_fee"], "tags": {"natural": "cave_entrance"}, "terms": ["cavern", "hollow", "grotto", "shelter", "cavity"], "name": "Cave Entrance"}, diff --git a/data/presets/presets/natural/bay.json b/data/presets/presets/natural/bay.json index 5c936c3e0..8f04cdb59 100644 --- a/data/presets/presets/natural/bay.json +++ b/data/presets/presets/natural/bay.json @@ -2,6 +2,7 @@ "icon": "temaki-beach", "geometry": [ "point", + "line", "area" ], "fields": [ diff --git a/data/taginfo.json b/data/taginfo.json index e3938ae6e..757358e97 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -700,7 +700,7 @@ {"key": "manhole", "value": "drain", "description": "🄿 Storm Drain", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "manhole", "value": "telecom", "description": "🄿 Telecom Manhole", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/circle-stroked-15.svg?sanitize=true"}, {"key": "natural", "value": "bare_rock", "description": "🄿 Bare Rock", "object_types": ["area"]}, - {"key": "natural", "value": "bay", "description": "🄿 Bay", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beach.svg?sanitize=true"}, + {"key": "natural", "value": "bay", "description": "🄿 Bay", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beach.svg?sanitize=true"}, {"key": "natural", "value": "beach", "description": "🄿 Beach", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beach.svg?sanitize=true"}, {"key": "natural", "value": "cape", "description": "🄿 Cape", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beach.svg?sanitize=true"}, {"key": "natural", "value": "cave_entrance", "description": "🄿 Cave Entrance", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/triangle-15.svg?sanitize=true"},