Skip to content
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.

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

fix world_map demo with new link #864

Merged
merged 4 commits into from
May 4, 2023
Merged

fix world_map demo with new link #864

merged 4 commits into from
May 4, 2023

Conversation

homosapien-lcy
Copy link
Contributor

The chaco/examples/demo/world_map demo example is broken due to the original image link in the example has expired. This PR replaces it with a new example.

@dpinte
Copy link
Member

dpinte commented Mar 30, 2023

Can you add a comment to the example with the attribution of the image copyright. From wikimedia, it sounds like "Strebe, Public domain, via Wikimedia Commons" would be good and maybe a link to the page (https://commons.wikimedia.org/wiki/File:Winkel_triple_projection_SW.jpg)

@@ -34,7 +38,7 @@ class WorldMapPlot(HasTraits):

# The URL which points to the world map image to be downloaded
image_url = Str(
"http://eoimages.gsfc.nasa.gov/ve//2433/land_shallow_topo_2048.jpg"
"https://upload.wikimedia.org/wikipedia/commons/9/91/Winkel_triple_projection_SW.jpg"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses a different projection, and so the plotted points are not correct (eg. Austin will not be plotted correctly).

The original image is this one in Wikimedia: https://commons.wikimedia.org/wiki/File:Land_shallow_topo_2048.jpg

So this URL may be the right one to use (although it is very high resolution): https://upload.wikimedia.org/wikipedia/commons/9/91/Land_shallow_topo_2048.jpg

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, just changed to "https://eoimages.gsfc.nasa.gov/images/imagerecords/57000/57752/land_shallow_topo_2048.jpg" as you proposed. I assume we don't need a copyright header since it's the same NASA image as before?

Copy link
Member

@dpinte dpinte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@homosapien-lcy
Copy link
Contributor Author

So, is this issue ready for close?

Copy link
Contributor

@corranwebster corranwebster left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@corranwebster
Copy link
Contributor

corranwebster commented Apr 21, 2023

You might want to merge in main to check that everything passes. Sorry, thought this was Enable repo.

@homosapien-lcy
Copy link
Contributor Author

Somehow I still cannot merge this due to CI test error (which comes from MacOS RuntimeError: NumPy was built with baseline optimizations:
(SSE SSE2 SSE3 SSSE3 SSE41 POPCNT SSE42 AVX F16C AVX2) but your machine doesn't support:
(AVX2).), I think this is an issue we can pass for now?

@corranwebster
Copy link
Contributor

Somehow I still cannot merge this due to CI test error (which comes from MacOS RuntimeError: NumPy was built with baseline optimizations:
(SSE SSE2 SSE3 SSSE3 SSE41 POPCNT SSE42 AVX F16C AVX2) but your machine doesn't support:
(AVX2).), I think this is an issue we can pass for now?

Yes, this is due to a change in the EDM mac numpy build. We need to turn off some of the mac tests.

@corranwebster
Copy link
Contributor

I've made the MacOS tests no longer required, so this should be able to be merged despite the failure.

@corranwebster corranwebster merged commit 4f2f1f8 into main May 4, 2023
@corranwebster corranwebster deleted the world_map_demo_fix branch May 4, 2023 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants