safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

test: enable grid support for DB tests

Browse Source
This commit is contained in:
Sarah Hoffmann
2017-02-26 13:05:36 +01:00
parent c48fb88e6b
commit 6551399bcc
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/bdd/environment.py
View File

@@ -149,18 +149,31 @@ class OSMDataFactory(object):
self.scene_path = os.environ.get('SCENE_PATH',
os.path.join(scriptpath, '..', 'scenes', 'data'))
self.scene_cache = {}
self.clear_grid()
def parse_geometry(self, geom, scene):
if geom.find(':') >= 0:
out = self.get_scene_geometry(scene, geom)
out = "POINT(%s)" % self.get_scene_geometry(scene, geom)
elif geom.find(',') < 0:
out = "'POINT(%s)'::geometry" % geom
out = "POINT(%s)" % self.mk_wkt_point(geom)
elif geom.find('(') < 0:
out = "'LINESTRING(%s)'::geometry" % geom
line = ','.join([self.mk_wkt_point(x) for x in geom.split(',')])
out = "LINESTRING(%s)" % line
else:
out = "'POLYGON(%s)'::geometry" % geom
inner = geom.strip('() ')
line = ','.join([self.mk_wkt_point(x) for x in inner.split(',')])
out = "POLYGON((%s))" % line
return "ST_SetSRID(%s, 4326)" % out
return "ST_SetSRID('%s'::geometry, 4326)" % out
def mk_wkt_point(self, point):
geom = point.strip()
if geom.find(' ') >= 0:
return geom
else:
pt = self.grid_node(int(geom))
assert_is_not_none(pt, "Point not found in grid")
return "%f %f" % pt
def get_scene_geometry(self, default_scene, name):
geoms = []

7
test/bdd/steps/db_ops.py
View File

@@ -61,8 +61,11 @@ class PlaceColumn:
for _ in range(int(random.random()*30))))
if self.columns['osm_type'] == 'N' and self.geometry is None:
self.geometry = "ST_SetSRID(ST_Point(%f, %f), 4326)" % (
random.random()*360 - 180, random.random()*180 - 90)
pt = self.context.osm.grid_node(self.columns['osm_id'])
if pt is None:
pt = (random.random()*360 - 180, random.random()*180 - 90)
self.geometry = "ST_SetSRID(ST_Point(%f, %f), 4326)" % pt
else:
assert_is_not_none(self.geometry, "Geometry missing")
query = 'INSERT INTO place (%s, geometry) values(%s, %s)' % (