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

Add usage voltage frequency fields to several rail presets

Browse Source 
(closes #4919)
This commit is contained in:
Bryan Housel
2018-03-28 00:26:36 -04:00
parent a160c00c35
commit bf8c24fd2b
13 changed files with 197 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+16
View File
@@ -1563,6 +1563,22 @@ en:
label: Type
# tunnel field placeholder
placeholder: Default
usage_rail:
# usage=*
label: Usage Type
options:
# usage=branch
branch: Branch
# usage=industrial
industrial: Industrial
# usage=main
main: Main
# usage=military
military: Military
# usage=test
test: Test
# usage=tourism
tourism: Tourism
vending:
# vending=*
label: Type of Goods
data/presets/fields.json
+15
View File
@@ -2112,6 +2112,21 @@
"label": "Type",
"placeholder": "Default"
},
"usage_rail": {
"key": "usage",
"type": "combo",
"label": "Usage Type",
"strings": {
"options": {
"main": "Main",
"branch": "Branch",
"industrial": "Industrial",
"military": "Military",
"test": "Test",
"tourism": "Tourism"
}
}
},
"vending": {
"key": "vending",
"type": "combo",
data/presets/fields/usage_rail.json
+15
View File
@@ -0,0 +1,15 @@
{
"key": "usage",
"type": "combo",
"label": "Usage Type",
"strings": {
"options": {
"main": "Main",
"branch": "Branch",
"industrial": "Industrial",
"military": "Military",
"test": "Test",
"tourism": "Tourism"
}
}
}
data/presets/presets.json
+70 -50
View File
@@ -15499,17 +15499,18 @@
},
"railway/abandoned": {
"icon": "railway-abandoned",
"fields": [
"name",
"structure",
"service_rail",
"usage_rail"
],
"geometry": [
"line"
],
"tags": {
"railway": "abandoned"
},
"fields": [
"name",
"structure",
"service_rail"
],
"terms": [],
"name": "Abandoned Railway"
},
@@ -15562,16 +15563,17 @@
},
"railway/disused": {
"icon": "railway-disused",
"fields": [
"structure",
"service_rail",
"usage_rail"
],
"geometry": [
"line"
],
"tags": {
"railway": "disused"
},
"fields": [
"structure",
"service_rail"
],
"terms": [],
"name": "Disused Railway"
},
@@ -15617,19 +15619,22 @@
},
"railway/light_rail": {
"icon": "railway-light-rail",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "light_rail"
},
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail"
],
"terms": [
"light rail",
"streetcar",
@@ -15679,36 +15684,42 @@
},
"railway/monorail": {
"icon": "railway-monorail",
"fields": [
"name",
"structure",
"electrified",
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "monorail"
},
"fields": [
"name",
"structure",
"electrified",
"service_rail"
],
"terms": [],
"name": "Monorail"
},
"railway/narrow_gauge": {
"icon": "railway-rail",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "narrow_gauge"
},
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail"
],
"terms": [
"narrow gauge railway",
"narrow gauge railroad"
@@ -15717,20 +15728,23 @@
},
"railway/rail": {
"icon": "railway-rail",
"geometry": [
"line"
],
"tags": {
"railway": "rail"
},
"fields": [
"name",
"structure",
"gauge",
"electrified",
"maxspeed",
"service_rail"
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "rail"
},
"terms": [],
"name": "Rail"
},
@@ -15774,19 +15788,22 @@
},
"railway/subway": {
"icon": "railway-subway",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "subway"
},
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail"
],
"terms": [
"metro",
"transit"
@@ -15829,19 +15846,22 @@
},
"railway/tram": {
"icon": "railway-light-rail",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "tram"
},
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail"
],
"terms": [
"light rail",
"streetcar",
data/presets/presets/railway/abandoned.json
+6 -5
View File
@@ -1,16 +1,17 @@
{
"icon": "railway-abandoned",
"fields": [
"name",
"structure",
"service_rail",
"usage_rail"
],
"geometry": [
"line"
],
"tags": {
"railway": "abandoned"
},
"fields": [
"name",
"structure",
"service_rail"
],
"terms": [],
"name": "Abandoned Railway"
}
data/presets/presets/railway/disused.json
+5 -4
View File
@@ -1,15 +1,16 @@
{
"icon": "railway-disused",
"fields": [
"structure",
"service_rail",
"usage_rail"
],
"geometry": [
"line"
],
"tags": {
"railway": "disused"
},
"fields": [
"structure",
"service_rail"
],
"terms": [],
"name": "Disused Railway"
}
data/presets/presets/railway/light_rail.json
+10 -7
View File
@@ -1,18 +1,21 @@
{
"icon": "railway-light-rail",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "light_rail"
},
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail"
],
"terms": [
"light rail",
"streetcar",
data/presets/presets/railway/monorail.json
+9 -6
View File
@@ -1,17 +1,20 @@
{
"icon": "railway-monorail",
"fields": [
"name",
"structure",
"electrified",
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "monorail"
},
"fields": [
"name",
"structure",
"electrified",
"service_rail"
],
"terms": [],
"name": "Monorail"
}
data/presets/presets/railway/narrow_gauge.json
+10 -7
View File
@@ -1,18 +1,21 @@
{
"icon": "railway-rail",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "narrow_gauge"
},
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail"
],
"terms": [
"narrow gauge railway",
"narrow gauge railroad"
data/presets/presets/railway/rail.json
+10 -7
View File
@@ -1,19 +1,22 @@
{
"icon": "railway-rail",
"geometry": [
"line"
],
"tags": {
"railway": "rail"
},
"fields": [
"name",
"structure",
"gauge",
"electrified",
"maxspeed",
"service_rail"
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "rail"
},
"terms": [],
"name": "Rail"
}
data/presets/presets/railway/subway.json
+10 -7
View File
@@ -1,18 +1,21 @@
{
"icon": "railway-subway",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "subway"
},
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail"
],
"terms": [
"metro",
"transit"
data/presets/presets/railway/tram.json
+10 -7
View File
@@ -1,18 +1,21 @@
{
"icon": "railway-light-rail",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail",
"voltage",
"frequency"
],
"geometry": [
"line"
],
"tags": {
"railway": "tram"
},
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail"
],
"terms": [
"light rail",
"streetcar",
dist/locales/en.json
Vendored
+11
View File
@@ -2664,6 +2664,17 @@
"label": "Type",
"placeholder": "Default"
},
"usage_rail": {
"label": "Usage Type",
"options": {
"main": "Main",
"branch": "Branch",
"industrial": "Industrial",
"military": "Military",
"test": "Test",
"tourism": "Tourism"
}
},
"vending": {
"label": "Type of Goods"
},