Skip to content

fix(as_pandas): Update srid detection code to latest shapely #9

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

Open
coroa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(as_pandas): Update srid detection code to latest shapely #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions saio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ def register_schema(schema, engine):

try:
import geopandas as gpd
import shapely.wkb
import shapely.geos
import shapely, shapely.wkb
has_geopandas = True
except ImportError:
has_geopandas = False
Expand Down Expand Up @@ -196,12 +195,11 @@ def as_pandas(query, index_col=None, coerce_float=True, params=None,
else:
load_geom = lambda s: shapely.wkb.loads(str(s), hex=hex_encoded)

srid = getattr(obj, 'srid', -1)
if srid == -1:
srid = shapely.geos.lgeos.GEOSGetSRID(load_geom(obj)._geom)

if crs is None and srid != 0:
crs = dict(init="epsg:{}".format(srid))
if crs is None:
srid = shapely.get_srid(load_geom(obj))
# if no defined SRID in geodatabase, returns SRID of 0
if srid != 0:
crs = "epsg:{}".format(srid)

df[geometry] = df[geometry].map(load_geom)

Expand Down