plotly · etpinard · May 17, 2019 · May 10, 2019 · May 16, 2019 · May 16, 2019
diff --git a/dist/topojson/africa_110m.json b/dist/topojson/africa_110m.json
diff --git a/dist/topojson/africa_50m.json b/dist/topojson/africa_50m.json
diff --git a/dist/topojson/asia_110m.json b/dist/topojson/asia_110m.json
diff --git a/dist/topojson/asia_50m.json b/dist/topojson/asia_50m.json
diff --git a/dist/topojson/europe_110m.json b/dist/topojson/europe_110m.json
diff --git a/dist/topojson/europe_50m.json b/dist/topojson/europe_50m.json
diff --git a/dist/topojson/north-america_110m.json b/dist/topojson/north-america_110m.json
diff --git a/dist/topojson/north-america_50m.json b/dist/topojson/north-america_50m.json
diff --git a/dist/topojson/south-america_110m.json b/dist/topojson/south-america_110m.json
diff --git a/dist/topojson/south-america_50m.json b/dist/topojson/south-america_50m.json
diff --git a/dist/topojson/usa_110m.json b/dist/topojson/usa_110m.json
diff --git a/dist/topojson/usa_50m.json b/dist/topojson/usa_50m.json
diff --git a/dist/topojson/world_110m.json b/dist/topojson/world_110m.json
diff --git a/dist/topojson/world_50m.json b/dist/topojson/world_50m.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.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 --git a/src/lib/geo_location_utils.js b/src/lib/geo_location_utils.js
@@ -42,21 +42,16 @@ function locationToFeature(locationmode, location, features) {
 
     if(locationId) {
         if(locationmode === 'USA-states') {
-            // Filter out features south of the equator
+            // 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.
-            // As subunits from USA and Canada never conflict, filtering out features
-            // south of the equator suffices to fix https://github.com/plotly/plotly.js/issues/3779
-            //
-            // A better fix would have us add a "governing unit" properties in subunit features
-            // in the `sane-topojson` package to avoid conflicts.
             features2 = [];
             for(i = 0; i < features.length; i++) {
                 f = features[i];
-                if(f.properties && f.properties.ct && f.properties.ct[1] > 0) {
+                if(f.properties && f.properties.gu && f.properties.gu === 'USA') {
                     features2.push(f);
                 }
             }

diff --git a/tasks/util/constants.js b/tasks/util/constants.js
@@ -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'

diff --git a/test/image/baselines/geo_canadian-cites.png b/test/image/baselines/geo_canadian-cites.png
diff --git a/test/image/baselines/geo_canadian-cities.png b/test/image/baselines/geo_canadian-cities.png
diff --git a/test/image/baselines/geo_choropleth-text.png b/test/image/baselines/geo_choropleth-text.png
diff --git a/test/image/baselines/geo_country-names.png b/test/image/baselines/geo_country-names.png
diff --git a/test/image/baselines/geo_custom-colorscale.png b/test/image/baselines/geo_custom-colorscale.png
diff --git a/test/image/baselines/geo_europe-bubbles.png b/test/image/baselines/geo_europe-bubbles.png
diff --git a/test/image/baselines/geo_first.png b/test/image/baselines/geo_first.png
diff --git a/test/image/baselines/geo_orthographic.png b/test/image/baselines/geo_orthographic.png
diff --git a/test/image/baselines/geo_point-selection.png b/test/image/baselines/geo_point-selection.png
diff --git a/test/image/baselines/geo_scattergeo-out-of-usa.png b/test/image/baselines/geo_scattergeo-out-of-usa.png
diff --git a/test/image/baselines/geo_second.png b/test/image/baselines/geo_second.png
diff --git a/test/image/baselines/geo_stereographic.png b/test/image/baselines/geo_stereographic.png
diff --git a/test/image/mocks/geo_canadian-cites.json → test/image/mocks/geo_canadian-cities.json b/test/image/mocks/geo_canadian-cites.json → test/image/mocks/geo_canadian-cities.json