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

Add Highspeed field to Rail preset

Browse Source 
Add Operator field to some rail presets
Update some rail presets to use field inheritance
This commit is contained in:
Quincy Morgan
2019-03-15 12:33:50 -04:00
parent 0781b70f38
commit d0eaa958be
14 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+3
View File
@@ -759,6 +759,9 @@ en:
height:
# height=*
label: Height (Meters)
highspeed:
# highspeed=*
label: Highspeed
highway:
# highway=*
label: Type
data/presets/fields.json
+1
View File
@@ -143,6 +143,7 @@
"healthcare": {"key": "healthcare", "type": "typeCombo", "label": "Type"},
"healthcare/speciality": {"key": "healthcare:speciality", "type": "semiCombo", "reference": {"key": "healthcare"}, "label": "Specialties"},
"height": {"key": "height", "minValue": 0, "type": "number", "label": "Height (Meters)"},
"highspeed": {"key": "highspeed", "type": "check", "label": "Highspeed"},
"highway": {"key": "highway", "type": "typeCombo", "label": "Type"},
"historic": {"key": "historic", "type": "typeCombo", "label": "Type"},
"historic/civilization": {"key": "historic:civilization", "type": "combo", "label": "Historic Civilization"},
data/presets/fields/highspeed.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "highspeed",
"type": "check",
"label": "Highspeed"
}
data/presets/presets.json
+8 -8
View File
@@ -835,21 +835,21 @@
"railway/buffer_stop": {"icon": "temaki-buffer_stop", "geometry": ["vertex"], "tags": {"railway": "buffer_stop"}, "terms": ["stop", "halt", "buffer"], "name": "Buffer Stop"},
"railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "pedestrian crossing", "railroad crossing", "level crossing", "grade crossing", "path through railroad", "train crossing"], "name": "Railway Crossing (Path)"},
"railway/derail": {"icon": "maki-roadblock", "geometry": ["vertex"], "tags": {"railway": "derail"}, "terms": ["derailer"], "name": "Railway Derailer"},
"railway/disused": {"icon": "iD-railway-disused", "fields": ["structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"},
"railway/funicular": {"icon": "iD-railway-rail", "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "fields": ["structure", "gauge", "service_rail"], "tags": {"railway": "funicular"}, "name": "Funicular"},
"railway/disused": {"icon": "iD-railway-disused", "fields": ["operator", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"},
"railway/funicular": {"icon": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "service_rail"], "moreFields": ["covered"], "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "tags": {"railway": "funicular"}, "name": "Funicular"},
"railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "railroad crossing", "level crossing", "grade crossing", "road through railroad", "train crossing"], "name": "Railway Crossing (Road)"},
"railway/light_rail": {"icon": "temaki-light_rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail"},
"railway/light_rail": {"icon": "temaki-light_rail", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail"},
"railway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["railway/position", "direction_vertex"], "tags": {"railway": "milestone"}, "terms": ["milestone", "marker"], "name": "Railway Milestone"},
"railway/miniature": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Railway"},
"railway/monorail": {"icon": "temaki-monorail", "fields": ["name", "structure", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"},
"railway/narrow_gauge": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"},
"railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": [], "name": "Rail"},
"railway/monorail": {"icon": "temaki-monorail", "fields": ["name", "operator", "structure", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"},
"railway/narrow_gauge": {"icon": "iD-railway-rail", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"},
"railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": [], "name": "Rail"},
"railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"},
"railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
"railway/subway": {"icon": "temaki-subway", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["maxspeed", "voltage_electrified", "frequency_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
"railway/subway": {"icon": "temaki-subway", "fields": ["{railway/rail}"], "moreFields": ["frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
"railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
"railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
"railway/tram": {"icon": "temaki-tram", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
"railway/tram": {"icon": "temaki-tram", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
"relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
"route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "to", "from"], "tags": {"route": "ferry"}, "name": "Ferry Route"},
"seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
data/presets/presets/railway/disused.json
+1
View File
@@ -1,6 +1,7 @@
{
"icon": "iD-railway-disused",
"fields": [
"operator",
"structure",
"service_rail",
"usage_rail"
data/presets/presets/railway/funicular.json
+10 -5
View File
@@ -1,5 +1,15 @@
{
"icon": "iD-railway-rail",
"fields": [
"name",
"operator",
"structure",
"gauge",
"service_rail"
],
"moreFields": [
"covered"
],
"geometry": [
"line"
],
@@ -10,11 +20,6 @@
"cable railway",
"funicular railway"
],
"fields": [
"structure",
"gauge",
"service_rail"
],
"tags": {
"railway": "funicular"
},
data/presets/presets/railway/light_rail.json
+1 -6
View File
@@ -1,12 +1,7 @@
{
"icon": "temaki-light_rail",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail"
"{railway/rail}"
],
"moreFields": [
"covered",
data/presets/presets/railway/monorail.json
+1
View File
@@ -2,6 +2,7 @@
"icon": "temaki-monorail",
"fields": [
"name",
"operator",
"structure",
"electrified",
"service_rail",
data/presets/presets/railway/narrow_gauge.json
+1 -6
View File
@@ -1,12 +1,7 @@
{
"icon": "iD-railway-rail",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail"
"{railway/rail}"
],
"moreFields": [
"covered",
data/presets/presets/railway/rail.json
+2
View File
@@ -2,6 +2,7 @@
"icon": "iD-railway-rail",
"fields": [
"name",
"operator",
"structure",
"gauge",
"electrified",
@@ -11,6 +12,7 @@
"moreFields": [
"covered",
"frequency_electrified",
"highspeed",
"maxspeed",
"voltage_electrified"
],
data/presets/presets/railway/subway.json
+3 -8
View File
@@ -1,17 +1,12 @@
{
"icon": "temaki-subway",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail"
"{railway/rail}"
],
"moreFields": [
"frequency_electrified",
"maxspeed",
"voltage_electrified",
"frequency_electrified"
"voltage_electrified"
],
"geometry": [
"line"
data/presets/presets/railway/tram.json
+1 -6
View File
@@ -1,12 +1,7 @@
{
"icon": "temaki-tram",
"fields": [
"name",
"structure",
"gauge",
"electrified",
"service_rail",
"usage_rail"
"{railway/rail}"
],
"moreFields": [
"covered",
data/taginfo.json
+1
View File
@@ -1281,6 +1281,7 @@
{"key": "hashtags", "description": "🄵 Suggested Hashtags"},
{"key": "healthcare:speciality", "description": "🄵 Specialties"},
{"key": "height", "description": "🄵 Height (Meters)"},
{"key": "highspeed", "description": "🄵 Highspeed"},
{"key": "historic:civilization", "description": "🄵 Historic Civilization"},
{"key": "wreck:date_sunk", "description": "🄵 Date Sunk"},
{"key": "wreck:visible_at_high_tide", "description": "🄵 Visible At High Tide"},
dist/locales/en.json
Vendored
+3
View File
@@ -2777,6 +2777,9 @@
"height": {
"label": "Height (Meters)"
},
"highspeed": {
"label": "Highspeed"
},
"highway": {
"label": "Type"
},