CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-21 11:16:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

improve railway presets

Browse Source 
* add preset for funiculars
* add preset for narrow gauge railways
* add gauge field to some railway presets
* add "electrified" field to some railway presets
This commit is contained in:
tyr
2013-12-29 11:30:02 +01:00
committed by Aaron Lidman
parent 383023f4c1
commit 8535bbc57c
13 changed files with 160 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+10
View File
@@ -133,6 +133,8 @@ en:
label: Denotation
description:
label: Description
electrified:
label: Electrification
elevation:
label: Elevation
emergency:
@@ -148,6 +150,8 @@ en:
label: Type
fixme:
label: Fix Me
gauge:
label: Gauge
generator/method:
label: Method
generator/source:
@@ -1322,6 +1326,9 @@ en:
railway/disused:
name: Disused Railway
terms: "<translate with synonyms or related terms for 'Disused Railway', separated by commas>"
railway/funicular:
name: Funicular
terms: "<translate with synonyms or related terms for 'Funicular', separated by commas>"
railway/halt:
name: Railway Halt
terms: "<translate with synonyms or related terms for 'Railway Halt', separated by commas>"
@@ -1331,6 +1338,9 @@ en:
railway/monorail:
name: Monorail
terms: "<translate with synonyms or related terms for 'Monorail', separated by commas>"
railway/narrow_gauge:
name: Narrow Gauge Rail
terms: "<translate with synonyms or related terms for 'Narrow Gauge Rail', separated by commas>"
railway/platform:
name: Railway Platform
terms: "<translate with synonyms or related terms for 'Railway Platform', separated by commas>"
data/presets/categories/rail.json
+1 -1
View File
@@ -10,4 +10,4 @@
"railway/disused",
"railway/abandoned"
]
}
}
data/presets/fields.json
+16
View File
@@ -293,6 +293,17 @@
"type": "textarea",
"label": "Description"
},
"electrified": {
"key": "electrified",
"type": "combo",
"label": "Electrification",
"options": [
"contact_line",
"rail",
"yes",
"no"
]
},
"elevation": {
"key": "ele",
"type": "number",
@@ -337,6 +348,11 @@
"type": "textarea",
"label": "Fix Me"
},
"gauge": {
"key": "gauge",
"type": "combo",
"label": "Gauge"
},
"generator/method": {
"key": "generator:method",
"type": "combo",
data/presets/fields/electrified.json
+11
View File
@@ -0,0 +1,11 @@
{
"key": "electrified",
"type": "combo",
"label": "Electrification",
"options": [
"contact_line",
"rail",
"yes",
"no"
]
}
data/presets/fields/gauge.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "gauge",
"type": "combo",
"label": "Gauge"
}
data/presets/presets.json
+51 -4
View File
@@ -5505,6 +5505,27 @@
"terms": [],
"name": "Disused Railway"
},
"railway/funicular": {
"geometry": [
"line"
],
"terms": [
"venicular",
"cliff railway",
"cable car",
"cable railway",
"funicular railway"
],
"fields": [
"structure",
"gauge"
],
"tags": {
"railway": "funicular"
},
"icon": "railway-rail",
"name": "Funicular"
},
"railway/halt": {
"icon": "rail",
"geometry": [
@@ -5550,11 +5571,31 @@
"railway": "monorail"
},
"fields": [
"structure"
"structure",
"electrified"
],
"terms": [],
"name": "Monorail"
},
"railway/narrow_gauge": {
"icon": "railway-rail",
"geometry": [
"line"
],
"tags": {
"railway": "narrow_gauge"
},
"fields": [
"structure",
"gauge",
"electrified"
],
"terms": [
"narrow gauge railway",
"narrow gauge railroad"
],
"name": "Narrow Gauge Rail"
},
"railway/platform": {
"geometry": [
"point",
@@ -5576,7 +5617,9 @@
"railway": "rail"
},
"fields": [
"structure"
"structure",
"gauge",
"electrified"
],
"terms": [],
"name": "Rail"
@@ -5600,7 +5643,9 @@
"railway/subway": {
"icon": "railway-subway",
"fields": [
"structure"
"structure",
"gauge",
"electrified"
],
"geometry": [
"line"
@@ -5631,7 +5676,9 @@
"railway": "tram"
},
"fields": [
"structure"
"structure",
"gauge",
"electrified"
],
"terms": [
"streetcar"
data/presets/presets/railway/funicular.json
+21
View File
@@ -0,0 +1,21 @@
{
"geometry": [
"line"
],
"terms": [
"venicular",
"cliff railway",
"cable car",
"cable railway",
"funicular railway"
],
"fields": [
"structure",
"gauge"
],
"tags": {
"railway": "funicular"
},
"icon": "railway-rail",
"name": "Funicular"
}
data/presets/presets/railway/monorail.json
+2 -1
View File
@@ -7,7 +7,8 @@
"railway": "monorail"
},
"fields": [
"structure"
"structure",
"electrified"
],
"terms": [],
"name": "Monorail"
data/presets/presets/railway/narrow_gauge.json
+19
View File
@@ -0,0 +1,19 @@
{
"icon": "railway-rail",
"geometry": [
"line"
],
"tags": {
"railway": "narrow_gauge"
},
"fields": [
"structure",
"gauge",
"electrified"
],
"terms": [
"narrow gauge railway",
"narrow gauge railroad"
],
"name": "Narrow Gauge Rail"
}
data/presets/presets/railway/rail.json
+4 -2
View File
@@ -7,8 +7,10 @@
"railway": "rail"
},
"fields": [
"structure"
"structure",
"gauge",
"electrified"
],
"terms": [],
"name": "Rail"
}
}
data/presets/presets/railway/subway.json
+3 -1
View File
@@ -1,7 +1,9 @@
{
"icon": "railway-subway",
"fields": [
"structure"
"structure",
"gauge",
"electrified"
],
"geometry": [
"line"
data/presets/presets/railway/tram.json
+3 -1
View File
@@ -7,7 +7,9 @@
"railway": "tram"
},
"fields": [
"structure"
"structure",
"gauge",
"electrified"
],
"terms": ["streetcar"],
"name": "Tram"
dist/locales/en.json
Vendored
+14
View File
@@ -586,6 +586,9 @@
"description": {
"label": "Description"
},
"electrified": {
"label": "Electrification"
},
"elevation": {
"label": "Elevation"
},
@@ -608,6 +611,9 @@
"fixme": {
"label": "Fix Me"
},
"gauge": {
"label": "Gauge"
},
"generator/method": {
"label": "Method"
},
@@ -2192,6 +2198,10 @@
"name": "Disused Railway",
"terms": ""
},
"railway/funicular": {
"name": "Funicular",
"terms": "venicular,cliff railway,cable car,cable railway,funicular railway"
},
"railway/halt": {
"name": "Railway Halt",
"terms": "break,interrupt,rest,wait,interruption"
@@ -2204,6 +2214,10 @@
"name": "Monorail",
"terms": ""
},
"railway/narrow_gauge": {
"name": "Narrow Gauge Rail",
"terms": "narrow gauge railway,narrow gauge railroad"
},
"railway/platform": {
"name": "Railway Platform",
"terms": ""