add some layer sourcetype -> type logic

Author: etpinard

src/plots/mapbox/layout_defaults.js

@@ -6,7 +6,6 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var Lib = require('../../lib');
@@ -52,6 +51,8 @@ function handleLayerDefaults(layerIn, layerOut) {
     var visible = coerce('visible');
     if(visible) {
         var sourceType = coerce('sourcetype');
+        var mustBeRasterLayer = sourceType === 'raster' || sourceType === 'image';
+
         coerce('source');
 
         if(sourceType === 'vector') {
@@ -62,8 +63,15 @@ function handleLayerDefaults(layerIn, layerOut) {
             coerce('coordinates');
         }
 
-        // maybe add smart default based off GeoJSON geometry?
-        var type = coerce('type');
+        var typeDflt;
+        if(mustBeRasterLayer) typeDflt = 'raster';
+
+        var type = coerce('type', typeDflt);
+
+        if(mustBeRasterLayer && type !== 'raster') {
+            type = layerOut.type = 'raster';
+            Lib.log('Source types *raster* and *image* must drawn *raster* layer type.');
+        }
 
         coerce('below');
         coerce('color');

test/jasmine/tests/mapbox_test.js

@@ -184,6 +184,52 @@ describe('mapbox defaults', function() {
         expect(layoutOut.mapbox.layers[3].circle).toBeUndefined();
     });
 
+    it('should not allow to set layer type other than *raster* for sourcetype value *raster* and *image*', function() {
+        spyOn(Lib, 'log');
+
+        layoutIn = {
+            mapbox: {
+                layers: [{
+                    sourcetype: 'raster',
+                    source: 'url',
+                    type: 'circle'
+                }, {
+                    sourcetype: 'image',
+                    source: 'url',
+                    type: 'fill'
+                }]
+            }
+        };
+        supplyLayoutDefaults(layoutIn, layoutOut, fullData);
+
+        expect(Lib.log).toHaveBeenCalledTimes(2);
+        expect(Lib.log).toHaveBeenCalledWith('Source types *raster* and *image* must drawn *raster* layer type.');
+
+        expect(layoutOut.mapbox.layers[0].type).toBe('raster');
+        expect(layoutOut.mapbox.layers[1].type).toBe('raster');
+    });
+
+    it('should default layer with sourcetype *raster* and *image* to type *raster', function() {
+        spyOn(Lib, 'log');
+
+        layoutIn = {
+            mapbox: {
+                layers: [{
+                    sourcetype: 'raster',
+                    source: 'url'
+                }, {
+                    sourcetype: 'image',
+                    source: 'url'
+                }]
+            }
+        };
+        supplyLayoutDefaults(layoutIn, layoutOut, fullData);
+
+        expect(Lib.log).toHaveBeenCalledTimes(0);
+        expect(layoutOut.mapbox.layers[0].type).toBe('raster');
+        expect(layoutOut.mapbox.layers[1].type).toBe('raster');
+    });
+
     it('should set *layout.dragmode* to pan while zoom is not available', function() {
         var gd = {
             data: fullData,