plotly · emilykl · Apr 23, 2025 · Apr 22, 2025 · Apr 22, 2025 · Apr 22, 2025
diff --git a/src/lib/geo_location_utils.js b/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;

diff --git a/src/lib/topojson_utils.js b/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) {

diff --git a/test/image/baselines/canada_geo_projections.png b/test/image/baselines/canada_geo_projections.png
diff --git a/test/image/baselines/distance_satellite.png b/test/image/baselines/distance_satellite.png
diff --git a/test/image/baselines/geo_across-antimeridian.png b/test/image/baselines/geo_across-antimeridian.png
diff --git a/test/image/baselines/geo_africa-insets.png b/test/image/baselines/geo_africa-insets.png
diff --git a/test/image/baselines/geo_aitoff-sinusoidal.png b/test/image/baselines/geo_aitoff-sinusoidal.png
diff --git a/test/image/baselines/geo_bg-color.png b/test/image/baselines/geo_bg-color.png
diff --git a/test/image/baselines/geo_big-frame.png b/test/image/baselines/geo_big-frame.png
diff --git a/test/image/baselines/geo_bubbles-colorscales.png b/test/image/baselines/geo_bubbles-colorscales.png
diff --git a/test/image/baselines/geo_bubbles-sizeref.png b/test/image/baselines/geo_bubbles-sizeref.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_centering.png b/test/image/baselines/geo_centering.png
diff --git a/test/image/baselines/geo_choropleth-legend.png b/test/image/baselines/geo_choropleth-legend.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_choropleth-usa.png b/test/image/baselines/geo_choropleth-usa.png
diff --git a/test/image/baselines/geo_choropleth-usa_legend.png b/test/image/baselines/geo_choropleth-usa_legend.png
diff --git a/test/image/baselines/geo_conic-conformal.png b/test/image/baselines/geo_conic-conformal.png
diff --git a/test/image/baselines/geo_connectgaps.png b/test/image/baselines/geo_connectgaps.png
diff --git a/test/image/baselines/geo_country-names-text-chart.png b/test/image/baselines/geo_country-names-text-chart.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_custom-geojson.png b/test/image/baselines/geo_custom-geojson.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_featureidkey.png b/test/image/baselines/geo_featureidkey.png
diff --git a/test/image/baselines/geo_fill.png b/test/image/baselines/geo_fill.png
diff --git a/test/image/baselines/geo_first.png b/test/image/baselines/geo_first.png
diff --git a/test/image/baselines/geo_fitbounds-geojson.png b/test/image/baselines/geo_fitbounds-geojson.png
diff --git a/test/image/baselines/geo_fitbounds-locations.png b/test/image/baselines/geo_fitbounds-locations.png
diff --git a/test/image/baselines/geo_fitbounds-scopes.png b/test/image/baselines/geo_fitbounds-scopes.png
diff --git a/test/image/baselines/geo_kavrayskiy7.png b/test/image/baselines/geo_kavrayskiy7.png
diff --git a/test/image/baselines/geo_lakes-and-rivers.png b/test/image/baselines/geo_lakes-and-rivers.png
diff --git a/test/image/baselines/geo_legendonly.png b/test/image/baselines/geo_legendonly.png
diff --git a/test/image/baselines/geo_miterlimit-base-layers.png b/test/image/baselines/geo_miterlimit-base-layers.png
diff --git a/test/image/baselines/geo_multi-geos.png b/test/image/baselines/geo_multi-geos.png
diff --git a/test/image/baselines/geo_multiple-usa-choropleths.png b/test/image/baselines/geo_multiple-usa-choropleths.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-locations.png b/test/image/baselines/geo_scattergeo-locations.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_skymap.png b/test/image/baselines/geo_skymap.png
diff --git a/test/image/baselines/geo_stereographic.png b/test/image/baselines/geo_stereographic.png
diff --git a/test/image/baselines/geo_text_chart_arrays.png b/test/image/baselines/geo_text_chart_arrays.png
diff --git a/test/image/baselines/geo_tick0.png b/test/image/baselines/geo_tick0.png
diff --git a/test/image/baselines/geo_usa-states-on-world-scope.png b/test/image/baselines/geo_usa-states-on-world-scope.png
diff --git a/test/image/baselines/geo_usa-states.png b/test/image/baselines/geo_usa-states.png
diff --git a/test/image/baselines/geo_visible_false_override_template.png b/test/image/baselines/geo_visible_false_override_template.png
diff --git a/test/image/baselines/geo_winkel-tripel.png b/test/image/baselines/geo_winkel-tripel.png
diff --git a/test/image/baselines/grid_subplot_types.png b/test/image/baselines/grid_subplot_types.png
diff --git a/test/image/baselines/h-colorbar_geo_multiple-usa-choropleths.png b/test/image/baselines/h-colorbar_geo_multiple-usa-choropleths.png
diff --git a/test/image/baselines/h-colorbar_geo_multiple-usa-choropleths_with-border.png b/test/image/baselines/h-colorbar_geo_multiple-usa-choropleths_with-border.png
diff --git a/test/image/baselines/marker-standoff.png b/test/image/baselines/marker-standoff.png
diff --git a/test/image/baselines/marker-standoff_auto-backoff.png b/test/image/baselines/marker-standoff_auto-backoff.png
diff --git a/test/image/baselines/marker-standoff_auto-backoff2.png b/test/image/baselines/marker-standoff_auto-backoff2.png
diff --git a/test/image/baselines/plot_types.png b/test/image/baselines/plot_types.png
diff --git a/test/image/baselines/plot_types_grid_dash.png b/test/image/baselines/plot_types_grid_dash.png
diff --git a/test/image/baselines/texttemplate_scatter.png b/test/image/baselines/texttemplate_scatter.png
diff --git a/test/image/baselines/various_geo_projections.png b/test/image/baselines/various_geo_projections.png
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
@@ -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) {

diff --git a/test/image/make_baseline.py b/test/image/make_baseline.py
@@ -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]


diff --git a/test/jasmine/tests/geo_test.js b/test/jasmine/tests/geo_test.js
@@ -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);