Merge pull request #3856 from plotly/misc-geo-fixes

Miscellaneous geo fixes

Author: etpinard

Diff for: dist/topojson/africa_110m.json

@@ -107,7 +107,7 @@
     "regl-splom": "^1.0.6",
     "right-now": "^1.0.0",
     "robust-orientation": "^1.1.3",
-    "sane-topojson": "^2.0.0",
+    "sane-topojson": "^3.0.1",
     "strongly-connected-components": "^1.0.1",
     "superscript-text": "^1.0.0",
     "svg-path-sdf": "^1.1.3",

Diff for: dist/topojson/africa_50m.json

@@ -6,13 +6,11 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var countryRegex = require('country-regex');
 var Lib = require('../lib');
 
-
 // make list of all country iso3 ids from at runtime
 var countryIds = Object.keys(countryRegex);
 
@@ -22,16 +20,48 @@ var locationmodeToIdFinder = {
     'country names': countryNameToISO3
 };
 
-exports.locationToFeature = function(locationmode, location, features) {
+function countryNameToISO3(countryName) {
+    for(var i = 0; i < countryIds.length; i++) {
+        var iso3 = countryIds[i];
+        var regex = new RegExp(countryRegex[iso3]);
+
+        if(regex.test(countryName.trim().toLowerCase())) return iso3;
+    }
+
+    Lib.log('Unrecognized country name: ' + countryName + '.');
+
+    return false;
+}
+
+function locationToFeature(locationmode, location, features) {
     if(!location || typeof location !== 'string') return false;
 
-    var locationId = getLocationId(locationmode, location);
+    var locationId = locationmodeToIdFinder[locationmode](location);
+    var filteredFeatures;
+    var f, i;
 
     if(locationId) {
-        for(var i = 0; i < features.length; i++) {
-            var feature = features[i];
+        if(locationmode === 'USA-states') {
+            // Filter out features out in USA
+            //
+            // This is important as the Natural Earth files
+            // include state/provinces from USA, Canada, Australia and Brazil
+            // which have some overlay in their two-letter ids. For example,
+            // 'WA' is used for both Washington state and Western Australia.
+            filteredFeatures = [];
+            for(i = 0; i < features.length; i++) {
+                f = features[i];
+                if(f.properties && f.properties.gu && f.properties.gu === 'USA') {
+                    filteredFeatures.push(f);
+                }
+            }
+        } else {
+            filteredFeatures = features;
+        }
 
-            if(feature.id === locationId) return feature;
+        for(i = 0; i < filteredFeatures.length; i++) {
+            f = filteredFeatures[i];
+            if(f.id === locationId) return f;
         }
 
         Lib.log([
@@ -41,22 +71,8 @@ exports.locationToFeature = function(locationmode, location, features) {
     }
 
     return false;
-};
-
-function getLocationId(locationmode, location) {
-    var idFinder = locationmodeToIdFinder[locationmode];
-    return idFinder(location);
 }
 
-function countryNameToISO3(countryName) {
-    for(var i = 0; i < countryIds.length; i++) {
-        var iso3 = countryIds[i];
-        var regex = new RegExp(countryRegex[iso3]);
-
-        if(regex.test(countryName.trim().toLowerCase())) return iso3;
-    }
-
-    Lib.log('Unrecognized country name: ' + countryName + '.');
-
-    return false;
-}
+module.exports = {
+    locationToFeature: locationToFeature
+};

Diff for: dist/topojson/asia_110m.json

@@ -42,6 +42,7 @@ function Geo(opts) {
     this.topojson = null;
 
     this.projection = null;
+    this.scope = null;
     this.viewInitial = null;
     this.fitScale = null;
     this.bounds = null;
@@ -71,6 +72,18 @@ module.exports = function createGeo(opts) {
 proto.plot = function(geoCalcData, fullLayout, promises) {
     var _this = this;
     var geoLayout = fullLayout[this.id];
+
+    var needsTopojson = false;
+    for(var k in constants.layerNameToAdjective) {
+        if(k !== 'frame' && geoLayout['show' + k]) {
+            needsTopojson = true;
+            break;
+        }
+    }
+    if(!needsTopojson) {
+        return _this.update(geoCalcData, fullLayout);
+    }
+
     var topojsonNameNew = topojsonUtils.getTopojsonName(geoLayout);
 
     if(_this.topojson === null || topojsonNameNew !== _this.topojsonName) {
@@ -133,9 +146,10 @@ proto.update = function(geoCalcData, fullLayout) {
         }
     }
 
-    if(!this.viewInitial) {
+    if(!this.viewInitial || this.scope !== geoLayout.scope) {
         this.saveViewInitial(geoLayout);
     }
+    this.scope = geoLayout.scope;
 
     this.updateBaseLayers(fullLayout, geoLayout);
     this.updateDims(fullLayout, geoLayout);

Diff for: dist/topojson/asia_50m.json

@@ -8,9 +8,20 @@ var pathToImageTest = path.join(pathToRoot, 'test/image');
 var pathToDist = path.join(pathToRoot, 'dist/');
 var pathToBuild = path.join(pathToRoot, 'build/');
 
-var pathToTopojsonSrc = path.join(
-    path.dirname(require.resolve('sane-topojson')), 'dist/'
-);
+var pathToTopojsonSrc;
+try {
+    pathToTopojsonSrc = path.join(path.dirname(require.resolve('sane-topojson')), 'dist/');
+} catch(e) {
+    console.log([
+        '',
+        'WARN: Cannot resolve path to *sane-topojson* package.',
+        '  This can happen when one `npm link sane-topojson`',
+        '  and runs a command in a Docker container.',
+        '  There is nothing to worry, if you see this warning while running',
+        '  `npm run test-image`, `npm run test-export` or `npm run baseline` ;)',
+        ''
+    ].join('\n'));
+}
 
 var partialBundleNames = [
     'basic', 'cartesian', 'geo', 'gl3d', 'gl2d', 'mapbox', 'finance'