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

add geom_center lat/lon in properties

Browse source
This commit is contained in:
cquest 2016-06-19 16:29:06 +02:00
parent d05415c694
commit 6d718755c5
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend.py
View file

@ -67,6 +67,8 @@ class BaseEvent:
properties.update({ properties.update({
'createdate': row['createdate'], 'createdate': row['createdate'],
'lastupdate': row['lastupdate'], 'lastupdate': row['lastupdate'],
'lon': row['lon'],
'lat': row['lat'],
"id": row['events_id'] "id": row['events_id']
}) })
if "distance" in row: if "distance" in row:
@ -206,7 +208,7 @@ class EventResource(BaseEvent):
event_geom = cur.mogrify("ST_SnapToGrid(geom,%s)",(req.params['geom'],)).decode("utf-8") event_geom = cur.mogrify("ST_SnapToGrid(geom,%s)",(req.params['geom'],)).decode("utf-8")
# Search recent active events. # Search recent active events.
sql = """SELECT events_id, events_tags, createdate, lastupdate, {event_dist} st_asgeojson({event_geom}) as geometry FROM events JOIN geo ON (hash=events_geo) {event_bbox} WHERE events_when && {event_when} {event_what} {event_type} ORDER BY createdate DESC {limit}""" sql = """SELECT events_id, events_tags, createdate, lastupdate, {event_dist} st_asgeojson({event_geom}) as geometry, st_x(geom_center) as lon, st_y(geom_center) as lat FROM events JOIN geo ON (hash=events_geo) {event_bbox} WHERE events_when && {event_when} {event_what} {event_type} ORDER BY createdate DESC {limit}"""
# No user generated content here, so format is safe. # No user generated content here, so format is safe.
sql = sql.format(event_dist=event_dist, event_geom=event_geom, sql = sql.format(event_dist=event_dist, event_geom=event_geom,
event_bbox=event_bbox, event_what=event_what, event_bbox=event_bbox, event_what=event_what,
@ -216,7 +218,7 @@ class EventResource(BaseEvent):
resp.status = falcon.HTTP_200 resp.status = falcon.HTTP_200
else: else:
# Get single event geojson Feature by id. # Get single event geojson Feature by id.
cur.execute("SELECT events_id, events_tags, createdate, lastupdate, st_asgeojson(geom) as geometry FROM events JOIN geo ON (hash=events_geo) WHERE events_id=%s", [id]) cur.execute("SELECT events_id, events_tags, createdate, lastupdate, st_asgeojson(geom) as geometry, st_x(geom_center) as lon, st_y(geom_center) as lat FROM events JOIN geo ON (hash=events_geo) WHERE events_id=%s", [id])
e = cur.fetchone() e = cur.fetchone()
if e is not None: if e is not None: