Merge pull request #7406 from plotly/cam/7334/switch-geodata-providers-emilykl-2

Updating baselines for new geodata

Author: emilykl

src/lib/geo_location_utils.js

@@ -62,7 +62,7 @@ function locationToFeature(locationmode, location, features) {
 
         for(i = 0; i < filteredFeatures.length; i++) {
             f = filteredFeatures[i];
-            if(f.id === locationId) return f;
+            if(f.id === locationId && isMainCountryFeature(f)) return f;
         }
 
         loggers.log([
@@ -74,6 +74,18 @@ function locationToFeature(locationmode, location, features) {
     return false;
 }
 
+function isMainCountryFeature(feature) {
+    // Returns false for certain features which are not the main region of their country
+    if(feature.id === 'USA') {
+        if(feature.properties && feature.properties.ct && feature.properties.ct[0] == -155.5 &&
+            feature.properties.ct[1] == 19.6) {
+            // Hawaii
+            return false;
+        }
+    }
+    return true;
+}
+
 function feature2polygons(feature) {
     var geometry = feature.geometry;
     var coords = geometry.coordinates;

src/lib/topojson_utils.js

@@ -13,7 +13,11 @@ topojsonUtils.getTopojsonName = function(geoLayout) {
 };
 
 topojsonUtils.getTopojsonPath = function(topojsonURL, topojsonName) {
-    return topojsonURL + topojsonName + '.json';
+    if (topojsonURL.endsWith('/')) {
+        return topojsonURL + topojsonName + '.json';
+    } else {
+        return topojsonURL + '/' + topojsonName + '.json';
+    }
 };
 
 topojsonUtils.getTopojsonFeatures = function(trace, topojson) {

test/image/baselines/canada_geo_projections.png

@@ -63,6 +63,10 @@ argv._.forEach(function(pattern) {
 var blacklist = [
     'map_angles',
     'map_stamen-style',
+    'map_predefined-styles2',
+    'map_scattercluster',
+    'map_fonts-supported-open-sans',
+    'map_fonts-supported-open-sans-weight',
 ];
 
 if(virtualWebgl) {

test/image/baselines/distance_satellite.png

@@ -53,6 +53,7 @@
     plotlyjs = plotlyjs_with_virtual_webgl
 
 pio.kaleido.scope.plotlyjs = plotlyjs
+pio.kaleido.scope.topojson = "file://" + os.path.join(root, 'dist', 'topojson')
 pio.templates.default = 'none'
 
 ALL_MOCKS = [os.path.splitext(a)[0] for a in os.listdir(dirIn) if a.endswith('.json')]
@@ -66,6 +67,10 @@
 # unable to generate baselines for the following mocks
 blacklist = [
     'map_stamen-style',
+    'map_predefined-styles2',
+    'map_scattercluster',
+    'map_fonts-supported-open-sans',
+    'map_fonts-supported-open-sans-weight',
 ]
 allNames = [a for a in allNames if a not in blacklist]
 

test/image/baselines/geo_across-antimeridian.png

@@ -2759,10 +2759,10 @@ describe('Test geo interactions update marker angles:', function() {
         })
         .then(function() {
             newPath = getPath();
-            expect(newPath).toEqual('M0,0L18.22327727600463,8.240883770679762L19.586810955756498,-4.044358612123453Z');
+            expect(newPath).toEqual('M0,0L18.223277273610172,8.24088377597469L19.58681095693162,-4.04435860643234Z');
 
             expect(newPath).not.toEqual(initialPath);
-            expect(newPath).toEqual('M0,0L18.22327727600463,8.240883770679762L19.586810955756498,-4.044358612123453Z');
+            expect(newPath).toEqual('M0,0L18.223277273610172,8.24088377597469L19.58681095693162,-4.04435860643234Z');
             expect(initialPath).toEqual('M0,0L-1.5100144203478312,19.942914943667123L10.500523963798084,17.021721313830223Z');
         })
         .then(done, done.fail);