🔪 scattermapbox/calc.js | ♻️ scattergeo/calc.js

Author: etpinard

src/traces/scattermapbox/calc.js

@@ -14,7 +14,7 @@ var ScatterMapbox = {};
 ScatterMapbox.attributes = require('./attributes');
 ScatterMapbox.supplyDefaults = require('./defaults');
 ScatterMapbox.colorbar = require('../scatter/colorbar');
-ScatterMapbox.calc = require('./calc');
+ScatterMapbox.calc = require('../scattergeo/calc');
 ScatterMapbox.hoverPoints = require('./hover');
 ScatterMapbox.eventData = require('./event_data');
 ScatterMapbox.plot = require('./plot');

src/traces/scattermapbox/index.js

@@ -112,143 +112,6 @@ describe('scattermapbox defaults', function() {
     });
 });
 
-describe('scattermapbox calc', function() {
-    'use strict';
-
-    function _calc(trace) {
-        var gd = { data: [trace] };
-
-        Plots.supplyDefaults(gd);
-
-        var fullTrace = gd._fullData[0];
-        return ScatterMapbox.calc(gd, fullTrace);
-    }
-
-    var base = { type: 'scattermapbox' };
-
-    it('should place lon/lat data in lonlat pairs', function() {
-        var calcTrace = _calc(Lib.extendFlat({}, base, {
-            lon: [10, 20, 30],
-            lat: [20, 30, 10]
-        }));
-
-        expect(calcTrace).toEqual([
-            { lonlat: [10, 20] },
-            { lonlat: [20, 30] },
-            { lonlat: [30, 10] }
-        ]);
-    });
-
-    it('should coerce numeric strings lon/lat data into numbers', function() {
-        var calcTrace = _calc(Lib.extendFlat({}, base, {
-            lon: [10, 20, '30', '40'],
-            lat: [20, '30', 10, '50']
-        }));
-
-        expect(calcTrace).toEqual([
-            { lonlat: [10, 20] },
-            { lonlat: [20, 30] },
-            { lonlat: [30, 10] },
-            { lonlat: [40, 50] }
-        ]);
-    });
-
-    it('should keep track of gaps in data', function() {
-        var calcTrace = _calc(Lib.extendFlat({}, base, {
-            lon: [null, 10, null, null, 20, '30', null, '40', null, 10],
-            lat: [10, 20, '30', null, 10, '50', null, 60, null, null]
-        }));
-
-        expect(calcTrace).toEqual([
-            { lonlat: [10, 20], gapAfter: true },
-            { lonlat: [20, 10] },
-            { lonlat: [30, 50], gapAfter: true },
-            { lonlat: [40, 60], gapAfter: true }
-        ]);
-    });
-
-    it('should fill array text (base case)', function() {
-        var calcTrace = _calc(Lib.extendFlat({}, base, {
-            lon: [10, 20, 30],
-            lat: [20, 30, 10],
-            text: ['A', 'B', 'C']
-        }));
-
-        expect(calcTrace).toEqual([
-            { lonlat: [10, 20], tx: 'A' },
-            { lonlat: [20, 30], tx: 'B' },
-            { lonlat: [30, 10], tx: 'C' }
-        ]);
-    });
-
-    it('should fill array text (invalid entry case)', function() {
-        var calcTrace = _calc(Lib.extendFlat({}, base, {
-            lon: [10, 20, 30],
-            lat: [20, 30, 10],
-            text: ['A', 'B', null]
-        }));
-
-        expect(calcTrace).toEqual([
-            { lonlat: [10, 20], tx: 'A' },
-            { lonlat: [20, 30], tx: 'B' },
-            { lonlat: [30, 10], tx: '' }
-        ]);
-    });
-
-    it('should fill array marker attributes (base case)', function() {
-        var calcTrace = _calc(Lib.extendFlat({}, base, {
-            lon: [10, 20, null, 30],
-            lat: [20, 30, null, 10],
-            marker: {
-                color: ['red', 'blue', 'green', 'yellow'],
-                size: [10, 20, 8, 10]
-            }
-        }));
-
-        expect(calcTrace).toEqual([
-            { lonlat: [10, 20], mc: 'red', ms: 10, mcc: 'red', mrc: 5 },
-            { lonlat: [20, 30], mc: 'blue', ms: 20, mcc: 'blue', mrc: 10, gapAfter: true },
-            { lonlat: [30, 10], mc: 'yellow', ms: 10, mcc: 'yellow', mrc: 5 }
-        ]);
-    });
-
-    it('should fill array marker attributes (invalid scale case)', function() {
-        var calcTrace = _calc(Lib.extendFlat({}, base, {
-            lon: [10, 20, null, 30],
-            lat: [20, 30, null, 10],
-            marker: {
-                color: [0, null, 5, 10],
-                size: [10, NaN, 8, 10],
-                colorscale: [
-                    [0, 'blue'], [0.5, 'red'], [1, 'green']
-                ]
-            }
-        }));
-
-        expect(calcTrace).toEqual([
-            { lonlat: [10, 20], mc: 0, ms: 10, mcc: 'rgb(0, 0, 255)', mrc: 5 },
-            { lonlat: [20, 30], mc: null, ms: NaN, mcc: '#444', mrc: 0, gapAfter: true },
-            { lonlat: [30, 10], mc: 10, ms: 10, mcc: 'rgb(0, 128, 0)', mrc: 5 }
-        ]);
-    });
-
-    it('should fill marker attributes (symbol case)', function() {
-        var calcTrace = _calc(Lib.extendFlat({}, base, {
-            lon: [10, 20, null, 30],
-            lat: [20, 30, null, 10],
-            marker: {
-                symbol: ['monument', 'music', 'harbor', null]
-            }
-        }));
-
-        expect(calcTrace).toEqual([
-            { lonlat: [10, 20], mx: 'monument' },
-            { lonlat: [20, 30], mx: 'music', gapAfter: true },
-            { lonlat: [30, 10], mx: 'circle' }
-        ]);
-    });
-});
-
 describe('scattermapbox convert', function() {
     'use strict';