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

compute/store geo.geom centroid only once

Browse source
This commit is contained in:
Christian Quest 2016-05-09 14:23:51 +02:00
parent 5d07c7895d
commit 63ff78eaa1
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend.py
View file

@ -56,7 +56,7 @@ JOIN geo ON (hash=events_geo)""");
class EventResource(object):
def maybe_insert_geometry(self,geometry,cur):
# insert into geo table if not existing
cur.execute("""INSERT INTO geo (hash, geom) SELECT * 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,))
# get its id (md5 hash)
h = cur.fetchone()
if h is None:
@ -112,7 +112,7 @@ class EventResource(object):
# search recent active events
cur.execute("""
SELECT '{"type":"Feature", "properties": '|| (events_tags::jsonb || jsonb_build_object('id',events_id,'createdate',createdate,'lastupdate',lastupdate """+event_dist+"""))::text ||', "geometry":'|| st_asgeojson(st_centroid(geom)) ||' }' as feature
SELECT '{"type":"Feature", "properties": '|| (events_tags::jsonb || jsonb_build_object('id',events_id,'createdate',createdate,'lastupdate',lastupdate """+event_dist+"""))::text ||', "geometry":'|| st_asgeojson(geom_center) ||' }' as feature
FROM events
JOIN geo ON (hash=events_geo) """ + event_bbox +"""
WHERE events_when && """+ event_when + event_what + event_type +"""