feat: Switch geodata providers #7393
Switch to UN/NE geodata hybrid
Refactor to simplify scripts Switch to UN/NE geodata hybrid Save UN geodata to archive Remove extra info from topojson Add centroids to geojson Use 'simplify' to create 110m maps
- Loading branch information
commit 86f048c0d8c4f960e47267000afe9fe3c2aff1c4
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,153 +1,111 @@ | ||
| const config = { | ||
| resolutions: [50, 110], | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. The 110m maps are a simplified version of the 50m maps. I haven't been able to get any confirmation as to what the UN data resolution actually is, so these labels aren't necessarily correct. In absence of a better solution, I left them as is. There was a problem hiding this comment. Noting that the topojson files are overwritten on the CDN during the release process here: plotly.js/tasks/cdn_publish.sh Line 32 in 5e2163b this PR could have sudden impact on users using old and new versions. Is that what we really want? Or should we rename new topojson files to avoid this issue? cc: @gvwilson @emilykl @ndrezn @alexcjohnson |
||
| scopes: [ | ||
| { | ||
| name: 'africa', | ||
| specs: { | ||
| filter: 'georeg === "AFR"', | ||
| bounds: [-30, -50, 60, 50] | ||
| } | ||
| }, | ||
| { | ||
| name: 'antarctica', | ||
| specs: { | ||
| filter: 'georeg === "ANT"', | ||
| bounds: [-180, -90, 180, -50] | ||
| } | ||
| }, | ||
| { | ||
| name: 'asia', | ||
| specs: { | ||
| filter: 'georeg === "ASI"', | ||
| bounds: [15, -90, 180, 85] | ||
| } | ||
| }, | ||
| { | ||
| name: 'europe', | ||
| specs: { | ||
| filter: 'georeg === "EUR"', | ||
| bounds: [-30, 0, 60, 90] | ||
| } | ||
| }, | ||
| { | ||
| name: 'north-america', | ||
| specs: { | ||
| filter: 'subreg === "Northern America" || ["Central America", "Caribbean"].includes(intreg)', | ||
| bounds: [-180, 0, -45, 85] | ||
| } | ||
| }, | ||
| { | ||
| name: 'oceania', | ||
| specs: { | ||
| filter: 'georeg === "OCE"', | ||
| bounds: [-180, -50, 180, 25] | ||
| } | ||
| }, | ||
| { | ||
| name: 'south-america', | ||
| specs: { | ||
| filter: 'intreg === "South America"', | ||
| bounds: [-100, -70, -30, 25] | ||
| } | ||
| }, | ||
| { | ||
| name: 'usa', | ||
| specs: { | ||
| filter: 'iso3cd === "USA" && ![4, undefined].includes(stscod)', | ||
| bounds: [-180, 0, -45, 85] | ||
| } | ||
| }, | ||
| { | ||
| name: 'world', | ||
| specs: { | ||
| filter: '', | ||
| bounds: [] | ||
| } | ||
| } | ||
| ], | ||
| outputDirGeojson: './build/geodata/geojson', | ||
| outputDirTopojson: './dist/topojson', | ||
| inputDir: './build/geodata', | ||
| vectors: { | ||
| // 'coastlines', 'countries', and 'land' are derived from UN geodata | ||
| ocean: 'ocean', | ||
| lakes: 'lakes', | ||
| rivers: 'rivers_lake_centerlines', | ||
| subunits: 'admin_1_states_provinces_lakes' | ||
| }, | ||
| layers: { | ||
| coastlines: 'land', | ||
| countries: 'countries', | ||
| ocean: 'land', | ||
| lakes: 'lakes', | ||
| land: 'land', | ||
| rivers: 'rivers_lake_centerlines', | ||
| subunits: 'admin_1_states_provinces_lakes' | ||
| }, | ||
| unFilename: 'un_geodata_simplified', | ||
| unDownloadUrl: 'https://geoportal.un.org/arcgis/sharing/rest/content/items/d7caaff3ef4b4f7c82689b7c4694ad92/data', | ||
| filters: { | ||
| countries: 'stscod !== undefined', | ||
| land: [ | ||
| '{839C9589-44D9-4BD5-A681-13E10ED03C5E}', // AME | ||
| '{2EE1B4A5-9C3F-445C-A1AB-399715463785}', // ANT | ||
| '{3D11547B-94D9-42C9-B849-14B389FE5F7F}', // OCE | ||
| '{32DB79BE-0D53-46BD-995F-EBE7C30ED6B6}', // AFR | ||
| '{3F3547E7-C7FB-4347-9D80-575C6485FD2E}', // EUR | ||
| '{4351AA38-B383-44BF-8341-720DD74872B4}' // ASI | ||
| ] | ||
| .map((id) => `globalid === "${id}"`) | ||
| .join(' || '), | ||
| subunits: ['AUS', 'BRA', 'CAN', 'USA'].map((id) => `adm0_a3 === "${id}"`).join(' || ') | ||
| } | ||
| }; | ||
|
|
||
| export const getNEFilename = ({ resolution, source }) => `ne_${resolution}m_${source}`; | ||
|
|
||
| export function getNEDownloadUrl({ resolution, vector: { source, type } }) { | ||
| return `https://naciscdn.org/naturalearth/${resolution}m/${type}/${getNEFilename({ resolution, source })}.zip`; | ||
| } | ||
|
|
||
| export default config; | ||
Binary file not shown.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.