8000 feat: Switch geodata providers by camdecoster · Pull Request #7393 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

feat: Switch geodata providers #7393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 93 commits into from
Jul 15, 2025
Merged

feat: Switch geodata providers #7393

Changes from 1 commit
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
e8d763d
Add new dev dependencies
camdecoster Mar 20, 2025
7f7b690
Add build scripts
camdecoster Mar 20, 2025
6b596c0
Update some topojson references
camdecoster Mar 20, 2025
353bf94
Add npm build scripts
camdecoster Mar 20, 2025
fc6022f
Add 'usa' config
camdecoster Mar 20, 2025
2910eea
Add clipping bounds for Antarctica
camdecoster Mar 20, 2025
5d66dad
Apply suggestions from code review
camdecoster Mar 20, 2025
3b47c67
Add geodata archive, update get_geodata script paths
camdecoster Mar 21, 2025
b434656
Switch config file to JS
camdecoster Mar 21, 2025
a4d0b21
Switch coastlines layer source
camdecoster Mar 21, 2025
e257b7b
Add Oceania clipping bounds
camdecoster Mar 21, 2025
1154ff1
Switch layer name to 'ocean'
camdecoster Mar 21, 2025
86d5b00
Update test config
camdecoster Mar 26, 2025
86f048c
Switch to UN/NE geodata hybrid
camdecoster Mar 30, 2025
ac61095
Merge remote-tracking branch 'origin/master' into cam/7334/switch-geo…
camdecoster Apr 6, 2025
f4c3d48
Fix zip/unzip of UN geojson
camdecoster Apr 7, 2025
22a8e0a
Fix saving 110m maps
camdecoster Apr 7, 2025
247f925
Update dist with new maps
camdecoster Apr 8, 2025
3cf9730
Update geo tests
camdecoster Apr 8, 2025
24e8558
Update cibuild npm script
8000 camdecoster Apr 8, 2025
b2ae532
Add draftlog
camdecoster Apr 8, 2025
85ad69c
Remove sane-topojson package
camdecoster Apr 15, 2025
b903b9f
Add small fixes
camdecoster Apr 15, 2025
e74c65c
Remove log statements
camdecoster Apr 15, 2025
33a2e00
add some mocks to blacklist
emilykl Apr 22, 2025
4868250
update baselines for new geodata
emilykl Apr 22, 2025
bce8d21
update blacklist in compare_pixels_test
emilykl Apr 22, 2025
da44084
Save UN geodata in build folder
camdecoster Apr 22, 2025
69f104e
make sure slash is added when concatenating topojson path
emilykl Apr 23, 2025
c684b72
use local topojson for image tests
emilykl Apr 23, 2025
362233a
update paths in jasmine geo_test
emilykl Apr 23, 2025
4d37b8c
filter out extra features
emilykl Apr 23, 2025
bb8377b
update image baselines for new geodata
emilykl Apr 23, 2025
6356355
Merge pull request #7406 from plotly/cam/7334/switch-geodata-provider…
emilykl Apr 23, 2025
5482adf
Filter out extra Hawaii feature during processing
camdecoster Apr 24, 2025
2710e7c
Revert "filter out extra features"
camdecoster Apr 24, 2025
b8bfea6
Adjust world rectangle to account for coordinate issues
camdecoster May 6, 2025
d6ea8ab
Fix Anarctica geometry and simplification
camdecoster May 6, 2025
3ec56ab
Fix land layer, clean up comments
camdecoster May 6, 2025
79017d5
Remove unused filter
camdecoster May 6, 2025
0f9049c
Remove turf simplify
camdecoster May 6, 2025
4a6fb9d
Update topojson
camdecoster May 6, 2025
33d3425
Filter Greenland out of Europe
camdecoster May 6, 2025
c74f711
Erase Caspian Sea
camdecoster May 6, 2025
f7cdc5f
Update topojson
camdecoster May 7, 2025
9711ef7
Update country codes for disputed territories at Egypt/Sudan border
camdecoster May 21, 2025
51a596e
Update topojson
camdecoster May 21, 2025
40968da
Merge remote-tracking branch 'origin/master' into cam/7334/switch-geo…
camdecoster Jun 4, 2025
5e7efc8
Attempt to stitch antimeridian crossing polygons
camdecoster Jun 24, 2025
9026b55
Remove rectangle geojson
camdecoster Jun 24, 2025
597ae5c
Remove unneeded library; restore old library version
camdecoster Jun 25, 2025
15dd77a
Correct polygon winding directions
camdecoster Jun 25, 2025
e385014
Update topojson
camdecoster Jun 25, 2025
d3940c6
Merge remote-tracking branch 'origin/master' into cam/7334/switch-geo…
camdecoster Jun 25, 2025
d7d7d0b
Fix merge issues with package-lock
camdecoster Jun 25, 2025
eb1e966
Update required dev dependencies again
camdecoster Jul 2, 2025
60171d7
Split out antimeridian fixes
camdecoster Jul 2, 2025
90554a2
Update topojson
camdecoster Jul 2, 2025
d836db9
Update test baseline images
camdecoster Jul 3, 2025
3ddc6e0
Update geo tests
camdecoster Jul 3, 2025
f952173
Fix comment
camdecoster Jul 3, 2025
75e9f52
Further update geo tests
camdecoster Jul 7, 2025
3a7bd66
Update geo test with values from CircleCI
camdecoster Jul 7, 2025
a6efc84
Fix linting/formatting of new JS files
camdecoster Jul 7, 2025
4f4bbfc
Merge remote-tracking branch 'origin/master' into cam/7334/switch-geo…
camdecoster Jul 7, 2025
434017f
Revert to previous version of 'd3-geo'
camdecoster Jul 7, 2025
9a4a966
Refactor helper function
camdecoster Jul 7, 2025
1f336e1
Update draftlog
camdecoster Jul 8, 2025
1bd2fc2
Update test baselines
camdecoster Jul 8, 2025
6dae5aa
Move topojson build script files
camdecoster Jul 9, 2025
665c892
Update paths
camdecoster Jul 9, 2025
ae3c471
Add topojson package files
camdecoster Jul 9, 2025
a2cce65
Add maps to topojson dist
camdecoster Jul 9, 2025
7112d33
Update library paths
camdecoster Jul 9, 2025
6e25a5f
Restore previous topojson
camdecoster Jul 9, 2025
ecd469f
Remove scripts, dependencies from package.json
camdecoster Jul 9, 2025
50377f8
Add topojson ci build comparison test
camdecoster Jul 10, 2025
601ffc9
Actually run test job in ci
camdecoster Jul 10, 2025
0f3e102
Add npm clean script
camdecoster Jul 10, 2025
9b62be0
Update path; remove comment
camdecoster Jul 10, 2025
0539623
Update package lock file
camdecoster Jul 11, 2025
fc3978c
Add default scopes for Antarctica, Oceania
camdecoster Jul 11, 2025
b050574
Clarify comment
camdecoster Jul 11, 2025
e9c16c8
Add Egypt/Sudan choropleth mock
camdecoster Jul 11, 2025
fcaef12
Add test baseline image
camdecoster Jul 11, 2025
36f5fb5
Update schema
camdecoster Jul 11, 2025
765b549
Rename image/mock to avoid bug
camdecoster Jul 11, 2025
8944398
Rename shadowed variable
camdecoster Jul 11, 2025
7410c34
Update mock to include disputed regions
camdecoster Jul 14, 2025
5b3e36c
Update CDN publish script to add '_un' suffix to topojson files
camdecoster Jul 14, 2025
9cbd6c6
Update baseline image
camdecoster Jul 14, 2025
9d2aa71
Temporarily comment out Antarctica, Oceania maps
camdecoster Jul 15, 2025
0d6b5b7
Revert unnecessary test changes
camdecoster Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update country codes for disputed territories at Egypt/Sudan border
  • Loading branch information
@camdecoster
camdecoster committed May 21, 2025
commit 9711ef72eebc1892643dbffe9e1410c6ae443802
5 changes: 4 additions & 1 deletion tasks/topojson/process_geodata.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,10 @@ const commandsAllFeaturesCommon = [
'-merge-layers target=1,antarctica force name=all_features',
// Erase Caspian Sea
`-filter 'globalid === "{BBBEF27F-A6F4-4FBC-9729-77B3A8739409}"' target=all_features + name=caspian_sea`,
'-erase source=caspian_sea target=all_features'
'-erase source=caspian_sea target=all_features',
// Handle disputed territories at Egypt/Sudan border: https://en.wikipedia.org/wiki/Egypt%E2%80%93Sudan_border
`-each 'if (globalid === "{CA12D116-7A19-41D1-9622-17C12CCC720D}") iso3cd = "XHT"'`, // Halaib Triangle
`-each 'if (globalid === "{9FD54A50-0BFB-4385-B342-1C3BDEE5ED9B}") iso3cd = "XBT"'` // Bir Tawil
]

// Process 50m UN geodata
Expand Down
0