From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 26 Feb 2017 12:05:36 +0000 (+0100)
Subject: test: enable grid support for DB tests
X-Git-Tag: v3.0.0~66
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/6551399bcc3ee347953aebdc586f167f63687330?hp=c48fb88e6b4020e960ccb656cb0741ab5f2fec74

test: enable grid support for DB tests
---

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index 65afc816..a1a9c0bd 100644
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -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 = []
diff --git a/test/bdd/steps/db_ops.py b/test/bdd/steps/db_ops.py
index 56aa0c80..fa66cd4d 100644
--- a/test/bdd/steps/db_ops.py
+++ b/test/bdd/steps/db_ops.py
@@ -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)' % (