Update to calliope v0.7.0dev5 #17
Conversation
There was a problem hiding this comment.
Can you at least give a one-liner description of the changes in geo.py, i.e. get_geo_data? This seems to go beyond fixing #12?
src/calligraph/geo.py
Outdated
| @@ -9,8 +11,8 @@ | |||
| from calligraph.core import filter_selectors | |||
|
|
|||
| # Transform from Web Mercator to Lat/Lon | |||
| MERCATOR_TO_LATLON = Transformer.from_crs("EPSG:3857", "EPSG:4326") | |||
| LATLON_TO_MERCATOR = Transformer.from_crs("EPSG:4326", "EPSG:3857") | |||
| MERCATOR_TO_LATLON = Transformer.from_crs("EPSG:3857", "EPSG:4326", always_xy=True) | |||
There was a problem hiding this comment.
This isn't used, so better to remove it until it's actually needed:
| MERCATOR_TO_LATLON = Transformer.from_crs("EPSG:3857", "EPSG:4326", always_xy=True) |
| MERCATOR_TO_LATLON = Transformer.from_crs("EPSG:3857", "EPSG:4326") | ||
| LATLON_TO_MERCATOR = Transformer.from_crs("EPSG:4326", "EPSG:3857") | ||
| MERCATOR_TO_LATLON = Transformer.from_crs("EPSG:3857", "EPSG:4326", always_xy=True) | ||
| LONLAT_TO_MERCATOR = Transformer.from_crs("EPSG:4326", "EPSG:3857", always_xy=True) |
There was a problem hiding this comment.
Why this change from LATLON to LONLAT? Is there an issue with the code as it stands?
There was a problem hiding this comment.
LON -> x and LAT -> y, so you convert (lon, lat) to (x,y)and vice versa. Should be MERCATOR_TO_LONLAT too, actually.
This was causing an issue because it was doing (lat, lon) to (x, y) which geopandas/proj was getting confused by. I'll need to remind myself exactly how, it was 2 months ago. Should have left a comment ;)
Closes #12
Fixes #11
Update to latest dev version of Calliope v0.7.