Skip to content

Commit

Permalink
v5.1.1 hotfix:
Browse files Browse the repository at this point in the history
> Revert "restrict usage of Traffic Calming presets on lines/areas:"
> This reverts commit 033e5f4.
  • Loading branch information
tyrasd committed Jan 14, 2023
1 parent e295acf commit 30d68dc
Show file tree
Hide file tree
Showing 22 changed files with 89 additions and 44 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ _Breaking developer changes, which may affect downstream projects or sites that
[@xxxx]: https://github.com/xxxx
-->

# 5.2.1

#### Bugfixes
* Revert restriction of Traffic Calming presets to vertices, which had unintended side effects with iD's validation mechanism ([#733])

[#733]: https://github.com/openstreetmap/id-tagging-schema/issues/733


# 5.2.0

#### Bugfixes
Expand Down
1 change: 0 additions & 1 deletion data/presets/highway/primary.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"oneway/bicycle",
"smoothness",
"toll",
"traffic_calming",
"trolley_wire",
"width"
],
Expand Down
1 change: 0 additions & 1 deletion data/presets/highway/residential.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"not/name",
"oneway/bicycle",
"smoothness",
"traffic_calming",
"trolley_wire",
"width"
],
Expand Down
1 change: 0 additions & 1 deletion data/presets/highway/service.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"maxwidth",
"oneway/bicycle",
"smoothness",
"traffic_calming",
"trolley_wire",
"width"
],
Expand Down
4 changes: 3 additions & 1 deletion data/presets/traffic_calming.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line",
"area"
],
"tags": {
"traffic_calming": "*"
Expand Down
4 changes: 3 additions & 1 deletion data/presets/traffic_calming/_yes.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
"{traffic_calming}"
],
"geometry": [
"vertex"
"vertex",
"line",
"area"
],
"tags": {
"traffic_calming": "yes"
Expand Down
3 changes: 2 additions & 1 deletion data/presets/traffic_calming/bump.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"terms": [
"hump",
Expand Down
4 changes: 3 additions & 1 deletion data/presets/traffic_calming/chicane.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line",
"area"
],
"terms": [
"driveway link",
Expand Down
4 changes: 3 additions & 1 deletion data/presets/traffic_calming/choker.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line",
"area"
],
"terms": [
"speed",
Expand Down
3 changes: 2 additions & 1 deletion data/presets/traffic_calming/cushion.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"terms": [
"bump",
Expand Down
3 changes: 2 additions & 1 deletion data/presets/traffic_calming/dip.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"terms": [
"speed",
Expand Down
3 changes: 2 additions & 1 deletion data/presets/traffic_calming/hump.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"terms": [
"bump",
Expand Down
4 changes: 2 additions & 2 deletions data/presets/traffic_calming/island.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
],
"geometry": [
"vertex",
"line",
"area"
],
"terms": [
"circle",
"roundabout",
"slow",
"traffic calming"
"slow"
],
"tags": {
"traffic_calming": "island"
Expand Down
3 changes: 2 additions & 1 deletion data/presets/traffic_calming/mini_bumps.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"traffic_calming": "mini_bumps"
},
"geometry": [
"vertex"
"vertex",
"line"
],
"fields": [
"surface",
Expand Down
3 changes: 2 additions & 1 deletion data/presets/traffic_calming/rumble_strip.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"terms": [
"audible lines",
Expand Down
38 changes: 25 additions & 13 deletions dist/presets.json
Original file line number Diff line number Diff line change
Expand Up @@ -12148,7 +12148,6 @@
"oneway/bicycle",
"smoothness",
"toll",
"traffic_calming",
"trolley_wire",
"width"
],
Expand Down Expand Up @@ -12239,7 +12238,6 @@
"not/name",
"oneway/bicycle",
"smoothness",
"traffic_calming",
"trolley_wire",
"width"
],
Expand Down Expand Up @@ -12394,7 +12392,6 @@
"maxwidth",
"oneway/bicycle",
"smoothness",
"traffic_calming",
"trolley_wire",
"width"
],
Expand Down Expand Up @@ -26003,7 +26000,9 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line",
"area"
],
"tags": {
"traffic_calming": "*"
Expand All @@ -26017,7 +26016,9 @@
"{traffic_calming}"
],
"geometry": [
"vertex"
"vertex",
"line",
"area"
],
"tags": {
"traffic_calming": "yes"
Expand All @@ -26032,7 +26033,8 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"tags": {
"traffic_calming": "bump"
Expand All @@ -26045,7 +26047,9 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line",
"area"
],
"tags": {
"traffic_calming": "chicane"
Expand All @@ -26058,7 +26062,9 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line",
"area"
],
"tags": {
"traffic_calming": "choker"
Expand All @@ -26071,7 +26077,8 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"tags": {
"traffic_calming": "cushion"
Expand All @@ -26084,7 +26091,8 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"tags": {
"traffic_calming": "dip"
Expand All @@ -26097,7 +26105,8 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"tags": {
"traffic_calming": "hump"
Expand All @@ -26110,6 +26119,7 @@
],
"geometry": [
"vertex",
"line",
"area"
],
"tags": {
Expand All @@ -26122,7 +26132,8 @@
"traffic_calming": "mini_bumps"
},
"geometry": [
"vertex"
"vertex",
"line"
],
"fields": [
"surface",
Expand All @@ -26135,7 +26146,8 @@
"direction_vertex"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"tags": {
"traffic_calming": "rumble_strip"
Expand Down
2 changes: 1 addition & 1 deletion dist/presets.min.json

Large diffs are not rendered by default.

Loading

0 comments on commit 30d68dc

Please sign in to comment.