From 033e5f48ace3d74c4fed0f35a5db904d00fae020 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 5 Dec 2022 12:18:45 +0100 Subject: [PATCH] restrict usage of Traffic Calming presets on lines/areas: * only traffic_calming=island is allowed to be mapped as an area * for traffic calming on lines: only allow it in combination with certain road presets. See https://wiki.openstreetmap.org/w/index.php?title=Key:traffic_calming&oldid=2438763#How_to_map --- 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, 15 insertions(+), 26 deletions(-) diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json index 2d8a049f..38cb3997 100644 --- a/data/presets/highway/primary.json +++ b/data/presets/highway/primary.json @@ -29,6 +29,7 @@ "oneway/bicycle", "smoothness", "toll", + "traffic_calming", "trolley_wire", "width" ], diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json index 0978addb..8de62dc2 100644 --- a/data/presets/highway/residential.json +++ b/data/presets/highway/residential.json @@ -24,6 +24,7 @@ "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 579fa14f..a6f31271 100644 --- a/data/presets/highway/service.json +++ b/data/presets/highway/service.json @@ -21,6 +21,7 @@ "maxwidth", "oneway/bicycle", "smoothness", + "traffic_calming", "trolley_wire", "width" ], diff --git a/data/presets/traffic_calming.json b/data/presets/traffic_calming.json index 28b54712..4a8c4896 100644 --- a/data/presets/traffic_calming.json +++ b/data/presets/traffic_calming.json @@ -6,9 +6,7 @@ "direction_vertex" ], "geometry": [ - "vertex", - "line", - "area" + "vertex" ], "tags": { "traffic_calming": "*" diff --git a/data/presets/traffic_calming/_yes.json b/data/presets/traffic_calming/_yes.json index 9816be7c..5c93310e 100644 --- a/data/presets/traffic_calming/_yes.json +++ b/data/presets/traffic_calming/_yes.json @@ -5,9 +5,7 @@ "{traffic_calming}" ], "geometry": [ - "vertex", - "line", - "area" + "vertex" ], "tags": { "traffic_calming": "yes" diff --git a/data/presets/traffic_calming/bump.json b/data/presets/traffic_calming/bump.json index 1ccac081..da54d588 100644 --- a/data/presets/traffic_calming/bump.json +++ b/data/presets/traffic_calming/bump.json @@ -5,8 +5,7 @@ "direction_vertex" ], "geometry": [ - "vertex", - "line" + "vertex" ], "terms": [ "hump", diff --git a/data/presets/traffic_calming/chicane.json b/data/presets/traffic_calming/chicane.json index 8dfa98df..a3fcfdb4 100644 --- a/data/presets/traffic_calming/chicane.json +++ b/data/presets/traffic_calming/chicane.json @@ -5,9 +5,7 @@ "direction_vertex" ], "geometry": [ - "vertex", - "line", - "area" + "vertex" ], "terms": [ "driveway link", diff --git a/data/presets/traffic_calming/choker.json b/data/presets/traffic_calming/choker.json index 8c688229..85bfe1ed 100644 --- a/data/presets/traffic_calming/choker.json +++ b/data/presets/traffic_calming/choker.json @@ -5,9 +5,7 @@ "direction_vertex" ], "geometry": [ - "vertex", - "line", - "area" + "vertex" ], "terms": [ "speed", diff --git a/data/presets/traffic_calming/cushion.json b/data/presets/traffic_calming/cushion.json index 69d4a06f..5fb2530d 100644 --- a/data/presets/traffic_calming/cushion.json +++ b/data/presets/traffic_calming/cushion.json @@ -5,8 +5,7 @@ "direction_vertex" ], "geometry": [ - "vertex", - "line" + "vertex" ], "terms": [ "bump", diff --git a/data/presets/traffic_calming/dip.json b/data/presets/traffic_calming/dip.json index 95506613..444a6a2e 100644 --- a/data/presets/traffic_calming/dip.json +++ b/data/presets/traffic_calming/dip.json @@ -5,8 +5,7 @@ "direction_vertex" ], "geometry": [ - "vertex", - "line" + "vertex" ], "terms": [ "speed", diff --git a/data/presets/traffic_calming/hump.json b/data/presets/traffic_calming/hump.json index 821153e1..fb772299 100644 --- a/data/presets/traffic_calming/hump.json +++ b/data/presets/traffic_calming/hump.json @@ -5,8 +5,7 @@ "direction_vertex" ], "geometry": [ - "vertex", - "line" + "vertex" ], "terms": [ "bump", diff --git a/data/presets/traffic_calming/island.json b/data/presets/traffic_calming/island.json index 25da7930..27a3ce9c 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" + "slow", + "traffic calming" ], "tags": { "traffic_calming": "island" diff --git a/data/presets/traffic_calming/mini_bumps.json b/data/presets/traffic_calming/mini_bumps.json index 14d5b8ba..77df8e78 100644 --- a/data/presets/traffic_calming/mini_bumps.json +++ b/data/presets/traffic_calming/mini_bumps.json @@ -4,8 +4,7 @@ "traffic_calming": "mini_bumps" }, "geometry": [ - "vertex", - "line" + "vertex" ], "fields": [ "surface", diff --git a/data/presets/traffic_calming/rumble_strip.json b/data/presets/traffic_calming/rumble_strip.json index 0445032d..0731411a 100644 --- a/data/presets/traffic_calming/rumble_strip.json +++ b/data/presets/traffic_calming/rumble_strip.json @@ -4,8 +4,7 @@ "direction_vertex" ], "geometry": [ - "vertex", - "line" + "vertex" ], "terms": [ "audible lines",