Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
py_tools_ds
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Daniel Scheffler
py_tools_ds
Commits
3ee2314c
Commit
3ee2314c
authored
Aug 26, 2020
by
Daniel Scheffler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed prj_equal for pyproj<2.5.
Signed-off-by:
Daniel Scheffler
<
danschef@gfz-potsdam.de
>
parent
9fe3cbef
Pipeline
#11903
failed with stage
in 12 minutes and 31 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
py_tools_ds/geo/projection.py
py_tools_ds/geo/projection.py
+9
-3
No files found.
py_tools_ds/geo/projection.py
View file @
3ee2314c
...
...
@@ -85,10 +85,16 @@ def prj_equal(prj1, prj2):
if
prj1
is
None
and
prj2
is
None
or
prj1
==
prj2
:
return
True
else
:
crs1
=
CRS
.
from_user_input
(
prj1
)
crs2
=
CRS
.
from_user_input
(
prj2
)
from
pyproj
import
__version__
as
ver
if
ver
.
startswith
(
'2'
)
and
int
(
ver
.
split
(
'.'
)[
1
])
>=
5
:
# CRS.equals was added in pyproj 2.5 which does not exist for Python 2.7 in conda-forge channel
crs1
=
CRS
.
from_user_input
(
prj1
)
crs2
=
CRS
.
from_user_input
(
prj2
)
return
crs1
.
equals
(
crs2
)
return
crs1
.
equals
(
crs2
)
else
:
return
get_proj4info
(
proj
=
prj1
)
==
get_proj4info
(
proj
=
prj2
)
def
isProjectedOrGeographic
(
prj
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment