tykayn/oedb-backend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove dependency to shapely

Browse source
This commit is contained in:
cquest 2017-11-13 12:23:01 +01:00
parent 5d29d546ea
commit 6779c94d93
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
backend.py
View file

@ -11,7 +11,6 @@ import falcon
import psycopg2 import psycopg2
import psycopg2.extras import psycopg2.extras
import geojson import geojson
from shapely.geometry import shape
def db_connect(): def db_connect():
return psycopg2.connect( return psycopg2.connect(
@ -163,7 +162,7 @@ class EventResource(BaseEvent):
# get query search parameters # get query search parameters
if geom is not None: if geom is not None:
# convert our geojson geom to WKT # convert our geojson geom to WKT
wkt = shape(geojson.loads(json.dumps(geom))).wkt geoj = json.dumps(geom)
# buffer around geom ? # buffer around geom ?
if 'buffer' in req.params: if 'buffer' in req.params:
buffer = float(req.params['buffer']) buffer = float(req.params['buffer'])
@ -172,10 +171,11 @@ class EventResource(BaseEvent):
else: else:
buffer = 0 buffer = 0
if buffer == 0: if buffer == 0:
event_bbox = cur.mogrify(" AND ST_Intersects(geom, ST_SetSRID(ST_GeomFromText(%s),4326)) ",(wkt,)).decode("utf-8") event_bbox = cur.mogrify(" AND ST_Intersects(geom, ST_SetSRID(ST_GeomFromGeoJSON(%s),4326)) ",(geoj,)).decode("utf-8")
else: else:
event_bbox = cur.mogrify(" AND ST_Intersects(geom, ST_Buffer(ST_SetSRID(ST_GeomFromText(%s),4326)::geography, %s)::geometry) ",(wkt, buffer)).decode("utf-8") event_bbox = cur.mogrify(" AND ST_Intersects(geom, ST_Buffer(ST_SetSRID(ST_GeomFromGeoJSON(%s),4326)::geography, %s)::geometry) ",(geoj, buffer)).decode("utf-8")
event_dist = cur.mogrify("ST_Length(ST_ShortestLine(geom, ST_SetSRID(ST_GeomFromText(%s),4326))::geography)::integer as distance, ",(wkt,)).decode("utf-8") event_dist = cur.mogrify("ST_Length(ST_ShortestLine(geom, ST_SetSRID(ST_GeomFromGeoJSON(%s),4326))::geography)::integer as distance, ",(geoj,)).decode("utf-8")
event_sort = cur.mogrify("ST_Length(ST_ShortestLine(geom, ST_SetSRID(ST_GeomFromGeoJSON(%s),4326))::geography)::integer, ", (geoj,)).decode("utf-8")+event_sort
elif 'bbox' in req.params: elif 'bbox' in req.params:
# limit search with bbox (E,S,W,N) # limit search with bbox (E,S,W,N)
event_bbox = cur.mogrify(" AND geom && ST_SetSRID(ST_MakeBox2D(ST_Point(%s,%s),ST_Point(%s,%s)),4326) ",tuple(req.params['bbox'])).decode("utf-8") event_bbox = cur.mogrify(" AND geom && ST_SetSRID(ST_MakeBox2D(ST_Point(%s,%s),ST_Point(%s,%s)),4326) ",tuple(req.params['bbox'])).decode("utf-8")
@ -264,6 +264,7 @@ class EventResource(BaseEvent):
event_bbox=event_bbox, event_what=event_what, event_bbox=event_bbox, event_what=event_what,
event_when=event_when, event_type=event_type, event_when=event_when, event_type=event_type,
event_sort=event_sort, limit=limit) event_sort=event_sort, limit=limit)
print(sql)
cur.execute(sql) cur.execute(sql)
resp.body = dumps(self.rows_to_collection(cur.fetchall(), geom_only)) resp.body = dumps(self.rows_to_collection(cur.fetchall(), geom_only))
resp.status = falcon.HTTP_200 resp.status = falcon.HTTP_200