plotly · camdecoster · Mar 20, 2025 · Mar 20, 2025 · Mar 20, 2025 · Mar 20, 2025
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -483,11 +483,32 @@ jobs:
           name: Bundle bundle-stackgl/index.js
           command: cd stackgl_modules && cp index.js INDEX.js && npm run bundle-stackgl
       - run:
-          name: Test stackgl_modules/index.js diff - If failed please remember this file in auto generated and you should not modify it directly until a dependeny change. To suggest changes please submit pull request to the relevant dependency.
+          name: Test stackgl_modules/index.js diff - If failed please remember this file in auto generated and you should not modify it directly until a dependency change. To suggest changes please submit pull request to the relevant dependency.
           command: diff --unified --color stackgl_modules/INDEX.js stackgl_modules/index.js
       - store_artifacts:
           path: stackgl_modules/index.js
           destination: stackgl_modules/index.js
+
+  test-topojson-build:
+    docker:
+      - image: cimg/node:18.20.4
+    working_directory: ~/plotly.js
+    steps:
+      - checkout
+      - run:
+          name: Set up build environment
+          command: cd topojson && npm ci
+      - run:
+          name: Build topojson
+          command: cd topojson && mv dist dist_backup && npm run build
+      - run:
+          name: Compare existing files with newly built files. Any difference is a failure. A failure might mean that the source data changed.
+          command: diff -qr topojson/dist topojson/dist_backup
+      - run:
+          name: Compress artifacts
+          command: tar -cvzf topojson.tar topojson/dist
+      - store_artifacts:
+          path: topojson.tar
 
 workflows:
   version: 2
@@ -560,3 +581,5 @@ workflows:
       - publish-dist-node-v22
 
       - test-stackgl-bundle
