From 3ff61df8c7557f6a2b5f8ed666704ee777a2add3 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Sat, 14 Jan 2023 22:53:50 +0100 Subject: [PATCH] Revert "restrict usage of Traffic Calming presets on lines/areas:" This reverts commit 033e5f48ace3d74c4fed0f35a5db904d00fae020. closes #733 --- data/presets/highway/primary.json | 1 - data/presets/highway/residential.json | 1 - data/presets/highway/service.json | 1 - data/presets/traffic_calming.json | 4 +++- data/presets/traffic_calming/_yes.json | 4 +++- data/presets/traffic_calming/bump.json | 3 ++- data/presets/traffic_calming/chicane.json | 4 +++- data/presets/traffic_calming/choker.json | 4 +++- data/presets/traffic_calming/cushion.json | 3 ++- data/presets/traffic_calming/dip.json | 3 ++- data/presets/traffic_calming/hump.json | 3 ++- data/presets/traffic_calming/island.json | 4 ++-- data/presets/traffic_calming/mini_bumps.json | 3 ++- data/presets/traffic_calming/rumble_strip.json | 3 ++- 14 files changed, 26 insertions(+), 15 deletions(-) diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json index 38cb3997..2d8a049f 100644 --- a/data/presets/highway/primary.json +++ b/data/presets/highway/primary.json @@ -29,7 +29,6 @@ "oneway/bicycle", "smoothness", "toll", - "traffic_calming", "trolley_wire", "width" ], diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json index 8de62dc2..0978addb 100644 --- a/data/presets/highway/residential.json +++ b/data/presets/highway/residential.json @@ -24,7 +24,6 @@ "not/name", "oneway/bicycle", "smoothness", - "traffic_calming", "trolley_wire", "width" ], diff --git a/data/presets/highway/service.json b/data/presets/highway/service.json index a6f31271..579fa14f 100644 --- a/data/presets/highway/service.json +++ b/data/presets/highway/service.json @@ -21,7 +21,6 @@ "maxwidth", "oneway/bicycle", "smoothness", - "traffic_calming", "trolley_wire", "width" ], diff --git a/data/presets/traffic_calming.json b/data/presets/traffic_calming.json index 4a8c4896..28b54712 100644 --- a/data/presets/traffic_calming.json +++ b/data/presets/traffic_calming.json @@ -6,7 +6,9 @@ "direction_vertex" ], "geometry": [ - "vertex" + "vertex", + "line", + "area" ], "tags": { "traffic_calming": "*" diff --git a/data/presets/traffic_calming/_yes.json b/data/presets/traffic_calming/_yes.json index 5c93310e..9816be7c 100644 --- a/data/presets/traffic_calming/_yes.json +++ b/data/presets/traffic_calming/_yes.json @@ -5,7 +5,9 @@ "{traffic_calming}" ], "geometry": [ - "vertex" + "vertex", + "line", + "area" ], "tags": { "traffic_calming": "yes" diff --git a/data/presets/traffic_calming/bump.json b/data/presets/traffic_calming/bump.json index da54d588..1ccac081 100644 --- a/data/presets/traffic_calming/bump.json +++ b/data/presets/traffic_calming/bump.json @@ -5,7 +5,8 @@ "direction_vertex" ], "geometry": [ - "vertex" + "vertex", + "line" ], "terms": [ "hump", diff --git a/data/presets/traffic_calming/chicane.json b/data/presets/traffic_calming/chicane.json index a3fcfdb4..8dfa98df 100644 --- a/data/presets/traffic_calming/chicane.json +++ b/data/presets/traffic_calming/chicane.json @@ -5,7 +5,9 @@ "direction_vertex" ], "geometry": [ - "vertex" + "vertex", + "line", + "area" ], "terms": [ "driveway link", diff --git a/data/presets/traffic_calming/choker.json b/data/presets/traffic_calming/choker.json index 85bfe1ed..8c688229 100644 --- a/data/presets/traffic_calming/choker.json +++ b/data/presets/traffic_calming/choker.json @@ -5,7 +5,9 @@ "direction_vertex" ], "geometry": [ - "vertex" + "vertex", + "line", + "area" ], "terms": [ "speed", diff --git a/data/presets/traffic_calming/cushion.json b/data/presets/traffic_calming/cushion.json index 5fb2530d..69d4a06f 100644 --- a/data/presets/traffic_calming/cushion.json +++ b/data/presets/traffic_calming/cushion.json @@ -5,7 +5,8 @@ "direction_vertex" ], "geometry": [ - "vertex" + "vertex", + "line" ], "terms": [ "bump", diff --git a/data/presets/traffic_calming/dip.json b/data/presets/traffic_calming/dip.json index 444a6a2e..95506613 100644 --- a/data/presets/traffic_calming/dip.json +++ b/data/presets/traffic_calming/dip.json @@ -5,7 +5,8 @@ "direction_vertex" ], "geometry": [ - "vertex" + "vertex", + "line" ], "terms": [ "speed", diff --git a/data/presets/traffic_calming/hump.json b/data/presets/traffic_calming/hump.json index fb772299..821153e1 100644 --- a/data/presets/traffic_calming/hump.json +++ b/data/presets/traffic_calming/hump.json @@ -5,7 +5,8 @@ "direction_vertex" ], "geometry": [ - "vertex" + "vertex", + "line" ], "terms": [ "bump", diff --git a/data/presets/traffic_calming/island.json b/data/presets/traffic_calming/island.json index 27a3ce9c..25da7930 100644 --- a/data/presets/traffic_calming/island.json +++ b/data/presets/traffic_calming/island.json @@ -5,13 +5,13 @@ ], "geometry": [ "vertex", + "line", "area" ], "terms": [ "circle", "roundabout", - "slow", - "traffic calming" + "slow" ], "tags": { "traffic_calming": "island" diff --git a/data/presets/traffic_calming/mini_bumps.json b/data/presets/traffic_calming/mini_bumps.json index 77df8e78..14d5b8ba 100644 --- a/data/presets/traffic_calming/mini_bumps.json +++ b/data/presets/traffic_calming/mini_bumps.json @@ -4,7 +4,8 @@ "traffic_calming": "mini_bumps" }, "geometry": [ - "vertex" + "vertex", + "line" ], "fields": [ "surface", diff --git a/data/presets/traffic_calming/rumble_strip.json b/data/presets/traffic_calming/rumble_strip.json index 0731411a..0445032d 100644 --- a/data/presets/traffic_calming/rumble_strip.json +++ b/data/presets/traffic_calming/rumble_strip.json @@ -4,7 +4,8 @@ "direction_vertex" ], "geometry": [ - "vertex" + "vertex", + "line" ], "terms": [ "audible lines",