mapbox: skip over non-object layer containers

etpinard · etpinard · commit d43cfca00a20 · 2016-08-04T13:44:53.000-04:00
- and keep track of input index with '_index'
diff --git a/src/plots/mapbox/layout_defaults.js b/src/plots/mapbox/layout_defaults.js
@@ -50,9 +50,11 @@ function handleLayerDefaults(containerIn, containerOut) {
     }
 
     for(var i = 0; i < layersIn.length; i++) {
-        layerIn = layersIn[i] || {};
+        layerIn = layersIn[i];
         layerOut = {};
 
+        if(!Lib.isPlainObject(layerIn)) continue;
+
         var sourceType = coerce('sourcetype');
         coerce('source');
 
@@ -86,6 +88,7 @@ function handleLayerDefaults(containerIn, containerOut) {
             coerce('symbol.textposition');
         }
 
+        layerOut._index = i;
         layersOut.push(layerOut);
     }
 }
diff --git a/test/jasmine/tests/mapbox_test.js b/test/jasmine/tests/mapbox_test.js
@@ -80,6 +80,20 @@ describe('mapbox defaults', function() {
         expect(layoutOut.mapbox.layers[1].sourcetype).toEqual('geojson');
     });
 
+    it('should skip over non-object layer containers', function() {
+        layoutIn = {
+            mapbox: {
+                layers: [{}, null, 'remove', {}]
+            }
+        };
+
+        supplyLayoutDefaults(layoutIn, layoutOut, fullData);
+        expect(layoutOut.mapbox.layers[0].sourcetype).toEqual('geojson');
+        expect(layoutOut.mapbox.layers[0]._index).toEqual(0);
+        expect(layoutOut.mapbox.layers[1].sourcetype).toEqual('geojson');
+        expect(layoutOut.mapbox.layers[1]._index).toEqual(3);
+    });
+
     it('should coerce \'sourcelayer\' only for *vector* \'sourcetype\'', function() {
         layoutIn = {
             mapbox: {

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,11 @@ function handleLayerDefaults(containerIn, containerOut) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`for(var i = 0; i < layersIn.length; i++) {`
`53`		`- layerIn = layersIn[i] \|\| {};`
	`53`	`+ layerIn = layersIn[i];`
`54`	`54`	`layerOut = {};`
`55`	`55`
	`56`	`+ if(!Lib.isPlainObject(layerIn)) continue;`
	`57`	`+`
`56`	`58`	`var sourceType = coerce('sourcetype');`
`57`	`59`	`coerce('source');`
`58`	`60`
`@@ -86,6 +88,7 @@ function handleLayerDefaults(containerIn, containerOut) {`
`86`	`88`	`coerce('symbol.textposition');`
`87`	`89`	`}`
`88`	`90`
	`91`	`+ layerOut._index = i;`
`89`	`92`	`layersOut.push(layerOut);`
`90`	`93`	`}`
`91`	`94`	`}`