+
+      - test-topojson-build
diff --git a/devtools/test_dashboard/devtools.js b/devtools/test_dashboard/devtools.js
@@ -17,8 +17,7 @@ var Tabs = {
         Plotly.setPlotConfig({
 
             // use local topojson files
-            topojsonURL: '../../node_modules/sane-topojson/dist/',
-
+            topojsonURL: "../../topojson/dist",
             // register mapbox access token
             // run `npm run preset` if you haven't yet
             mapboxAccessToken: credentials.MAPBOX_ACCESS_TOKEN,
@@ -268,4 +267,3 @@ function handleOnLoad() {
     Tabs.setPlotConfig();
     plotFromHash();
 }
-
diff --git a/draftlogs/7393_change.md b/draftlogs/7393_change.md
@@ -0,0 +1 @@
+- Switch to United Nations (coastlines, countries, land, ocean) + Natural Earth (lakes, rivers, subunits) geodata for building topojson used in geo plot
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -72,6 +72,7 @@
     "@plotly/d3-sankey": "0.7.2",
     "@plotly/d3-sankey-circular": "0.33.1",
     "@plotly/mapbox-gl": "1.13.4",
+    "@plotly/regl": "^2.1.2",
     "@turf/area": "^7.1.0",
     "@turf/bbox": "^7.1.0",
     "@turf/centroid": "^7.1.0",
@@ -105,7 +106,6 @@
     "point-in-polygon": "^1.1.0",
     "polybooljs": "^1.2.2",
     "probe-image-size": "^7.2.3",
-    "@plotly/regl": "^2.1.2",
     "regl-error2d": "^2.0.12",
     "regl-line2d": "^3.1.3",
     "regl-scatter2d": "^3.3.1",
@@ -121,6 +121,8 @@
   },
   "devDependencies": {
     "@biomejs/biome": "1.8.3",
+    "@plotly/mathjax-v2": "npm:[email protected]",
+    "@plotly/mathjax-v3": "npm:mathjax@^3.2.2",
     "amdefine": "^1.0.1",
     "assert": "^2.1.0",
     "browserify-transform-tools": "^1.7.0",
@@ -160,8 +162,6 @@
     "karma-viewport": "1.0.2",
     "lodash": "^4.17.21",
     "madge": "^8.0.0",
-    "@plotly/mathjax-v2": "npm:[email protected]",
-    "@plotly/mathjax-v3": "npm:mathjax@^3.2.2",
     "minify-stream": "^2.1.0",
     "npm-link-check": "^5.0.1",
     "open": "^8.4.2",
@@ -171,7 +171,6 @@
     "raw-loader": "^4.0.2",
     "read-last-lines": "^1.8.0",
     "run-series": "^1.1.9",
-    "sane-topojson": "^4.0.0",
     "sass": "^1.78.0",
     "stream-browserify": "^3.0.0",
     "style-loader": "^4.0.0",

diff --git a/src/assets/geo_assets.js b/src/assets/geo_assets.js
@@ -1,8 +1,27 @@
 'use strict';
 
-var saneTopojson = require('sane-topojson');
+const topojson = {
+  africa_110m: require('../../dist/topojson/africa_110m.json'),
+  antarctica_110m: require('../../dist/topojson/antarctica_110m.json'),
+  asia_110m: require('../../dist/topojson/asia_110m.json'),
+  europe_110m: require('../../dist/topojson/europe_110m.json'),
+  'north-america_110m': require('../../dist/topojson/north-america_110m.json'),
+  oceania_110m: require('../../dist/topojson/oceania_110m.json'),
+  'south-america_110m': require('../../dist/topojson/south-america_110m.json'),
+  usa_110m: require('../../dist/topojson/usa_110m.json'),
+  world_110m: require('../../dist/topojson/world_110m.json'),
+  africa_50m: require('../../dist/topojson/africa_50m.json'),
+  antarctica_50m: require('../../dist/topojson/antarctica_50m.json'),
+  asia_50m: require('../../dist/topojson/asia_50m.json'),
+  europe_50m: require('../../dist/topojson/europe_50m.json'),
+  'north-america_50m': require('../../dist/topojson/north-america_50m.json'),
+  oceania_50m: require('../../dist/topojson/oceania_50m.json'),
+  'south-america_50m': require('../../dist/topojson/south-america_50m.json'),
+  usa_50m: require('../../dist/topojson/usa_50m.json'),
+  world_50m: require('../../dist/topojson/world_50m.json'),
+}
 
-
-exports.version = require('../version').version;
-
-exports.topojson = saneTopojson;
+module.exports = {
+  topojson,
-  topojson,
+  topojson: topojson,
-  topojson,
+  topojson: topojson,
+  version: require('../version').version
+}
diff --git a/src/lib/topojson_utils.js b/src/lib/topojson_utils.js
@@ -13,7 +13,9 @@ topojsonUtils.getTopojsonName = function(geoLayout) {
 };
 
 topojsonUtils.getTopojsonPath = function(topojsonURL, topojsonName) {
-    return topojsonURL + topojsonName + '.json';
+    topojsonURL += topojsonURL.endsWith('/') ? '' : '/';
+
+    return `${topojsonURL}${topojsonName}.json`;
 };
 
 topojsonUtils.getTopojsonFeatures = function(trace, topojson) {

diff --git a/src/plots/geo/constants.js b/src/plots/geo/constants.js
@@ -185,7 +185,19 @@ exports.scopeDefaults = {
         lataxisRange: [-60, 15],
         projType: 'mercator',
         projRotate: [0, 0, 0]
-    }
+    },
+    antarctica: {
+        lonaxisRange: [-180, 180],
+        lataxisRange: [-90, -60],
+        projType: 'equirectangular',
+        projRotate: [0, 0, 0]
+    },
+    oceania: {
+        lonaxisRange: [-180, 180],
+        lataxisRange: [-50, 25],
+        projType: 'equirectangular',
+        projRotate: [0, 0, 0]
+    },
 };
 
 // angular pad to avoid rounding error around clip angles

diff --git a/tasks/preprocess.js b/tasks/preprocess.js
@@ -73,7 +73,6 @@ function writeLibFiles(obj) {
     }
 }
 
-// copy topojson files from sane-topojson to dist/
 function copyTopojsonFiles() {
     fs.copy(
         constants.pathToTopojsonSrc,

diff --git a/tasks/util/constants.js b/tasks/util/constants.js
@@ -24,20 +24,7 @@ var strictIndex = fs.readFileSync(pathToPlotlyStrict, 'utf-8');
 var allTraces = fs.readdirSync(path.join(pathToSrc, 'traces'))
     .filter(startsWithLowerCase);
 
-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 pathToTopojsonSrc = path.join(pathToRoot, 'topojson/dist');
 
 var partialBundleNames = [
     'basic', 'cartesian', 'geo', 'gl3d', 'gl2d', 'mapbox', 'finance', 'strict'

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_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_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/baselines/zz-geo_choropleth-egypt-sudan.png b/test/image/baselines/zz-geo_choropleth-egypt-sudan.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, 'topojson', 'dist')
 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/image/mocks/zz-geo_choropleth-egypt-sudan.json b/test/image/mocks/zz-geo_choropleth-egypt-sudan.json
@@ -0,0 +1,35 @@
+{
+ "data": [
+    {
+   "type": "choropleth",
+   "name": "Egypt",
+   "locations": ["EGY"],
+   "z": [1],
+   "colorscale": [[0, "orange"], [1, "orange"]],
+   "showscale": false,
+   "showlegend": true
+  },
+  {
+   "type": "choropleth",
+   "name": "Sudan",
+   "locations": ["SDN"],
+   "z": [1],
+   "colorscale": [[0, "blue"], [1, "blue"]],
+   "showscale": false,
+   "showlegend": true
+  }
+ ],
+ "layout": {
+  "geo": {
+   "projection": {
+    "rotation": {
+     "lon": 30,
+     "lat": 20
+    },
+    "scale": 7
+   }
+  },
+  "width": 800,
+  "height": 600
+ }
+}
diff --git a/test/jasmine/karma.conf.js b/test/jasmine/karma.conf.js
@@ -118,7 +118,7 @@ if(isFullSuite) {
 }
 
 var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');
-var pathToSaneTopojsonDist = path.join(__dirname, '..', '..', 'node_modules', 'sane-topojson', 'dist');
+var pathToTopojsonDist = path.join(__dirname, '..', '..', 'topojson', 'dist');
 var pathToMathJax2 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v2');
 var pathToMathJax3 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v3');
 var pathToVirtualWebgl = path.join(__dirname, '..', '..', 'node_modules', 'virtual-webgl', 'src', 'virtual-webgl.js');
@@ -196,8 +196,7 @@ func.defaultConfig = {
         // more info: http://karma-runner.github.io/3.0/config/files.html
         {pattern: pathToMathJax2 + '/**', included: false, watched: false, served: true},
         {pattern: pathToMathJax3 + '/**', included: false, watched: false, served: true},
-        // available to fetch from /base/node_modules/sane-topojson/dist/
-        {pattern: pathToSaneTopojsonDist + '/**', included: false, watched: false, served: true}
+        {pattern: pathToTopojsonDist + '/**', included: false, watched: false, served: true}
     ],
 
     // list of files / pattern to exclude
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Switch to United Nations (coastlines, countries, land, ocean) + Natural Earth (lakes, rivers, subunits) geodata for building topojson used in geo plot