Lanes

.gitignore

@@ -8,6 +8,7 @@ dist/mapillary-js/
 node_modules/
 npm-debug.log
 transifex.auth
+.vscode
 
 # autogenerated symlinks
 land.html

css/app.css

@@ -1221,6 +1221,124 @@ button.save.has-count .count::before {
     border-bottom-right-radius: 4px;
 }
 
+/* lanes */
+
+.form-field-lanes .lanes-info input {
+    min-height: 30px;
+    /*padding: 5px 10px;
+    width: 100%;*/
+    border-radius: 0;
+    border-width: 0;
+    border-left-width: 1px;
+}
+.form-field-lanes .spin-control button{
+    height: 30px;
+    right: 0;
+}
+.form-field-lanes .lane-field  {
+    border-radius: 0;
+    border-width: 0;
+    border-bottom-width: 1px;
+    padding: 5px 10px;
+    width: 100%;
+    border: 1px solid #CCC;
+    border-top: 0
+}
+
+.form-field-lanes .preset-input-wrap li {
+    border-bottom: 1px solid #CCC;
+}
+
+.form-field-lanes .preset-input-wrap li:last-child {
+    border-bottom: 0;
+}
+
+.form-field-lanes .entry {
+    margin-top: 10px;
+    opacity: 1;
+    overflow: visible;
+}
+
+.lane-selector ul {
+    display: flex;
+    flex-direction: row;
+}
+
+.lane-selector .lane-index {
+    cursor: pointer;
+    display: flex;
+    flex-grow: 1;
+    border-right: 1px solid #ccc;
+    flex-direction: column;
+    align-items: center;
+    background-color: white;
+}
+
+.lane-selector .lane-index.active {
+    background-color: #E8EBFF;
+}
+.lane-selector .lane-index.active:hover {
+    background-color: #E8EBFF;
+}
+.lane-selector .lane-index:hover {
+    background-color: #ececec;
+}
+
+.lane-selector .lane-index.has-data {
+    font-weight: bold;
+}
+
+.lane-selector .lane-index:last-child {
+    border-right: 0;
+}
+
+.lane-selector .lane-index span {
+    height: 30px;
+    line-height: 30px;
+}
+
+.turn-lane-tags .turn-lanes-direction {
+    position: relative;
+    padding: 5px 10px;
+    height: 30px;
+    background-color: white;
+    color: #7092FF;
+    cursor: pointer;
+}
+.turn-lane-tags .turn-lanes-direction.active {
+    background-color: #E8EBFF;
+}
+.turn-lane-tags .turn-lanes-direction.active:hover {
+    background-color: #E8EBFF;
+}
+.turn-lane-tags .turn-lanes-direction.left-border {
+    border-left: 1px solid #ccc
+}
+.turn-lane-tags .turn-lanes-direction:hover {
+    background-color: #ececec;
+}
+.turn-lanes-directions .direction {
+    width: 50px;
+}
+.turn-lane-tags .turn-lanes-direction:nth-last-child(2) {
+    border-bottom: 0;
+    border-bottom-left-radius: 4px;
+}
+.turn-lane-tags .turn-lanes-direction:last-child {
+    border-bottom: 0;
+    border-bottom-right-radius: 4px;
+}
+
+.lanes-svg-wrapper .lanes-circle {
+    stroke-width: 2;
+    stroke: #000;
+    fill-opacity: 0.75;
+    fill: #fff;
+}
+
+.lanes-svg-wrapper .lanes-circle.backward {
+    stroke-dasharray: 3 5;
+}
 /* preset form multicombo */
 
 .form-field-multicombo {
@@ -3227,7 +3345,6 @@ img.tile-removing {
 
 /* Scrollbars
  ----------------------------------------------------- */
-
 ::-webkit-scrollbar {
     height: 20px;
     overflow: visible;

data/core.yaml

@@ -838,3 +838,15 @@ en:
       help: "You can replay this walkthrough or view more documentation by clicking the {button} Help button."
       save: "Don't forget to regularly save your changes!"
       start: "Start mapping!"
+  lanes:
+    turn:
+      left: "Left"
+      right: "Right"
+      slight_left: "Slight left"
+      slight_right: "Slight right"
+      sharp_left: "Sharp left"
+      sharp_right: "Sharp right"
+      merge_to_left: "Merge left"
+      merge_to_right: "Merge right"
+      reverse: "Reverse"
+      through: "Through"

data/presets/fields.json

@@ -827,7 +827,7 @@
         },
         "lanes": {
             "key": "lanes",
-            "type": "number",
+            "type": "lanes",
             "label": "Lanes",
             "placeholder": "1, 2, 3..."
         },

data/presets/fields/lanes.json

@@ -1,6 +1,6 @@
 {
     "key": "lanes",
-    "type": "number",
+    "type": "lanes",
     "label": "Lanes",
     "placeholder":"1, 2, 3..."
 }

development_server.js

@@ -10,8 +10,8 @@ var gaze = require('gaze');
 var ecstatic = require('ecstatic');
 
 var building = false;
-
-
+var cache;
+var cacheCount = 0;
 if (process.argv[2] === 'develop') {
     build();
 
@@ -56,7 +56,8 @@ function build() {
             }),
             commonjs(),
             json()
-        ]
+        ],
+        cache: cache
 
     }).then(function (bundle) {
         bundle.write({
@@ -67,7 +68,12 @@ function build() {
         });
         building = false;
         console.timeEnd('Rebuilt');
-
+        cache = bundle;
+        if (cacheCount === 5) {
+            cache = undefined;
+            cacheCount = 0;
+        }
+        cacheCount++;
     }, function(err) {
         building = false;
         console.error(err);

dist/locales/en.json

@@ -697,6 +697,20 @@
                 "start": "Start mapping!"
             }
         },
+        "lanes": {
+            "turn": {
+                "left": "Left",
+                "right": "Right",
+                "slight_left": "Slight left",
+                "slight_right": "Slight right",
+                "sharp_left": "Sharp left",
+                "sharp_right": "Sharp right",
+                "merge_to_left": "Merge left",
+                "merge_to_right": "Merge right",
+                "reverse": "Reverse",
+                "through": "Through"
+            }
+        },
         "presets": {
             "categories": {
                 "category-barrier": {