From 3551475e9b2af270003c80104b765db0ef57c185 Mon Sep 17 00:00:00 2001 From: Cameron DeCoster Date: Mon, 21 Jul 2025 14:17:35 -0600 Subject: [PATCH 1/5] Add new maps to geo assets script --- src/assets/geo_assets.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/assets/geo_assets.js b/src/assets/geo_assets.js index 633f6411f88..4157285ae13 100644 --- a/src/assets/geo_assets.js +++ b/src/assets/geo_assets.js @@ -1,22 +1,21 @@ 'use strict'; -// TODO: Remove comments from Antarctica, Oceania during new maps release PR const topojson = { africa_110m: require('../../dist/topojson/africa_110m.json'), - // antarctica_110m: require('../../dist/topojson/antarctica_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'), + 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'), + 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'), + 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'), From c4e78a8a5ab19571af5b88c58ba5c54bcbd9f192 Mon Sep 17 00:00:00 2001 From: Cameron DeCoster Date: Mon, 21 Jul 2025 14:18:23 -0600 Subject: [PATCH 2/5] Add missing PR link to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 278e49e26de..ab0036950df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ where X.Y.Z is the semver of most recent plotly.js release. with thanks to @my-tien for the contribution! ### Changed - - Switch to United Nations (coastlines, countries, land, ocean) + Natural Earth (lakes, rivers, subunits) geodata for building topojson used in geo plot + - Switch to United Nations (coastlines, countries, land, ocean) + Natural Earth (lakes, rivers, subunits) geodata for building topojson used in geo plot [[#7393](https://github.com/plotly/plotly.js/pull/7393)] - Make 'png' all caps [[#7400](https://github.com/plotly/plotly.js/pull/7400)] ### Fixed From 31fb351258937285f389c7147ec61dbbc7b79912 Mon Sep 17 00:00:00 2001 From: Cameron DeCoster Date: Mon, 21 Jul 2025 14:19:51 -0600 Subject: [PATCH 3/5] Update CDN publish script to allow referencing in 'topojsonURL' --- tasks/cdn_publish.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tasks/cdn_publish.sh b/tasks/cdn_publish.sh index 8ed5d160116..3047320dd67 100755 --- a/tasks/cdn_publish.sh +++ b/tasks/cdn_publish.sh @@ -29,13 +29,11 @@ for path in `ls $dist/plotly*`; do done # copy topojson files over to the sync folder -# NOTE: Temporarily adding the suffix '_un' to avoid overwriting the old topojson -# which some old plots might depend on -for filepath in $dist/topojson/*.json; do - f=${filepath##*/} - f=${f%.*} - cp $filepath "$sync/${f%.*}_un.json" -done +# NOTE: Temporarily syncing topojson to 'un' folder to avoid overwriting the old topojson +# which some old plots might depend on. These can be accessed by setting 'topojsonURL' to +# 'https://cdn.plot.ly/un/' in the Plotly config. +mkdir $sync/un +cp $dist/topojson/* $sync/un # list folder and files echo $sync From fbfe00f10ab3a4c0d47ccd9a8edc321a4f277afe Mon Sep 17 00:00:00 2001 From: Cameron DeCoster Date: Mon, 21 Jul 2025 14:20:16 -0600 Subject: [PATCH 4/5] Remove commented code --- topojson/bin/process_geodata.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/topojson/bin/process_geodata.mjs b/topojson/bin/process_geodata.mjs index 846c63d249d..e859caafa13 100644 --- a/topojson/bin/process_geodata.mjs +++ b/topojson/bin/process_geodata.mjs @@ -242,7 +242,6 @@ async function convertLayersToTopojson({ name, resolution }) { // Get required polygon features from UN GeoJSON const inputFilePathUNGeojson = `${inputDir}/${unFilename}.geojson`; -// await mapshaper.runCommands(`${inputFilePathUNGeojson} -filter 'stscod !== undefined' target=1 -clean target=1 -o force ${inputFilePathUNGeojson}`) const outputFilePathAntarctica50m = `${outputDirGeojson}/${unFilename}_50m/antarctica.geojson`; const outputFilePathFiji50m = `${outputDirGeojson}/${unFilename}_50m/fiji.geojson`; const outputFilePathFijiAntimeridian50m = `${outputDirGeojson}/${unFilename}_50m/fiji_antimeridian.geojson`; From 86e72f87ee5ef6d59e54c07120a2ce68d7904fc1 Mon Sep 17 00:00:00 2001 From: Cameron DeCoster Date: Mon, 21 Jul 2025 14:36:15 -0600 Subject: [PATCH 5/5] Add draftlog --- draftlogs/7481_change.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 draftlogs/7481_change.md diff --git a/draftlogs/7481_change.md b/draftlogs/7481_change.md new file mode 100644 index 00000000000..7692eab51a2 --- /dev/null +++ b/draftlogs/7481_change.md @@ -0,0 +1 @@ +- Refactor files related to UN topojson [[#7481](https://github.com/plotly/plotly.js/pull/7481)] pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy