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

bbox(E,S,W,N) support to filter event list

Browse source
This commit is contained in:
Christian Quest 2016-05-06 18:01:55 +02:00
parent 1bca268190
commit 2818e28708
1 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
backend.py
View file

@ -51,18 +51,31 @@ JOIN geo ON (hash=events_geo)""");
class EventResource(object): class EventResource(object):
def on_get(self, req, resp, id = None): def on_get(self, req, resp, id = None):
standard_headers(resp)
db = db_connect() db = db_connect()
cur = db.cursor() cur = db.cursor()
if id is None: if id is None:
cur.execute(""" if req.params.has_key('bbox'):
SELECT format('{"type": "FeatureCollection","features": [%s]}',string_agg(feature,',')) FROM bbox = req.params['bbox']
(SELECT '{"type":"Feature", "properties": '|| (events_tags::jsonb || jsonb_build_object('id',events_id,'createdate',createdate,'lastupdate',lastupdate))::text ||', "geometry":'|| st_asgeojson(st_centroid(geom)) ||' }' as feature cur.execute("""
SELECT '{"type":"Feature", "properties": '|| (events_tags::jsonb || jsonb_build_object('id',events_id,'createdate',createdate,'lastupdate',lastupdate))::text ||', "geometry":'|| st_asgeojson(st_centroid(geom)) ||' }' as feature
FROM events
JOIN geo ON (hash=events_geo) and geom && ST_SetSRID(ST_MakeBox2D(ST_Point(%s,%s),ST_Point(%s,%s)),4326)
WHERE events_when @> tstzrange(now(), now(),'[]')
ORDER BY createdate DESC
LIMIT 50;
""", tuple(bbox))
else:
cur.execute("""
SELECT '{"type":"Feature", "properties": '|| (events_tags::jsonb || jsonb_build_object('id',events_id,'createdate',createdate,'lastupdate',lastupdate))::text ||', "geometry":'|| st_asgeojson(st_centroid(geom)) ||' }' as feature
FROM events FROM events
JOIN geo ON (hash=events_geo) JOIN geo ON (hash=events_geo)
WHERE events_when @> format('[%s,%s]', now(), now())::tstzrange WHERE events_when @> tstzrange(now(), now(),'[]')
ORDER BY createdate DESC ORDER BY createdate DESC
LIMIT 50) as f; LIMIT 50;
""") """)
resp.body = '{"type": "FeatureCollection","features": ['+','.join([x[0] for x in cur.fetchall()])+']}'
resp.status = falcon.HTTP_200
else: else:
# get event geojson Feature # get event geojson Feature
cur.execute(""" cur.execute("""
@ -71,13 +84,12 @@ FROM events
JOIN geo ON (hash=events_geo) JOIN geo ON (hash=events_geo)
WHERE events_id=%s;""", (id,)) WHERE events_id=%s;""", (id,))
e = cur.fetchone() e = cur.fetchone()
standard_headers(resp) if e is not None:
if e is not None: resp.body = e[0]
resp.body = e[0] resp.status = falcon.HTTP_200
resp.status = falcon.HTTP_200 else:
else: resp.status = falcon.HTTP_404
resp.status = falcon.HTTP_404
db.close() db.close()
def on_post(self, req, resp): def on_post(self, req, resp):