Thanks to visit codestin.com
Credit goes to github.com

Skip to content

add pygeos-tolerant fails for the module #188

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
ljwolf merged 2 commits into from
Jul 27, 2021
Merged

add pygeos-tolerant fails for the module #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c463b91
add pygeos-tolerant fails for the module
ljwolf Jul 27, 2021
56dd511
also add try/except outside of cast
ljwolf Jul 27, 2021
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
2 changes: 1 addition & 1 deletion esda/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2.4.0"
__version__ = "2.4.1"
"""
:mod:`esda` --- Exploratory Spatial Data Analysis
=================================================
Expand Down
14 changes: 13 additions & 1 deletion esda/map_comparison.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import numpy, pygeos, pandas, geopandas
import numpy, pandas
from scipy.special import entr

try:
import pygeos
except (ImportError, ModuleNotFoundError):
pass # gets handled in the _cast function.

# from nowosad and stepinski
# https://doi.org/10.1080/13658816.2018.1511794

Expand All @@ -21,6 +26,13 @@ def _cast(collection):
"""
Cast a collection to a pygeos geometry array.
"""
try:
import pygeos, geopandas
except (ImportError, ModuleNotFoundError) as exception:
raise type(exception)(
"pygeos and geopandas are required for map comparison statistics."
)

if isinstance(collection, (geopandas.GeoSeries, geopandas.GeoDataFrame)):
return collection.geometry.values.data.squeeze()
elif pygeos.is_geometry(collection).all():
Expand Down
17 changes: 14 additions & 3 deletions esda/shape.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
import pygeos
import geopandas, pandas
import numpy
from numba import njit, prange
import pandas

try:
import pygeos
except (ImportError, ModuleNotFoundError):
pass # gets handled at the _cast level.

from .crand import njit, prange


# -------------------- UTILITIES --------------------#
def _cast(collection):
"""
Cast a collection to a pygeos geometry array.
"""
try:
import pygeos, geopandas
except (ImportError, ModuleNotFoundError) as exception:
raise type(exception)("pygeos and geopandas are required for shape statistics.")

if isinstance(collection, (geopandas.GeoSeries, geopandas.GeoDataFrame)):
return collection.geometry.values.data.squeeze()
elif pygeos.is_geometry(collection).all():
Expand Down