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

cleaner features count

Browse source
This commit is contained in:
Christian Quest 2016-05-30 08:57:08 +02:00
parent 4e712eb891
commit 6d081de7f1
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend.py
View file

@ -70,11 +70,11 @@ class BaseEvent:
"properties": properties "properties": properties
} }
def rows_to_collection(self, rows, count): def rows_to_collection(self, rows):
return { return {
"type": "FeatureCollection", "type": "FeatureCollection",
"features": [self.row_to_feature(r) for r in rows], "features": [self.row_to_feature(r) for r in rows],
"count": count "count": len(rows)
} }
@ -84,7 +84,7 @@ class EventsResource(BaseEvent):
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, createdate, lastupdate, 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 = dumps(self.rows_to_collection(cur.fetchall(), cur.rowcount)) resp.body = dumps(self.rows_to_collection(cur.fetchall()))
resp.status = falcon.HTTP_200 resp.status = falcon.HTTP_200
@ -175,7 +175,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)
cur.execute(sql) cur.execute(sql)
resp.body = dumps(self.rows_to_collection(cur.fetchall(), cur.rowcount)) resp.body = dumps(self.rows_to_collection(cur.fetchall()))
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.