From 11952c8f684828b8a21a96ed707e023c7246a4d9 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sun, 7 Apr 2019 10:28:17 -0700 Subject: [PATCH] Don't flag traffic_calming=choker or chicane on line features (close #6153) --- data/presets/presets.json | 4 ++-- data/presets/presets/traffic_calming/chicane.json | 1 + data/presets/presets/traffic_calming/choker.json | 1 + data/taginfo.json | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 1fc7016d0..bd99f6672 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1057,8 +1057,8 @@ "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"}, "traffic_calming": {"icon": "temaki-diamond", "fields": ["traffic_calming", "surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "tags": {"traffic_calming": "*"}, "terms": ["bump", "hump", "slow", "speed"], "name": "Traffic Calming"}, "traffic_calming/bump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["hump", "speed", "slow"], "tags": {"traffic_calming": "bump"}, "name": "Speed Bump"}, - "traffic_calming/chicane": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "area"], "terms": ["driveway link", "speed", "slow"], "tags": {"traffic_calming": "chicane"}, "name": "Traffic Chicane"}, - "traffic_calming/choker": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "area"], "terms": ["speed", "slow"], "tags": {"traffic_calming": "choker"}, "name": "Traffic Choker"}, + "traffic_calming/chicane": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "terms": ["driveway link", "speed", "slow"], "tags": {"traffic_calming": "chicane"}, "name": "Traffic Chicane"}, + "traffic_calming/choker": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "terms": ["speed", "slow"], "tags": {"traffic_calming": "choker"}, "name": "Traffic Choker"}, "traffic_calming/cushion": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["bump", "hump", "speed", "slow"], "tags": {"traffic_calming": "cushion"}, "name": "Speed Cushion"}, "traffic_calming/dip": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["speed", "slow"], "tags": {"traffic_calming": "dip"}, "name": "Dip"}, "traffic_calming/hump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["bump", "speed", "slow"], "tags": {"traffic_calming": "hump"}, "name": "Speed Hump"}, diff --git a/data/presets/presets/traffic_calming/chicane.json b/data/presets/presets/traffic_calming/chicane.json index 6e56f64fe..f51abe55a 100644 --- a/data/presets/presets/traffic_calming/chicane.json +++ b/data/presets/presets/traffic_calming/chicane.json @@ -6,6 +6,7 @@ ], "geometry": [ "vertex", + "line", "area" ], "terms": [ diff --git a/data/presets/presets/traffic_calming/choker.json b/data/presets/presets/traffic_calming/choker.json index 4cad61221..8c6882296 100644 --- a/data/presets/presets/traffic_calming/choker.json +++ b/data/presets/presets/traffic_calming/choker.json @@ -6,6 +6,7 @@ ], "geometry": [ "vertex", + "line", "area" ], "terms": [ diff --git a/data/taginfo.json b/data/taginfo.json index 115e9c62e..3d316dbe7 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -998,8 +998,8 @@ {"key": "tourism", "value": "zoo", "description": "🄿 Zoo", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/zoo.svg?sanitize=true"}, {"key": "traffic_calming", "description": "🄿 Traffic Calming, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"}, {"key": "traffic_calming", "value": "bump", "description": "🄿 Speed Bump", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"}, - {"key": "traffic_calming", "value": "chicane", "description": "🄿 Traffic Chicane", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"}, - {"key": "traffic_calming", "value": "choker", "description": "🄿 Traffic Choker", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"}, + {"key": "traffic_calming", "value": "chicane", "description": "🄿 Traffic Chicane", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"}, + {"key": "traffic_calming", "value": "choker", "description": "🄿 Traffic Choker", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"}, {"key": "traffic_calming", "value": "cushion", "description": "🄿 Speed Cushion", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"}, {"key": "traffic_calming", "value": "dip", "description": "🄿 Dip", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"}, {"key": "traffic_calming", "value": "hump", "description": "🄿 Speed Hump", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"},