modernise geo index.js file

Author: etpinard

src/plots/geo/attributes.js

@@ -6,30 +6,33 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
-var createGeo = require('./geo');
 var getSubplotCalcData = require('../../plots/get_data').getSubplotCalcData;
 var counterRegex = require('../../lib').counterRegex;
 
-var GEO = 'geo';
-
-exports.name = GEO;
-
-exports.attr = GEO;
-
-exports.idRoot = GEO;
-
-exports.idRegex = exports.attrRegex = counterRegex(GEO);
-
-exports.attributes = require('./attributes');
-
-exports.layoutAttributes = require('./layout_attributes');
+var createGeo = require('./geo');
 
-exports.supplyLayoutDefaults = require('./defaults');
+var GEO = 'geo';
+var counter = counterRegex(GEO);
+
+var attributes = {};
+attributes[GEO] = {
+    valType: 'subplotid',
+    role: 'info',
+    dflt: GEO,
+    editType: 'calc',
+    description: [
+        'Sets a reference between this trace\'s geospatial coordinates and',
+        'a geographic map.',
+        'If *geo* (the default value), the geospatial coordinates refer to',
+        '`layout.geo`.',
+        'If *geo2*, the geospatial coordinates refer to `layout.geo2`,',
+        'and so on.'
+    ].join(' ')
+};
 
-exports.plot = function plotGeo(gd) {
+function plotGeo(gd) {
     var fullLayout = gd._fullLayout;
     var calcData = gd.calcdata;
     var geoIds = fullLayout._subplots[GEO];
@@ -62,9 +65,9 @@ exports.plot = function plotGeo(gd) {
 
         geo.plot(geoCalcData, fullLayout, gd._promises);
     }
-};
+}
 
-exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout) {
+function clean(newFullData, newFullLayout, oldFullData, oldFullLayout) {
     var oldGeoKeys = oldFullLayout._subplots[GEO] || [];
 
     for(var i = 0; i < oldGeoKeys.length; i++) {
@@ -76,9 +79,9 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout)
             oldGeo.clipDef.remove();
         }
     }
-};
+}
 
-exports.updateFx = function(gd) {
+function updateFx(gd) {
     var fullLayout = gd._fullLayout;
     var subplotIds = fullLayout._subplots[GEO];
 
@@ -87,4 +90,18 @@ exports.updateFx = function(gd) {
         var subplotObj = subplotLayout._subplot;
         subplotObj.updateFx(fullLayout, subplotLayout);
     }
+}
+
+module.exports = {
+    attr: GEO,
+    name: GEO,
+    idRoot: GEO,
+    idRegex: counter,
+    attrRegex: counter,
+    attributes: attributes,
+    layoutAttributes: require('./layout_attributes'),
+    supplyLayoutDefaults: require('./layout_defaults'),
+    plot: plotGeo,
+    updateFx: updateFx,
+    clean: clean
 };

src/plots/geo/index.js

@@ -58,8 +58,7 @@ function handleGeoDefaults(geoLayoutIn, geoLayoutOut, coerce) {
             rangeDflt = [rot - hSpan, rot + hSpan];
         }
 
-        var range = coerce(axisName + '.range', rangeDflt);
-
+        coerce(axisName + '.range', rangeDflt);
         coerce(axisName + '.tick0');
         coerce(axisName + '.dtick', dtickDflt);