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

start/stop added + fix

Browse source
This commit is contained in:
Christian Quest 2016-05-06 22:21:12 +02:00
parent 22679a47fe
commit be0f5a958f
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backend.py
View file

@ -60,10 +60,7 @@ class EventResource(object):
if 'bbox' in req.params:
# 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']))
else:
event_bbox = ""
if 'near' in req.params:
elif 'near' in req.params:
# limit search with location+distance (long, lat, distance in meters)
event_bbox = cur.mogrify(" AND geom && st_expand(st_buffer(st_setsrid(st_makepoint(%s,%s),4326)::geography,%s)::geometry,0) ",tuple(req.params['near']))
else:
@ -72,8 +69,11 @@ class EventResource(object):
if 'when' in req.params:
# limit search with fixed time
event_when = cur.mogrify("tstzrange(%s,%s,'[]')",(req.params['when'],req.params['when']))
elif 'start' in req.params and 'stop' in req.params:
# limit search with fixed time
event_when = cur.mogrify("tstzrange(%s,%s,'[]')",(req.params['start'],req.params['stop']))
else:
event_when = "tstzrange(now(),now(),'[]')"
event_when = """tstzrange(now(),now(),'[]')"""
if 'what' in req.params:
# limit search based on "what"