add support for 'connectgaps'

etpinard · etpinard · commit 9f6fcc7aa86a · 2016-05-31T13:40:19.000-04:00
diff --git a/src/traces/scattermapbox/attributes.js b/src/traces/scattermapbox/attributes.js
@@ -9,6 +9,7 @@
 'use strict';
 
 var scatterGeoAttrs = require('../scattergeo/attributes');
+var scatterAttrs = require('../scatter/attributes');
 var plotAttrs = require('../../plots/attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
 
@@ -42,7 +43,7 @@ module.exports = {
         dash: lineAttrs.dash  // TODO
     },
 
-    //connectgaps
+    connectgaps: scatterAttrs.connectgaps,
 
     marker: {
         symbol: {
diff --git a/src/traces/scattermapbox/convert.js b/src/traces/scattermapbox/convert.js
@@ -84,16 +84,37 @@ function makeBlankGeoJSON() {
 }
 
 function makeLineGeoJSON(trace) {
+    var len = getCoordLen(trace),
+        connectgaps = trace.connectgaps;
+
+    var coords = [],
+        lineString = [];
+
+    for(var i = 0; i < len; i++) {
+        var lon = trace.lon[i],
+            lat = trace.lat[i];
+
+        if(checkLonLat(lon, lat)) {
+            lineString.push([+lon, +lat]);
+        }
+        else if(!connectgaps && lineString.length > 0) {
+            coords.push(lineString);
+            lineString = [];
+        }
+    }
+
+    coords.push(lineString);
+
     return {
         type: 'MultiLineString',
-        coordinates: [calcCoords(trace)]
+        coordinates: coords
     };
 }
 
 // N.B. `hash` is mutated here
 function makeMarkerGeoJSON(trace, hash) {
     var marker = trace.marker,
-        len = trace.lon.length,
+        len = getCoordLen(trace),
         hasColorArray = Array.isArray(marker.color),
         hasSizeArray = Array.isArray(marker.size);
 
@@ -117,7 +138,7 @@ function makeMarkerGeoJSON(trace, hash) {
         if(hasColorArray) translate(props, COLOR_PROP, marker.color, i);
         if(hasSizeArray) translate(props, SIZE_PROP, marker.size, i);
 
-        if(isNumeric(lon) && isNumeric(lat)) {
+        if(checkLonLat(lon, lat)) {
             features.push({
                 type: 'Feature',
                 geometry: {
@@ -199,19 +220,11 @@ function calcMarkerSize(trace, hash) {
     return out;
 }
 
+function checkLonLat(lon, lat) {
+    return isNumeric(lon) && isNumeric(lat);
+}
 
-function calcCoords(trace) {
-    var len = trace.lon.length;
-    var coordinates = [];
-
-    for(var i = 0; i < len; i++) {
-        var lon = trace.lon[i],
-            lat = trace.lat[i];
-
-        if(isNumeric(lon) && isNumeric(lat)) {
-            coordinates.push([+lon, +lat]);
-        }
-    }
-
-    return coordinates;
+// lon and lat have the same length after the defaults step
+function getCoordLen(trace) {
+    return trace.lon.length;
 }
diff --git a/src/traces/scattermapbox/defaults.js b/src/traces/scattermapbox/defaults.js
@@ -43,6 +43,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     if(subTypes.hasLines(traceOut)) {
         handleLineDefaults(traceIn, traceOut, defaultColor, coerce);
+        coerce('connectgaps');
     }
 
     if(subTypes.hasMarkers(traceOut)) {
diff --git a/test/image/baselines/mapbox_connectgaps.png b/test/image/baselines/mapbox_connectgaps.png
diff --git a/test/image/mocks/mapbox_connectgaps.json b/test/image/mocks/mapbox_connectgaps.json
@@ -0,0 +1,70 @@
+{
+  "data": [
+    {
+      "type": "scattermapbox",
+      "mode": "lines",
+      "lon": [
+        10,
+        20,
+        30,
+        null,
+        20,
+        30,
+        40
+      ],
+      "lat": [
+        10,
+        20,
+        30,
+        null,
+        10,
+        20,
+        30
+      ],
+      "line": {
+        "width": 5
+      },
+      "name": "connectgaps false"
+    },
+    {
+      "type": "scattermapbox",
+      "mode": "lines",
+      "lon": [
+        10,
+        20,
+        30,
+        null,
+        20,
+        30,
+        40
+      ],
+      "lat": [
+        -10,
+        -20,
+        -30,
+        null,
+        -10,
+        -20,
+        -30
+      ],
+      "line": {
+        "width": 10
+      },
+      "connectgaps": true,
+      "name": "connectgaps true"
+    }
+  ],
+  "layout": {
+    "mapbox": {
+      "style": "streets",
+      "zoom": 1.5,
+      "center": {
+        "lon": 56,
+        "lat": 1
+      }
+    },
+    "height": 450,
+    "width": 1100,
+    "autosize": true
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout`
`43`	`43`
`44`	`44`	`if(subTypes.hasLines(traceOut)) {`
`45`	`45`	`handleLineDefaults(traceIn, traceOut, defaultColor, coerce);`
	`46`	`+ coerce('connectgaps');`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`if(subTypes.hasMarkers(traceOut)) {`