Sep 11, 2025 · Sep 9, 2025 · Sep 9, 2025 · Sep 9, 2025 · Sep 10, 2025 · Sep 10, 2025
diff --git a/biome.json b/biome.json
 "**/test/**",
 "**/tasks/**",
 "**/devtools/**",
 "**/topojson/**",
 "!**/test/plot-schema.json",
 "!**/dist",
 "!**/stackgl_modules",
 "noVar":"off",
 "noConsole": {"level":"off","options": {"allow": ["log"] } }
      }
    },
 "includes": [
 "**",
 "!**/stackgl_modules",
 "!**/node_modules",
 "!**/dist",
 "!**/build",
 "!**/tasks/test_amdefine.js",
 "!**/tasks/test_requirejs.js",
 "!**/test/jasmine/assets/jquery-1.8.3.min.js"
    ]
    }
  },
 "javascript": {
 "globals": [
diff --git a/draftlogs/7555_fix.md b/draftlogs/7555_fix.md
 - Fix cropping of subunits in USA topojson, clean up land and coastlines layers for all topojson [#7555](https://github.com/plotly/plotly.js/pull/7555)
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/topojson/bin/process_geodata.mjs b/topojson/bin/process_geodata.mjs
    const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/land.geojson`;
    const commands = [
        inputFilePath,
        '-dissolve',
        '-dissolve2',
        bounds.length ? `-clip bbox=${bounds.join(',')}` : '',
        `-o ${outputFilePath}`
    ].join(' ');
 }

 async function createSubunitsLayer({ name, resolution, source }) {
    const filter = ['AUS', 'BRA', 'CAN', 'USA'].map((id) => `adm0_a3 === "${id}"`).join(' || ');
    // Only include USA for 'usa' scope since the UN and NE borders don't match exactly and slivers of Canada creep in
    const filter = (name === 'usa' ? ['USA'] : ['AUS', 'BRA', 'CAN', 'USA'])
        .map((id) => `adm0_a3 === "${id}"`)
        .join(' || ');
    const inputFilePath = `${outputDirGeojson}/${getNEFilename({ resolution, source })}.geojson`;
    const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/subunits.geojson`;
    const commands = [
    `-each 'if (globalid === "{9FD54A50-0BFB-4385-B342-1C3BDEE5ED9B}") iso3cd = "XBT"'`, // Bir Tawil
    `-each 'if (iso3cd) iso3cd = iso3cd.toUpperCase()'`,
    `-filter '${filters.countries}'`,
    '-clean',
    // Snap polygons to clean up land, coastlines layers
    '-clean snap-interval=0.000125',
    `-o ${outputFilePathCountries50m}`
 ].join(' ');
 await mapshaper.runCommands(commandsCountries50m);
 const outputFilePathCountries110m = `${outputDirGeojson}/${unFilename}_110m/countries.geojson`;
 const commandsCountries110m = [
    inputFilePathCountries110m,
    '-simplify 20%',
    // Use 'snap-interval' to fix alignment issues with continental USA, Alaska, and Mexico
    '-clean snap-interval=0.015',
    '-simplify 21%',
    '-clean',
    `-o ${outputFilePathCountries110m}`
 ].join(' ');
 await mapshaper.runCommands(commandsCountries110m);
diff --git a/topojson/dist/africa_110m.json b/topojson/dist/africa_110m.json
diff --git a/topojson/dist/africa_50m.json b/topojson/dist/africa_50m.json
diff --git a/topojson/dist/antarctica_110m.json b/topojson/dist/antarctica_110m.json
diff --git a/topojson/dist/antarctica_50m.json b/topojson/dist/antarctica_50m.json
diff --git a/topojson/dist/asia_110m.json b/topojson/dist/asia_110m.json
diff --git a/topojson/dist/asia_50m.json b/topojson/dist/asia_50m.json
diff --git a/topojson/dist/europe_110m.json b/topojson/dist/europe_110m.json
diff --git a/topojson/dist/europe_50m.json b/topojson/dist/europe_50m.json
diff --git a/topojson/dist/north-america_110m.json b/topojson/dist/north-america_110m.json
diff --git a/topojson/dist/north-america_50m.json b/topojson/dist/north-america_50m.json
diff --git a/topojson/dist/oceania_110m.json b/topojson/dist/oceania_110m.json
diff --git a/topojson/dist/oceania_50m.json b/topojson/dist/oceania_50m.json
diff --git a/topojson/dist/south-america_110m.json b/topojson/dist/south-america_110m.json
diff --git a/topojson/dist/south-america_50m.json b/topojson/dist/south-america_50m.json
diff --git a/topojson/dist/usa_110m.json b/topojson/dist/usa_110m.json
diff --git a/topojson/dist/usa_50m.json b/topojson/dist/usa_50m.json
diff --git a/topojson/dist/world_110m.json b/topojson/dist/world_110m.json
diff --git a/topojson/dist/world_50m.json b/topojson/dist/world_50m.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@
		"/test/",
		"/tasks/",
		"/devtools/",
		"/topojson/",
		"!**/test/plot-schema.json",
		"!**/dist",
		"!**/stackgl_modules",
Expand DownExpand Up		@@ -88,17 +89,7 @@
		"noVar":"off",
		"noConsole": {"level":"off","options": {"allow": ["log"] } }
		}
		},
		"includes": [
Copy link Contributor emilyklSep 11, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. @camdecoster What is the effect of this config change? Copy link ContributorAuthor camdecosterSep 11, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. You can override the global includes using this one. It included all the same stuff as the global one, so I removed it as redundant.
		"**",
		"!**/stackgl_modules",
		"!**/node_modules",
		"!**/dist",
		"!**/build",
		"!**/tasks/test_amdefine.js",
		"!**/tasks/test_requirejs.js",
		"!**/test/jasmine/assets/jquery-1.8.3.min.js"
		]
		}
		},
		"javascript": {
		"globals": [
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Fix cropping of subunits in USA topojson, clean up land and coastlines layers for all topojson [#7555](https://github.com/plotly/plotly.js/pull/7555)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -142,7 +142,7 @@ async function createLandLayer({ bounds, name, resolution, source }) {
		const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/land.geojson`;
		const commands = [
		inputFilePath,
		'-dissolve',
		'-dissolve2',
		bounds.length ? `-clip bbox=${bounds.join(',')}` : '',
		`-o ${outputFilePath}`
		].join(' ');
Expand DownExpand Up		@@ -200,7 +200,10 @@ async function createLakesLayer({ name, resolution, source }) {
		}

		async function createSubunitsLayer({ name, resolution, source }) {
		const filter = ['AUS', 'BRA', 'CAN', 'USA'].map((id) => `adm0_a3 === "${id}"`).join(' \|\| ');
		// Only include USA for 'usa' scope since the UN and NE borders don't match exactly and slivers of Canada creep in
Copy link Contributor emilyklSep 11, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. slivers of Canada creep in 😄
		const filter = (name === 'usa' ? ['USA'] : ['AUS', 'BRA', 'CAN', 'USA'])
		.map((id) => `adm0_a3 === "${id}"`)
		.join(' \|\| ');
		const inputFilePath = `${outputDirGeojson}/${getNEFilename({ resolution, source })}.geojson`;
		const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/subunits.geojson`;
		const commands = [
Expand DownExpand Up		@@ -365,7 +368,8 @@ const commandsCountries50m = [
		`-each 'if (globalid === "{9FD54A50-0BFB-4385-B342-1C3BDEE5ED9B}") iso3cd = "XBT"'`, // Bir Tawil
		`-each 'if (iso3cd) iso3cd = iso3cd.toUpperCase()'`,
		`-filter '${filters.countries}'`,
		'-clean',
		// Snap polygons to clean up land, coastlines layers
		'-clean snap-interval=0.000125',
		`-o ${outputFilePathCountries50m}`
		].join(' ');
		await mapshaper.runCommands(commandsCountries50m);
Expand All		@@ -384,9 +388,8 @@ const inputFilePathCountries110m = outputFilePathCountries50m;
		const outputFilePathCountries110m = `${outputDirGeojson}/${unFilename}_110m/countries.geojson`;
		const commandsCountries110m = [
		inputFilePathCountries110m,
		'-simplify 20%',
		// Use 'snap-interval' to fix alignment issues with continental USA, Alaska, and Mexico
		'-clean snap-interval=0.015',
		'-simplify 21%',
		'-clean',
		`-o ${outputFilePathCountries110m}`
		].join(' ');
		await mapshaper.runCommands(commandsCountries110m);
Expand Down