From 44ec568c5aafd554264734f358716ed679e99032 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Mon, 18 Mar 2013 17:08:40 -0400
Subject: [PATCH] add bridge/tunnel form to railways and footways

---
 data/presets/fields.json                      | 22 ++++++++------
 .../fields/{roadtype.json => structure.json}  |  0
 data/presets/presets.json                     | 29 ++++++++++++-------
 data/presets/presets/highway/cycleway.json    |  2 +-
 data/presets/presets/highway/footway.json     |  3 +-
 data/presets/presets/highway/motorway.json    |  2 +-
 data/presets/presets/highway/path.json        |  2 +-
 data/presets/presets/highway/primary.json     |  2 +-
 data/presets/presets/highway/residential.json |  2 +-
 data/presets/presets/highway/secondary.json   |  2 +-
 data/presets/presets/highway/service.json     |  2 +-
 data/presets/presets/highway/tertiary.json    |  2 +-
 data/presets/presets/highway/track.json       |  2 +-
 data/presets/presets/highway/trunk.json       |  2 +-
 .../presets/presets/highway/unclassified.json |  2 +-
 data/presets/presets/railway/rail.json        |  5 +++-
 data/presets/presets/railway/subway.json      |  5 +++-
 17 files changed, 52 insertions(+), 34 deletions(-)
 rename data/presets/fields/{roadtype.json => structure.json} (100%)

diff --git a/data/presets/fields.json b/data/presets/fields.json
index bd66bb4d4..4af12766c 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -57,6 +57,10 @@
         "key": "construction",
         "type": "combo"
     },
+    "country": {
+        "key": "country",
+        "type": "combo"
+    },
     "crossing": {
         "key": "crossing",
         "type": "combo"
@@ -200,15 +204,6 @@
             "taoist"
         ]
     },
-    "roadtype": {
-        "type": "radio",
-        "options": [
-            "bridge",
-            "tunnel",
-            "embankment",
-            "cutting"
-        ]
-    },
     "service": {
         "key": "service",
         "type": "combo",
@@ -238,6 +233,15 @@
         "key": "sport",
         "type": "combo"
     },
