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

Factorize row_to_feature

Browse source
This commit is contained in:
Yohan Boniface 2016-05-17 09:45:11 +02:00
parent 49523bd566
commit 8b5107e6c1
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
backend.py
View file

@ -38,20 +38,28 @@ class StatsResource(object):
resp.status = falcon.HTTP_200 resp.status = falcon.HTTP_200
class EventsResource(object): class BaseEvent:
def row_to_feature(self, row): def row_to_feature(self, row):
properties = dict(row['events_tags'])
properties.update({
'createdate': str(row['createdate']),
'last_updated': str(row['lastupdate'])
})
return { return {
"type": "Feature", "type": "Feature",
"geometry": json.loads(row['geometry']), "geometry": json.loads(row['geometry']),
"id": row['events_id'], "id": row['events_id'],
"properties": row['events_tags'] "properties": properties
} }
class EventsResource(BaseEvent):
def on_get(self, req, resp): def on_get(self, req, resp):
db = db_connect() db = db_connect()
cur = db.cursor(cursor_factory=psycopg2.extras.DictCursor) cur = db.cursor(cursor_factory=psycopg2.extras.DictCursor)
cur.execute("SELECT events_id, events_tags, st_asgeojson(geom) as geometry FROM events JOIN geo ON (hash=events_geo)") cur.execute("SELECT events_id, events_tags, createdate, lastupdate, st_asgeojson(geom) as geometry FROM events JOIN geo ON (hash=events_geo)")
resp.body = json.dumps({ resp.body = json.dumps({
"type": "FeatureCollection", "type": "FeatureCollection",
"features": [self.row_to_feature(r) for r in cur.fetchall()] "features": [self.row_to_feature(r) for r in cur.fetchall()]
@ -59,7 +67,7 @@ class EventsResource(object):
resp.status = falcon.HTTP_200 resp.status = falcon.HTTP_200
class EventResource(object): class EventResource(BaseEvent):
def maybe_insert_geometry(self, geometry, cur): def maybe_insert_geometry(self, geometry, cur):
# insert into geo table if not existing # insert into geo table if not existing
cur.execute("""INSERT INTO geo (hash, geom, geom_center) SELECT *, st_centroid(geom) FROM (SELECT md5(ewkt) as hash, st_setsrid(st_geomfromewkt(ewkt),4326) as geom FROM (SELECT st_asewkt(st_geomfromgeojson( %s )) as ewkt) as g) as i ON CONFLICT DO NOTHING RETURNING hash;""", (geometry,)) cur.execute("""INSERT INTO geo (hash, geom, geom_center) SELECT *, st_centroid(geom) FROM (SELECT md5(ewkt) as hash, st_setsrid(st_geomfromewkt(ewkt),4326) as geom FROM (SELECT st_asewkt(st_geomfromgeojson( %s )) as ewkt) as g) as i ON CONFLICT DO NOTHING RETURNING hash;""", (geometry,))
@ -72,7 +80,7 @@ class EventResource(object):
def on_get(self, req, resp, id=None): def on_get(self, req, resp, id=None):
db = db_connect() db = db_connect()
cur = db.cursor() cur = db.cursor(cursor_factory=psycopg2.extras.DictCursor)
if id is None: if id is None:
# get query search parameters # get query search parameters
@ -140,16 +148,12 @@ SELECT '{"type":"Feature", "properties": '|| (events_tags::jsonb || jsonb_build_
]}""" ]}"""
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(""" 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])
SELECT format('{"type":"Feature", "properties": '|| (events_tags::jsonb || jsonb_build_object('id',events_id,'createdate',createdate,'lastupdate',lastupdate))::text ||', "geometry":'|| st_asgeojson(geom)) ||' }'
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:
resp.body = e[0] resp.body = json.dumps(self.row_to_feature(e))
resp.status = falcon.HTTP_200 resp.status = falcon.HTTP_200
else: else:
resp.status = falcon.HTTP_404 resp.status = falcon.HTTP_404