switch from rasterio/gdal to pyproj #58
Merged
Conversation
This file contains 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
vincentsarago
commented
Aug 17, 2021
| @@ -13,7 +13,7 @@ jobs: | |||
| runs-on: ubuntu-latest | |||
| strategy: | |||
| matrix: | |||
| python-version: [3.6, 3.7, 3.8, 3.9] | |||
| python-version: [3.7, 3.8, 3.9] | |||
There was a problem hiding this comment.
pyproj only supports >=3.7
vincentsarago
commented
Aug 17, 2021
vincentsarago
commented
Aug 17, 2021
vincentsarago
commented
Aug 17, 2021
| @@ -56,4 +56,4 @@ def register( | |||
| return TileMatrixSets({**self.tms, **new_tms}) | |||
|
|
|||
|
|
|||
| tms = TileMatrixSets(deepcopy(default_tms)) # noqa | |||
| tms = TileMatrixSets(copy(default_tms)) # noqa | |||
There was a problem hiding this comment.
deepcopy complained about the pyproj Transformer. Used copy and it worked 🤷♂️
vincentsarago
commented
Aug 17, 2021
vincentsarago
commented
Aug 17, 2021
| @@ -121,13 +124,25 @@ class TileMatrixSet(BaseModel): | |||
| wellKnownScaleSet: Optional[AnyHttpUrl] = None | |||
| boundingBox: Optional[TMSBoundingBox] | |||
| tileMatrix: List[TileMatrix] | |||
| _to_wgs84: Transformer = PrivateAttr() | |||
| _from_wgs84: Transformer = PrivateAttr() | |||
There was a problem hiding this comment.
we initialize the transformers once!
vincentsarago
commented
Aug 17, 2021
| tms = morecantile.tms.get("WebMercatorQuad") | ||
| with pytest.warns(PointOutsideTMSBounds): | ||
| xy = tms.xy(0.0, -90) | ||
| assert xy.x == float("inf") | ||
| assert xy.y == float("-inf") | ||
| assert xy.y == float("inf") |
vincentsarago
commented
Aug 19, 2021
vincentsarago
commented
Aug 19, 2021
Merged
vincentsarago
force-pushed
the
FromRasterioToPyProj
branch
from
b61b60d to
417a3c3
Compare
vincentsarago
commented
Aug 20, 2021
vincentsarago
commented
Aug 20, 2021
vincentsarago
commented
Aug 23, 2021
vincentsarago
changed the title
vincentsarago
force-pushed
the
FromRasterioToPyProj
branch
from
e0ef922 to
8860250
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
as seen in #56 and #57 we are constantly fighting with change in rasterio/gdal/proj. The main problem is that we used rasterio (which is a raster library) to access Proj C libs via GDAL. It worked ok, and we choose this to avoid mixing PROJ version used in the code base (for a long time rasterio wheels where using PROJ 6 while pyproj was already using PROJ>=7).
This PR replace any rasterio calls by pyproj.