CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve traffic calming presets

Browse Source 
(closes #3218)

* Allow traffic calmings on vertex and line geometry where appropriate
* Add parallel_direction field to tag forward/backward
* Add generic traffic calming preset and type field
* Add traffic calming to defaults.json for "vertex" geometry
* Add a bunch of types that we didn't have before (island, dip, choker, etc)
* Add some search terms
This commit is contained in:
Bryan Housel
2016-11-02 18:12:20 -04:00
parent 1043402b88
commit 72d16fd76d
17 changed files with 389 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
data/presets.yaml
View File

@@ -1093,6 +1093,9 @@ en:
grade5: 'Soft: soil/sand/grass'
# tracktype field placeholder
placeholder: 'Solid, Mostly Solid, Soft...'
traffic_calming:
# traffic_calming=*
label: Type
traffic_signals:
# traffic_signals=*
label: Type
@@ -3883,25 +3886,55 @@ en:
# tourism=zoo
name: Zoo
terms: '<translate with synonyms or related terms for ''Zoo'', separated by commas>'
traffic_calming:
# traffic_calming=*
name: Traffic Calming
# 'terms: bump,hump,slow,speed'
terms: '<translate with synonyms or related terms for ''Traffic Calming'', separated by commas>'
traffic_calming/bump:
# traffic_calming=bump
name: Speed Bump
# 'terms: speed hump'
# 'terms: hump,speed,slow'
terms: '<translate with synonyms or related terms for ''Speed Bump'', separated by commas>'
traffic_calming/chicane:
# traffic_calming=chicane
name: Traffic Chicane
# 'terms: driveway link,speed,slow'
terms: '<translate with synonyms or related terms for ''Traffic Chicane'', separated by commas>'
traffic_calming/choker:
# traffic_calming=choker
name: Traffic Choker
# 'terms: speed,slow'
terms: '<translate with synonyms or related terms for ''Traffic Choker'', separated by commas>'
traffic_calming/cushion:
# traffic_calming=cushion
name: Speed Cushion
# 'terms: bump,hump,speed,slow'
terms: '<translate with synonyms or related terms for ''Speed Cushion'', separated by commas>'
traffic_calming/dip:
# traffic_calming=dip
name: Dip
# 'terms: speed,slow'
terms: '<translate with synonyms or related terms for ''Dip'', separated by commas>'
traffic_calming/hump:
# traffic_calming=hump
name: Speed Hump
# 'terms: speed bump'
# 'terms: bump,speed,slow'
terms: '<translate with synonyms or related terms for ''Speed Hump'', separated by commas>'
traffic_calming/island:
# traffic_calming=island
name: Traffic Island
# 'terms: circle,roundabout,slow'
terms: '<translate with synonyms or related terms for ''Traffic Island'', separated by commas>'
traffic_calming/rumble_strip:
# traffic_calming=rumble_strip
name: Rumble Strip
# 'terms: sleeper lines,audible lines,growlers'
# 'terms: audible lines,sleeper lines,growlers'
terms: '<translate with synonyms or related terms for ''Rumble Strip'', separated by commas>'
traffic_calming/table:
# 'highway=crossing, traffic_calming=table'
name: Raised Pedestrian Crossing
# 'terms: speed table,flat top hump'
# 'terms: flat top,hump,speed,slow'
terms: '<translate with synonyms or related terms for ''Raised Pedestrian Crossing'', separated by commas>'
type/boundary:
# type=boundary

1
data/presets/defaults.json
View File

@@ -38,6 +38,7 @@
"railway/level_crossing",
"highway/traffic_signals",
"highway/turning_circle",
"traffic_calming",
"highway/mini_roundabout",
"highway/motorway_junction",
"vertex"

5
data/presets/fields.json
View File

@@ -1471,6 +1471,11 @@
}
}
},
"traffic_calming": {
"key": "traffic_calming",
"type": "typeCombo",
"label": "Type"
},
"traffic_signals": {
"key": "traffic_signals",
"type": "combo",

5
data/presets/fields/traffic_calming.json Normal file
View File

@@ -0,0 +1,5 @@
{
"key": "traffic_calming",
"type": "typeCombo",
"label": "Type"
}

166
data/presets/presets.json
View File

@@ -10946,48 +10946,167 @@
},
"name": "Zoo"
},
"traffic_calming/bump": {
"traffic_calming": {
"fields": [
"surface"
"traffic_calming",
"parallel_direction"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"tags": {
"traffic_calming": "*"
},
"terms": [
"bump",
"hump",
"slow",
"speed"
],
"name": "Traffic Calming"
},
"traffic_calming/bump": {
"fields": [
"surface",
"parallel_direction"
],
"geometry": [
"vertex",
"line"
],
"terms": [
"hump",
"speed",
"slow"
],
"tags": {
"traffic_calming": "bump"
},
"terms": [
"speed hump"
],
"name": "Speed Bump"
},
"traffic_calming/chicane": {
"fields": [
"parallel_direction"
],
"geometry": [
"vertex",
"line"
],
"terms": [
"driveway link",
"speed",
"slow"
],
"tags": {
"traffic_calming": "chicane"
},
"name": "Traffic Chicane"
},
"traffic_calming/choker": {
"fields": [
"parallel_direction"
],
"geometry": [
"vertex",
"line"
],
"terms": [
"speed",
"slow"
],
"tags": {
"traffic_calming": "choker"
},
"name": "Traffic Choker"
},
"traffic_calming/cushion": {
"fields": [
"surface",
"parallel_direction"
],
"geometry": [
"vertex",
"line"
],
"terms": [
"bump",
"hump",
"speed",
"slow"
],
"tags": {
"traffic_calming": "cushion"
},
"name": "Speed Cushion"
},
"traffic_calming/dip": {
"fields": [
"surface",
"parallel_direction"
],
"geometry": [
"vertex",
"line"
],
"terms": [
"speed",
"slow"
],
"tags": {
"traffic_calming": "dip"
},
"name": "Dip"
},
"traffic_calming/hump": {
"fields": [
"surface"
"surface",
"parallel_direction"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"terms": [
"bump",
"speed",
"slow"
],
"tags": {
"traffic_calming": "hump"
},
"terms": [
"speed bump"
],
"name": "Speed Hump"
},
"traffic_calming/rumble_strip": {
"traffic_calming/island": {
"geometry": [
"vertex"
],
"terms": [
"circle",
"roundabout",
"slow"
],
"tags": {
"traffic_calming": "island"
},
"name": "Traffic Island"
},
"traffic_calming/rumble_strip": {
"fields": [
"parallel_direction"
],
"geometry": [
"vertex",
"line"
],
"terms": [
"audible lines",
"sleeper lines",
"growlers"
],
"tags": {
"traffic_calming": "rumble_strip"
},
"terms": [
"sleeper lines",
"audible lines",
"growlers"
],
"name": "Rumble Strip"
},
"traffic_calming/table": {
@@ -10995,16 +11114,19 @@
"surface"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"terms": [
"flat top",
"hump",
"speed",
"slow"
],
"tags": {
"highway": "crossing",
"traffic_calming": "table"
},
"terms": [
"speed table",
"flat top hump"
],
"name": "Raised Pedestrian Crossing"
},
"type/multipolygon": {

20
data/presets/presets/traffic_calming.json Normal file
View File

@@ -0,0 +1,20 @@
{
"fields": [
"traffic_calming",
"parallel_direction"
],
"geometry": [
"vertex",
"line"
],
"tags": {
"traffic_calming": "*"
},
"terms": [
"bump",
"hump",
"slow",
"speed"
],
"name": "Traffic Calming"
}

14
data/presets/presets/traffic_calming/bump.json
View File

@@ -1,15 +1,19 @@
{
"fields": [
"surface"
"surface",
"parallel_direction"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"terms": [
"hump",
"speed",
"slow"
],
"tags": {
"traffic_calming": "bump"
},
"terms": [
"speed hump"
],
"name": "Speed Bump"
}

18
data/presets/presets/traffic_calming/chicane.json Normal file
View File

@@ -0,0 +1,18 @@
{
"fields": [
"parallel_direction"
],
"geometry": [
"vertex",
"line"
],
"terms": [
"driveway link",
"speed",
"slow"
],
"tags": {
"traffic_calming": "chicane"
},
"name": "Traffic Chicane"
}

17
data/presets/presets/traffic_calming/choker.json Normal file
View File

@@ -0,0 +1,17 @@
{
"fields": [
"parallel_direction"
],
"geometry": [
"vertex",
"line"
],
"terms": [
"speed",
"slow"
],
"tags": {
"traffic_calming": "choker"
},
"name": "Traffic Choker"
}

20
data/presets/presets/traffic_calming/cushion.json Normal file
View File

@@ -0,0 +1,20 @@
{
"fields": [
"surface",
"parallel_direction"
],
"geometry": [
"vertex",
"line"
],
"terms": [
"bump",
"hump",
"speed",
"slow"
],
"tags": {
"traffic_calming": "cushion"
},
"name": "Speed Cushion"
}

18
data/presets/presets/traffic_calming/dip.json Normal file
View File

@@ -0,0 +1,18 @@
{
"fields": [
"surface",
"parallel_direction"
],
"geometry": [
"vertex",
"line"
],
"terms": [
"speed",
"slow"
],
"tags": {
"traffic_calming": "dip"
},
"name": "Dip"
}

14
data/presets/presets/traffic_calming/hump.json
View File

@@ -1,15 +1,19 @@
{
"fields": [
"surface"
"surface",
"parallel_direction"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"terms": [
"bump",
"speed",
"slow"
],
"tags": {
"traffic_calming": "hump"
},
"terms": [
"speed bump"
],
"name": "Speed Hump"
}

14
data/presets/presets/traffic_calming/island.json Normal file
View File

@@ -0,0 +1,14 @@
{
"geometry": [
"vertex"
],
"terms": [
"circle",
"roundabout",
"slow"
],
"tags": {
"traffic_calming": "island"
},
"name": "Traffic Island"
}

16
data/presets/presets/traffic_calming/rumble_strip.json
View File

@@ -1,14 +1,18 @@
{
"fields": [
"parallel_direction"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"terms": [
"audible lines",
"sleeper lines",
"growlers"
],
"tags": {
"traffic_calming": "rumble_strip"
},
"terms": [
"sleeper lines",
"audible lines",
"growlers"
],
"name": "Rumble Strip"
}

13
data/presets/presets/traffic_calming/table.json
View File

@@ -3,15 +3,18 @@
"surface"
],
"geometry": [
"vertex"
"vertex",
"line"
],
"terms": [
"flat top",
"hump",
"speed",
"slow"
],
"tags": {
"highway":"crossing",
"traffic_calming": "table"
},
"terms": [
"speed table",
"flat top hump"
],
"name": "Raised Pedestrian Crossing"
}

23
data/taginfo.json
View File

@@ -2485,14 +2485,37 @@
"key": "tourism",
"value": "zoo"
},
{
"key": "traffic_calming"
},
{
"key": "traffic_calming",
"value": "bump"
},
{
"key": "traffic_calming",
"value": "chicane"
},
{
"key": "traffic_calming",
"value": "choker"
},
{
"key": "traffic_calming",
"value": "cushion"
},
{
"key": "traffic_calming",
"value": "dip"
},
{
"key": "traffic_calming",
"value": "hump"
},
{
"key": "traffic_calming",
"value": "island"
},
{
"key": "traffic_calming",
"value": "rumble_strip"

35
dist/locales/en.json vendored
View File

@@ -1547,6 +1547,9 @@
"grade5": "Soft: soil/sand/grass"
}
},
"traffic_calming": {
"label": "Type"
},
"traffic_signals": {
"label": "Type"
},
@@ -4114,21 +4117,45 @@
"name": "Zoo",
"terms": ""
},
"traffic_calming": {
"name": "Traffic Calming",
"terms": "bump,hump,slow,speed"
},
"traffic_calming/bump": {
"name": "Speed Bump",
"terms": "speed hump"
"terms": "hump,speed,slow"
},
"traffic_calming/chicane": {
"name": "Traffic Chicane",
"terms": "driveway link,speed,slow"
},
"traffic_calming/choker": {
"name": "Traffic Choker",
"terms": "speed,slow"
},
"traffic_calming/cushion": {
"name": "Speed Cushion",
"terms": "bump,hump,speed,slow"
},
"traffic_calming/dip": {
"name": "Dip",
"terms": "speed,slow"
},
"traffic_calming/hump": {
"name": "Speed Hump",
"terms": "speed bump"
"terms": "bump,speed,slow"
},
"traffic_calming/island": {
"name": "Traffic Island",
"terms": "circle,roundabout,slow"
},
"traffic_calming/rumble_strip": {
"name": "Rumble Strip",
"terms": "sleeper lines,audible lines,growlers"
"terms": "audible lines,sleeper lines,growlers"
},
"traffic_calming/table": {
"name": "Raised Pedestrian Crossing",
"terms": "speed table,flat top hump"
"terms": "flat top,hump,speed,slow"
},
"type/multipolygon": {
"name": "Multipolygon",