use cycleway tag alongside :both/left/right

cycleway=separate would mean inaccessible in osrm for transition

Author: kaligrafy

css/30_highways.css

@@ -977,6 +977,13 @@ svg#surface:not(.debug-surfaces) path.over-stroke.tag-crossing.tag-name-no {
   stroke-linecap: butt !important;
 }
 
+/* cycleway separate (no biicycle access) */
+svg#surface:not(.debug-surfaces) path.over-stroke.tag-cycleway-separate,
+svg#surface:not(.debug-surfaces) path.over-stroke.tag-cycleway_both-separate {
+  stroke-width: 1 !important;
+  stroke:  rgb(255, 0, 0) !important;
+  stroke-linecap: butt !important;
+}
 
 /* turn lanes */
 svg#surface:not(.debug-surfaces) path.over-stroke.tag-turn_lanes-yes {

data/presets/fields/cycleway.json

@@ -1,28 +1,29 @@
 {
-    "keys": ["cycleway:both", "cycleway:left", "cycleway:right"],
+    "keys": ["cycleway", "cycleway:both", "cycleway:left", "cycleway:right"],
     "reference": {"key": "cycleway"},
     "type": "cycleway",
     "label": "Bike Lanes",
     "placeholder": "none",
     "strings": {
         "types": {
-            "cycleway:both": "Both sides",
+            "cycleway": "Cycleway",
+            "cycleway:both": "Both sides (:both)",
             "cycleway:left": "Left side",
             "cycleway:right": "Right side"
         },
         "options": {
-            "none": {
-                "title": "None",
+            "separate": {
+                "title": "Bike track drawned separately",
+                "description": "A bike lane separated from traffic by a physical barrier is drawned as its own separate way"
+            },
+            "no": {
+                "title": "No",
                 "description": "No bike lane"
             },
             "lane": {
                 "title": "Standard bike lane",
                 "description": "A bike lane separated from auto traffic by a painted line"
             },
-            "separate": {
-                "title": "Bike track drawned separately",
-                "description": "A bike lane separated from traffic by a physical barrier is drawned as its own separate way"
-            },
             "shared_lane": {
                 "title": "Shared bike lane",
                 "description": "A bike lane with no separation from auto traffic"

dist/iD.css

@@ -1928,6 +1928,13 @@ svg#surface:not(.debug-surfaces) path.over-stroke.tag-crossing.tag-name-no {
   stroke-linecap: butt !important;
 }
 
+/* cycleway separate (no biicycle access) */
+svg#surface:not(.debug-surfaces) path.over-stroke.tag-cycleway-separate,
+svg#surface:not(.debug-surfaces) path.over-stroke.tag-cycleway_both-separate {
+  stroke-width: 1 !important;
+  stroke:  rgb(255, 0, 0) !important;
+  stroke-linecap: butt !important;
+}
 
 /* turn lanes */
 svg#surface:not(.debug-surfaces) path.over-stroke.tag-turn_lanes-yes {

dist/iD.js

@@ -14,7 +14,7 @@ export function actionCloneRoadAttributes(selectedIds, cloneTags = [], languageS
             'bus:lanes:forward', 'lanes:bus:forward', 'bus:lanes:backward', 'lanes:bus:backward',
             'lanes', 'lanes:forward', 'lanes:backward',
             'sidewalk:both', 'sidewalk', 'sidewalk:right', 'sidewalk:left', 'foot',
-            'routing:bicycle', 'bicycle', 'cycleway:both', 'cycleway:right', 'cycleway:left',
+            'routing:bicycle', 'bicycle', 'cycleway', 'cycleway:both', 'cycleway:right', 'cycleway:left',
             'turn:lanes', 'turn:lanes:forward', 'turn:lanes:backward',
             'placement', 'placement:start', 'placement:end', 'width:lanes:start', 'width:lanes:end',
             'placement:forward', 'width:lanes:forward:start', 'width:lanes:forward:end',

dist/iD.js.map

@@ -10,7 +10,7 @@ import {
 
 export function operationCloneCycleway(selectedIDs, context) {
 
-    const cloneTags = ['routing:bicycle', 'bicycle', 'cycleway:both', 'cycleway:right', 'cycleway:buffer', 'cycleway:marking', 'cycleway:right:marking', 'cycleway:left:marking', 'cycleway:separation', 'cycleway:right:separation', 'cycleway:right:buffer', 'cycleway:right:oneway', 'cycleway:left:separation', 'cycleway:left:buffer', 'cycleway:left:oneway', 'cycleway:left', 'oneway:bicycle', 'lcn']
+    const cloneTags = ['routing:bicycle', 'bicycle', 'cycleway', 'cycleway:both', 'cycleway:right', 'cycleway:buffer', 'cycleway:marking', 'cycleway:right:marking', 'cycleway:left:marking', 'cycleway:separation', 'cycleway:right:separation', 'cycleway:right:buffer', 'cycleway:right:oneway', 'cycleway:left:separation', 'cycleway:left:buffer', 'cycleway:left:oneway', 'cycleway:left', 'oneway:bicycle', 'lcn'];
     var action = actionCloneRoadAttributes(selectedIDs, cloneTags);
 
     var operation = function () {

dist/iD.min.js

@@ -15,7 +15,7 @@ export function operationCloneRoadAttributes(selectedIDs, context) {
         'bus:lanes:forward', 'lanes:bus:forward', 'bus:lanes:backward', 'lanes:bus:backward',
         'lanes', 'lanes:forward', 'lanes:backward',
         'sidewalk', 'sidewalk:both', 'sidewalk:right', 'sidewalk:left', 'foot',
-        'routing:bicycle', 'bicycle', 'cycleway:both', 'cycleway:right', 'cycleway:left',
+        'routing:bicycle', 'bicycle', 'cycleway', 'cycleway:both', 'cycleway:right', 'cycleway:left',
         'turn:lanes', 'turn:lanes:forward', 'turn:lanes:backward',
         'placement', 'placement:start', 'placement:end', 'width:lanes:start', 'width:lanes:end',
         'placement:forward', 'width:lanes:forward:start', 'width:lanes:forward:end',

modules/actions/clone_road_attributes.js

@@ -202,6 +202,8 @@ export function svgTagClasses() {
             var sidewalkRight = null;
             var indoor = null;
             var cycleway = null;
+            var cyclewayLeft = null;
+            var cyclewayRight = null;
             var crossing = null;
             var crossingMarkings = null;
             var segregated = null;
@@ -271,11 +273,11 @@ export function svgTagClasses() {
                     classes.push('tag-cycleway-' + cycleway);
                 }
                 if (k === 'cycleway:left') {
-                    cycleway = v;
+                    cyclewayLeft = v;
                     classes.push('tag-cycleway_left-' + cycleway);
                 }
                 if (k === 'cycleway:right') {
-                    cycleway = v;
+                    cyclewayRight = v;
                     classes.push('tag-cycleway_right-' + cycleway);
                 }
                 if (k === 'cycleway:both') {
@@ -476,6 +478,15 @@ export function svgTagClasses() {
             if (t.highway === 'cycleway' && !segregated) {
                 classes.push('tag-segregated-undefined');
             }
+            if (cyclewayLeft === 'separate' && cyclewayRight === 'separate') {
+                classes.push('tag-cycleway-separate');
+            }
+            if (cyclewayLeft === 'no' && cyclewayRight === 'separate') {
+                classes.push('tag-cycleway-separate');
+            }
+            if (cyclewayLeft === 'separate' && cyclewayRight === 'no') {
+                classes.push('tag-cycleway-separate');
+            }
             if (!hasName && (isSidewalk || isCycleway || isCrossing)) {
                 classes.push('tag-name-no');
             }

modules/operations/clone_cycleway.js

@@ -34,7 +34,7 @@ export function uiFieldCycleway(field, context) {
             .attr('class', 'rows')
             .merge(div);
 
-        var keys = ['cycleway:both', 'cycleway:left', 'cycleway:right'];
+        var keys = ['cycleway', 'cycleway:both', 'cycleway:left', 'cycleway:right'];
 
         items = div.selectAll('li')
             .data(keys);
@@ -73,28 +73,51 @@ export function uiFieldCycleway(field, context) {
 
 
     function change() {
+        var cycleway = utilGetSetValue(d3_select('.preset-input-cycleway'));
         var both = utilGetSetValue(d3_select('.preset-input-cyclewayboth'));
         var left = utilGetSetValue(d3_select('.preset-input-cyclewayleft'));
         var right = utilGetSetValue(d3_select('.preset-input-cyclewayright'));
         var tag = {};
 
-        if (both === '') { both = undefined; }
-        if (left === '') { left = undefined; }
-        if (right === '') { right = undefined; }
+        // cycleway=separate means in osrm from transition: no access, use sidepath.
+        // cycleway:both=separate would mean the same
+
+
+        if (cycleway === '' || cycleway === null) { cycleway = undefined; }
+        if (both === '' || both === null) { both = undefined; }
+        if (left === '' || left === null) { left = undefined; }
+        if (right === '' || right === null) { right = undefined; }
         if (left !== undefined && right !== undefined && left !== right) { 
             both = undefined;
+            if (cycleway !== 'separate') {
+                cycleway = undefined;
+            }
         }
-        if (both !== undefined && both !== null) { 
-            left = undefined; 
+        if (both !== undefined) { 
+            left = undefined;
             right = undefined;
         }
         if (left === right && left !== undefined) {
             both = left;
+            if (left === 'separate') {
+                cycleway = left;
+                left = undefined;
+                right = undefined;
+                both = undefined;
+            }
+        }
+        if (both === 'separate') {
+            cycleway = 'separate';
+            both = undefined;
+        }
+        if (left === 'separate' && right === 'no' || left === 'no' && right === 'separate') {
+            cycleway = 'separate';
+            both = undefined;
         }
 
         // Always set both left and right as changing one can affect the other
         tag = {
-            cycleway: undefined,
+            'cycleway': cycleway,
             'cycleway:both': both,
             'cycleway:left': left,
             'cycleway:right': right