Merge pull request #590 from openstreetmap/crossing_markings

refactor crossing presets to use approved "crossing:markings" tag: add field for the new tag, change "Marked Crosswalk" presets to use "crossing=uncontrolled" tag and add preset for "Cycle Crossing With Traffic Signals"

data/fields/crossing.json

@@ -1,5 +1,17 @@
 {
     "key": "crossing",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "options": [
+        "traffic_signals",
+        "uncontrolled",
+        "unmarked"
+    ],
+    "strings": {
+        "options": {
+            "traffic_signals": "Crossing With Traffic Signals",
+            "uncontrolled": "Only Road Markings",
+            "unmarked": "No Road Markings or Traffic Signals"
+        }
+    }
 }

data/fields/crossing/markings.json

@@ -0,0 +1,24 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "Crossing Markings",
+    "strings": {
+        "options": {
+            "zebra": "Longitudinal Bars",
+            "lines": "Transverse Lines",
+            "no": "Unmarked",
+            "ladder": "Ladder With Longitudinal Bars",
+            "dots": "Dotted Transverse Lines",
+            "dashes": "Dashed Transverse Lines",
+            "yes": "Marked Somehow",
+            "surface": "Surface Treatment Only",
+            "ladder:skewed": "Ladder With Diagonal Bars",
+            "pictograms": "Painted Pictograms",
+            "lines:paired": "Double Transverse Lines",
+            "zebra:double": "Triple-Four",
+            "zebra:paired": "Paired Longitudinal Bars",
+            "zebra:bicolour": "Longitudinal Bars With Alternating Colors",
+            "ladder:paired": "Ladder With Paired Longitudinal Bars"
+        }
+    }
+}