+    "structure": {
+        "type": "radio",
+        "options": [
+            "bridge",
+            "tunnel",
+            "embankment",
+            "cutting"
+        ]
+    },
     "surface": {
         "key": "surface",
         "type": "combo"
diff --git a/data/presets/fields/roadtype.json b/data/presets/fields/structure.json
similarity index 100%
rename from data/presets/fields/roadtype.json
rename to data/presets/fields/structure.json
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 21de35460..95b6122f2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -865,7 +865,7 @@
         "icon": "highway-cycleway",
         "fields": [
             "oneway",
-            "roadtype",
+            "structure",
             "access",
             "surface"
         ],
@@ -880,6 +880,7 @@
     "highway/footway": {
         "icon": "highway-footway",
         "fields": [
+            "structure",
             "access",
             "surface"
         ],
@@ -920,7 +921,7 @@
         "icon": "highway-motorway",
         "fields": [
             "oneway",
-            "roadtype",
+            "structure",
             "access",
             "maxspeed",
             "surface"
@@ -937,7 +938,7 @@
         "icon": "highway-footway",
         "fields": [
             "oneway",
-            "roadtype",
+            "structure",
             "access",
             "maxspeed",
             "surface"
@@ -954,7 +955,7 @@
         "icon": "highway-primary",
         "fields": [
             "oneway",
-            "roadtype",
+            "structure",
             "access",
             "maxspeed",
             "surface"
@@ -971,7 +972,7 @@
         "icon": "highway-residential",
         "fields": [
             "oneway",
-            "roadtype",
+            "structure",
             "access",
             "maxspeed",
             "surface"
@@ -988,7 +989,7 @@
         "icon": "highway-secondary",
         "fields": [
             "oneway",
-            "roadtype",
+            "structure",
             "access",
             "maxspeed",
             "surface"
@@ -1006,7 +1007,7 @@
         "fields": [
             "service",
             "oneway",
-            "roadtype",
+            "structure",
             "access",
             "maxspeed",
             "surface"
@@ -1039,7 +1040,7 @@
         "icon": "highway-tertiary",
         "fields": [
             "oneway",
-            "roadtype",
+            "structure",
             "access",
             "maxspeed",
             "surface"
@@ -1056,7 +1057,7 @@
         "icon": "highway-track",
         "fields": [
             "oneway",
-            "roadtype",
+            "structure",
             "access",
             "maxspeed",
             "surface"
@@ -1086,7 +1087,7 @@
         "icon": "highway-trunk",
         "fields": [
             "oneway",
-            "roadtype",
+            "structure",
             "access",
             "maxspeed",
             "surface"
@@ -1113,7 +1114,7 @@
         "icon": "highway",
         "fields": [
             "oneway",
-            "roadtype",
+            "structure",
             "access",
             "maxspeed",
             "surface"
@@ -1927,10 +1928,16 @@
         "tags": {
             "railway": "rail"
         },
+        "fields": [
+            "structure"
+        ],
         "terms": []
     },
     "railway/subway": {
         "icon": "railway-rail",
+        "fields": [
+            "structure"
+        ],
         "geometry": [
             "line"
         ],
diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
index ec95542d7..917be9ca7 100644
--- a/data/presets/presets/highway/cycleway.json
+++ b/data/presets/presets/highway/cycleway.json
@@ -2,7 +2,7 @@
     "icon": "highway-cycleway",
     "fields": [
         "oneway",
-        "roadtype",
+        "structure",
         "access",
         "surface"
     ],
diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json
index c3f2bc595..0b6bc2b44 100644
--- a/data/presets/presets/highway/footway.json
+++ b/data/presets/presets/highway/footway.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-footway",
     "fields": [
+        "structure",
         "access",
         "surface"
     ],
@@ -36,4 +37,4 @@
     "tags": {
         "highway": "footway"
     }
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json
index fa5429e42..c7cb143bc 100644
--- a/data/presets/presets/highway/motorway.json
+++ b/data/presets/presets/highway/motorway.json
@@ -2,7 +2,7 @@
     "icon": "highway-motorway",
     "fields": [
         "oneway",
-        "roadtype",
+        "structure",
         "access",
         "maxspeed",
         "surface"
diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json
index a21bc9e3f..69c9377e3 100644
--- a/data/presets/presets/highway/path.json
+++ b/data/presets/presets/highway/path.json
@@ -2,7 +2,7 @@
     "icon": "highway-footway",
     "fields": [
         "oneway",
-        "roadtype",
+        "structure",
         "access",
         "maxspeed",
         "surface"
diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json
index 1a67947b2..aa771b708 100644
--- a/data/presets/presets/highway/primary.json
+++ b/data/presets/presets/highway/primary.json
@@ -2,7 +2,7 @@
     "icon": "highway-primary",
     "fields": [
         "oneway",
-        "roadtype",
+        "structure",
         "access",
         "maxspeed",
         "surface"
diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json
index e5bd076ca..9434abe3d 100644
--- a/data/presets/presets/highway/residential.json
+++ b/data/presets/presets/highway/residential.json
@@ -2,7 +2,7 @@
     "icon": "highway-residential",
     "fields": [
         "oneway",
-        "roadtype",
+        "structure",
         "access",
         "maxspeed",
         "surface"
diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json
index 5a975348c..bd6d65b70 100644
--- a/data/presets/presets/highway/secondary.json
+++ b/data/presets/presets/highway/secondary.json
@@ -2,7 +2,7 @@
     "icon": "highway-secondary",
     "fields": [
         "oneway",
-        "roadtype",
+        "structure",
         "access",
         "maxspeed",
         "surface"
diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json
index 56998311b..7d349d27d 100644
--- a/data/presets/presets/highway/service.json
+++ b/data/presets/presets/highway/service.json
@@ -3,7 +3,7 @@
     "fields": [
         "service",
         "oneway",
-        "roadtype",
+        "structure",
         "access",
         "maxspeed",
         "surface"
diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json
index 9403f382d..b37e1c4fd 100644
--- a/data/presets/presets/highway/tertiary.json
+++ b/data/presets/presets/highway/tertiary.json
@@ -2,7 +2,7 @@
     "icon": "highway-tertiary",
     "fields": [
         "oneway",
-        "roadtype",
+        "structure",
         "access",
         "maxspeed",
         "surface"
diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json
index 6ba1dde74..f3c9b26bf 100644
--- a/data/presets/presets/highway/track.json
+++ b/data/presets/presets/highway/track.json
@@ -2,7 +2,7 @@
     "icon": "highway-track",
     "fields": [
         "oneway",
-        "roadtype",
+        "structure",
         "access",
         "maxspeed",
         "surface"
diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json
index 206d04e62..0d9ecdd85 100644
--- a/data/presets/presets/highway/trunk.json
+++ b/data/presets/presets/highway/trunk.json
@@ -2,7 +2,7 @@
     "icon": "highway-trunk",
     "fields": [
         "oneway",
-        "roadtype",
+        "structure",
         "access",
         "maxspeed",
         "surface"
diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json
index e5450e285..4572fd853 100644
--- a/data/presets/presets/highway/unclassified.json
+++ b/data/presets/presets/highway/unclassified.json
@@ -2,7 +2,7 @@
     "icon": "highway",
     "fields": [
         "oneway",
-        "roadtype",
+        "structure",
         "access",
         "maxspeed",
         "surface"
diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json
index 806773202..4dac78f72 100644
--- a/data/presets/presets/railway/rail.json
+++ b/data/presets/presets/railway/rail.json
@@ -6,5 +6,8 @@
     "tags": {
         "railway": "rail"
     },
+    "fields": [
+        "structure"
+    ],
     "terms": []
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json
index a6b5aa584..5dc0aefb9 100644
--- a/data/presets/presets/railway/subway.json
+++ b/data/presets/presets/railway/subway.json
@@ -1,5 +1,8 @@
 {
     "icon": "railway-rail",
+    "fields": [
+        "structure"
+    ],
     "geometry": [
         "line"
     ],
@@ -7,4 +10,4 @@
         "railway": "subway"
     },
     "terms": []
-}
\ No newline at end of file
+}