CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-20 23:44:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve traffic_calming=table presets

Browse Source 
(closes #4309)

This:
* adds presets for raised crossing and raised crosswalk, same as the existing
  crossing and crosswalk presets but with `traffic_calming=table` added
* retains a generic `traffic_calming=table` preset without crossing tags,
  and for usage on vertex geometry only (removed line, cause of the original issue)
This commit is contained in:
Bryan Housel
2017-09-08 11:16:57 -04:00
parent 46fca95e7d
commit 21a090ba26
14 changed files with 290 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+23 -3
View File
@@ -2684,11 +2684,21 @@ en:
# 'highway=footway, footway=crossing'
name: Street Crossing
terms: '<translate with synonyms or related terms for ''Street Crossing'', separated by commas>'
footway/crossing-raised:
# 'highway=footway, footway=crossing, traffic_calming=table'
name: Raised Street Crossing
# 'terms: flat top,hump,speed,slow'
terms: '<translate with synonyms or related terms for ''Raised Street Crossing'', separated by commas>'
footway/crosswalk:
# 'highway=footway, footway=crossing, crossing=zebra'
name: Pedestrian Crosswalk
# 'terms: zebra crossing'
terms: '<translate with synonyms or related terms for ''Pedestrian Crosswalk'', separated by commas>'
footway/crosswalk-raised:
# 'highway=footway, footway=crossing, crossing=zebra, traffic_calming=table'
name: Raised Pedestrian Crosswalk
# 'terms: zebra crossing,flat top,hump,speed,slow'
terms: '<translate with synonyms or related terms for ''Raised Pedestrian Crosswalk'', separated by commas>'
footway/sidewalk:
# 'highway=footway, footway=sidewalk'
name: Sidewalk
@@ -2765,11 +2775,21 @@ en:
# highway=crossing
name: Street Crossing
terms: '<translate with synonyms or related terms for ''Street Crossing'', separated by commas>'
highway/crossing-raised:
# 'highway=crossing, traffic_calming=table'
name: Raised Street Crossing
# 'terms: flat top,hump,speed,slow'
terms: '<translate with synonyms or related terms for ''Raised Street Crossing'', separated by commas>'
highway/crosswalk:
# 'highway=crossing, crossing=zebra'
name: Pedestrian Crosswalk
# 'terms: zebra crossing'
terms: '<translate with synonyms or related terms for ''Pedestrian Crosswalk'', separated by commas>'
highway/crosswalk-raised:
# 'highway=crossing, crossing=zebra, traffic_calming=table'
name: Raised Pedestrian Crosswalk
# 'terms: zebra crossing,flat top,hump,speed,slow'
terms: '<translate with synonyms or related terms for ''Raised Pedestrian Crosswalk'', separated by commas>'
highway/cycleway:
# highway=cycleway
name: Cycle Path
@@ -4679,10 +4699,10 @@ en:
# '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
# traffic_calming=table
name: Speed Table
# 'terms: flat top,hump,speed,slow'
terms: '<translate with synonyms or related terms for ''Raised Pedestrian Crossing'', separated by commas>'
terms: '<translate with synonyms or related terms for ''Speed Table'', separated by commas>'
type/boundary:
# type=boundary
name: Boundary
data/presets/presets.json
+117 -12
View File
@@ -5745,9 +5745,36 @@
],
"name": "Entrance/Exit"
},
"footway/crossing-raised": {
"fields": [
"crossing",
"access",
"surface",
"kerb",
"tactile_paving"
],
"geometry": [
"line"
],
"tags": {
"highway": "footway",
"footway": "crossing",
"traffic_calming": "table"
},
"reference": {
"key": "traffic_calming",
"value": "table"
},
"terms": [
"flat top",
"hump",
"speed",
"slow"
],
"name": "Raised Street Crossing"
},
"footway/crossing": {
"fields": [
"name",
"crossing",
"access",
"surface",
@@ -5768,10 +5795,40 @@
"terms": [],
"name": "Street Crossing"
},
"footway/crosswalk-raised": {
"icon": "highway-footway",
"fields": [
"crossing",
"access",
"surface",
"kerb",
"tactile_paving"
],
"geometry": [
"line"
],
"tags": {
"highway": "footway",
"footway": "crossing",
"crossing": "zebra",
"traffic_calming": "table"
},
"reference": {
"key": "traffic_calming",
"value": "table"
},
"terms": [
"zebra crossing",
"flat top",
"hump",
"speed",
"slow"
],
"name": "Raised Pedestrian Crosswalk"
},
"footway/crosswalk": {
"icon": "highway-footway",
"fields": [
"name",
"crossing",
"access",
"surface",
@@ -5798,7 +5855,6 @@
"footway/sidewalk": {
"icon": "highway-footway",
"fields": [
"name",
"surface",
"lit",
"width",
@@ -6098,9 +6154,33 @@
],
"name": "Indoor Corridor"
},
"highway/crossing-raised": {
"fields": [
"crossing",
"kerb",
"tactile_paving"
],
"geometry": [
"vertex"
],
"tags": {
"highway": "crossing",
"traffic_calming": "table"
},
"reference": {
"key": "traffic_calming",
"value": "table"
},
"terms": [
"flat top",
"hump",
"speed",
"slow"
],
"name": "Raised Street Crossing"
},
"highway/crossing": {
"fields": [
"name",
"crossing",
"kerb",
"tactile_paving"
@@ -6118,10 +6198,37 @@
"terms": [],
"name": "Street Crossing"
},
"highway/crosswalk-raised": {
"icon": "poi-foot",
"fields": [
"crossing",
"kerb",
"tactile_paving"
],
"geometry": [
"vertex"
],
"tags": {
"highway": "crossing",
"crossing": "zebra",
"traffic_calming": "table"
},
"reference": {
"key": "traffic_calming",
"value": "table"
},
"terms": [
"zebra crossing",
"flat top",
"hump",
"speed",
"slow"
],
"name": "Raised Pedestrian Crosswalk"
},
"highway/crosswalk": {
"icon": "poi-foot",
"fields": [
"name",
"crossing",
"kerb",
"tactile_paving"
@@ -14645,20 +14752,18 @@
"surface"
],
"geometry": [
"vertex",
"line"
"vertex"
],
"tags": {
"traffic_calming": "table"
},
"terms": [
"flat top",
"hump",
"speed",
"slow"
],
"tags": {
"highway": "crossing",
"traffic_calming": "table"
},
"name": "Raised Pedestrian Crossing"
"name": "Speed Table"
},
"type/multipolygon": {
"geometry": [
data/presets/presets/footway/crossing-raised.json
+28
View File
@@ -0,0 +1,28 @@
{
"fields": [
"crossing",
"access",
"surface",
"kerb",
"tactile_paving"
],
"geometry": [
"line"
],
"tags": {
"highway": "footway",
"footway": "crossing",
"traffic_calming": "table"
},
"reference": {
"key": "traffic_calming",
"value": "table"
},
"terms": [
"flat top",
"hump",
"speed",
"slow"
],
"name": "Raised Street Crossing"
}
data/presets/presets/footway/crossing.json
-1
View File
@@ -1,6 +1,5 @@
{
"fields": [
"name",
"crossing",
"access",
"surface",
data/presets/presets/footway/crosswalk-raised.json
+31
View File
@@ -0,0 +1,31 @@
{
"icon": "highway-footway",
"fields": [
"crossing",
"access",
"surface",
"kerb",
"tactile_paving"
],
"geometry": [
"line"
],
"tags": {
"highway": "footway",
"footway": "crossing",
"crossing": "zebra",
"traffic_calming": "table"
},
"reference": {
"key": "traffic_calming",
"value": "table"
},
"terms": [
"zebra crossing",
"flat top",
"hump",
"speed",
"slow"
],
"name": "Raised Pedestrian Crosswalk"
}
data/presets/presets/footway/crosswalk.json
-1
View File
@@ -1,7 +1,6 @@
{
"icon": "highway-footway",
"fields": [
"name",
"crossing",
"access",
"surface",
data/presets/presets/footway/sidewalk.json
-1
View File
@@ -1,7 +1,6 @@
{
"icon": "highway-footway",
"fields": [
"name",
"surface",
"lit",
"width",
data/presets/presets/highway/crossing-raised.json
+25
View File
@@ -0,0 +1,25 @@
{
"fields": [
"crossing",
"kerb",
"tactile_paving"
],
"geometry": [
"vertex"
],
"tags": {
"highway": "crossing",
"traffic_calming": "table"
},
"reference": {
"key": "traffic_calming",
"value": "table"
},
"terms": [
"flat top",
"hump",
"speed",
"slow"
],
"name": "Raised Street Crossing"
}
data/presets/presets/highway/crossing.json
-1
View File
@@ -1,6 +1,5 @@
{
"fields": [
"name",
"crossing",
"kerb",
"tactile_paving"
data/presets/presets/highway/crosswalk-raised.json
+28
View File
@@ -0,0 +1,28 @@
{
"icon": "poi-foot",
"fields": [
"crossing",
"kerb",
"tactile_paving"
],
"geometry": [
"vertex"
],
"tags": {
"highway": "crossing",
"crossing": "zebra",
"traffic_calming": "table"
},
"reference": {
"key": "traffic_calming",
"value": "table"
},
"terms": [
"zebra crossing",
"flat top",
"hump",
"speed",
"slow"
],
"name": "Raised Pedestrian Crosswalk"
}
data/presets/presets/highway/crosswalk.json
-1
View File
@@ -1,7 +1,6 @@
{
"icon": "poi-foot",
"fields": [
"name",
"crossing",
"kerb",
"tactile_paving"
data/presets/presets/traffic_calming/table.json
+5 -7
View File
@@ -4,18 +4,16 @@
"surface"
],
"geometry": [
"vertex",
"line"
"vertex"
],
"tags": {
"traffic_calming": "table"
},
"terms": [
"flat top",
"hump",
"speed",
"slow"
],
"tags": {
"highway":"crossing",
"traffic_calming": "table"
},
"name": "Raised Pedestrian Crossing"
"name": "Speed Table"
}
data/taginfo.json
+16
View File
@@ -1133,10 +1133,18 @@
{
"key": "entrance"
},
{
"key": "traffic_calming",
"value": "table"
},
{
"key": "footway",
"value": "crossing"
},
{
"key": "traffic_calming",
"value": "table"
},
{
"key": "crossing",
"value": "zebra"
@@ -1205,10 +1213,18 @@
"key": "highway",
"value": "corridor"
},
{
"key": "traffic_calming",
"value": "table"
},
{
"key": "highway",
"value": "crossing"
},
{
"key": "traffic_calming",
"value": "table"
},
{
"key": "crossing",
"value": "zebra"
dist/locales/en.json
Vendored
+17 -1
View File
@@ -3429,10 +3429,18 @@
"name": "Entrance/Exit",
"terms": ""
},
"footway/crossing-raised": {
"name": "Raised Street Crossing",
"terms": "flat top,hump,speed,slow"
},
"footway/crossing": {
"name": "Street Crossing",
"terms": ""
},
"footway/crosswalk-raised": {
"name": "Raised Pedestrian Crosswalk",
"terms": "zebra crossing,flat top,hump,speed,slow"
},
"footway/crosswalk": {
"name": "Pedestrian Crosswalk",
"terms": "zebra crossing"
@@ -3501,10 +3509,18 @@
"name": "Indoor Corridor",
"terms": "gallery,hall,hallway,indoor,passage,passageway"
},
"highway/crossing-raised": {
"name": "Raised Street Crossing",
"terms": "flat top,hump,speed,slow"
},
"highway/crossing": {
"name": "Street Crossing",
"terms": ""
},
"highway/crosswalk-raised": {
"name": "Raised Pedestrian Crosswalk",
"terms": "zebra crossing,flat top,hump,speed,slow"
},
"highway/crosswalk": {
"name": "Pedestrian Crosswalk",
"terms": "zebra crossing"
@@ -5206,7 +5222,7 @@
"terms": "audible lines,sleeper lines,growlers"
},
"traffic_calming/table": {
"name": "Raised Pedestrian Crossing",
"name": "Speed Table",
"terms": "flat top,hump,speed,slow"
},
"type/multipolygon": {