Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / environment.py

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index c878c61c5f90bf4f407038654fbe76673508b131..58494deb9858f867221572a48795b7d0515181ff 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -4,17 +4,18 @@ import os
 import psycopg2
 import psycopg2.extras
 import subprocess
 import psycopg2
 import psycopg2.extras
 import subprocess

+from nose.tools import * # for assert functions

 from sys import version_info as python_version
 
 logger = logging.getLogger(__name__)
 
 userconfig = {
 from sys import version_info as python_version
 
 logger = logging.getLogger(__name__)
 
 userconfig = {

-    'BASEURL' : 'http://localhost/nominatim',

     'BUILDDIR' : os.path.join(os.path.split(__file__)[0], "../../build"),
     'REMOVE_TEMPLATE' : False,
     'KEEP_TEST_DB' : False,
     'TEMPLATE_DB' : 'test_template_nominatim',
     'TEST_DB' : 'test_nominatim',
     'BUILDDIR' : os.path.join(os.path.split(__file__)[0], "../../build"),
     'REMOVE_TEMPLATE' : False,
     'KEEP_TEST_DB' : False,
     'TEMPLATE_DB' : 'test_template_nominatim',
     'TEST_DB' : 'test_nominatim',

+    'API_TEST_DB' : 'test_api_nominatim',

     'TEST_SETTINGS_FILE' : '/tmp/nominatim_settings.php'
 }
 
     'TEST_SETTINGS_FILE' : '/tmp/nominatim_settings.php'
 }
 


@@ -28,6 +29,7 @@ class NominatimEnvironment(object):
         self.build_dir = os.path.abspath(config['BUILDDIR'])
         self.template_db = config['TEMPLATE_DB']
         self.test_db = config['TEST_DB']
         self.build_dir = os.path.abspath(config['BUILDDIR'])
         self.template_db = config['TEMPLATE_DB']
         self.test_db = config['TEST_DB']

+        self.api_test_db = config['API_TEST_DB']

         self.local_settings_file = config['TEST_SETTINGS_FILE']
         self.reuse_template = not config['REMOVE_TEMPLATE']
         self.keep_scenario_db = config['KEEP_TEST_DB']
         self.local_settings_file = config['TEST_SETTINGS_FILE']
         self.reuse_template = not config['REMOVE_TEMPLATE']
         self.keep_scenario_db = config['KEEP_TEST_DB']


@@ -38,6 +40,7 @@ class NominatimEnvironment(object):
     def write_nominatim_config(self, dbname):
         f = open(self.local_settings_file, 'w')
         f.write("<?php\n  @define('CONST_Database_DSN', 'pgsql://@/%s');\n" % dbname)
     def write_nominatim_config(self, dbname):
         f = open(self.local_settings_file, 'w')
         f.write("<?php\n  @define('CONST_Database_DSN', 'pgsql://@/%s');\n" % dbname)

+        f.write("@define('CONST_Osm2pgsql_Flatnode_File', null);\n")

         f.close()
 
     def cleanup(self):
         f.close()
 
     def cleanup(self):


@@ -97,7 +100,8 @@ class NominatimEnvironment(object):
                               'create-partition-tables', 'create-partition-functions',
                               'load-data', 'create-search-indices')
 
                               'create-partition-tables', 'create-partition-functions',
                               'load-data', 'create-search-indices')
 

-
+    def setup_api_db(self, context):
+        self.write_nominatim_config(self.api_test_db)

 
     def setup_db(self, context):
         self.setup_template_db()
 
     def setup_db(self, context):
         self.setup_template_db()


@@ -121,12 +125,17 @@ class NominatimEnvironment(object):
         if not self.keep_scenario_db:
             self.db_drop_database(self.test_db)
 
         if not self.keep_scenario_db:
             self.db_drop_database(self.test_db)
 

-    def run_setup_script(self, *args):
-        self.run_nominatim_script('setup', *args)
+    def run_setup_script(self, *args, **kwargs):
+        self.run_nominatim_script('setup', *args, **kwargs)
+
+    def run_update_script(self, *args, **kwargs):
+        self.run_nominatim_script('update', *args, **kwargs)

 
 

-    def run_nominatim_script(self, script, *args):
+    def run_nominatim_script(self, script, *args, **kwargs):

         cmd = [os.path.join(self.build_dir, 'utils', '%s.php' % script)]
         cmd.extend(['--%s' % x for x in args])
         cmd = [os.path.join(self.build_dir, 'utils', '%s.php' % script)]
         cmd.extend(['--%s' % x for x in args])

+        for k, v in kwargs.items():
+            cmd.extend(('--' + k.replace('_', '-'), str(v)))

         proc = subprocess.Popen(cmd, cwd=self.build_dir,
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (outp, outerr) = proc.communicate()
         proc = subprocess.Popen(cmd, cwd=self.build_dir,
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (outp, outerr) = proc.communicate()


@@ -141,30 +150,44 @@ class OSMDataFactory(object):
         self.scene_path = os.environ.get('SCENE_PATH',
                            os.path.join(scriptpath, '..', 'scenes', 'data'))
         self.scene_cache = {}
         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):
 
     def parse_geometry(self, geom, scene):

-        if geom[0].find(':') >= 0:
-            out = self.get_scene_geometry(scene, geom[1:])
+        if geom.find(':') >= 0:
+            return "ST_SetSRID(%s, 4326)" % self.get_scene_geometry(scene, geom)
+

         if geom.find(',') < 0:
         if geom.find(',') < 0:

-            out = 'POINT(%s)' % geom
+            out = "POINT(%s)" % self.mk_wkt_point(geom)

         elif geom.find('(') < 0:
         elif geom.find('(') < 0:

-            out = 'LINESTRING(%s)' % geom
+            line = ','.join([self.mk_wkt_point(x) for x in geom.split(',')])
+            out = "LINESTRING(%s)" % line

         else:
         else:

-            out = 'POLYGON(%s)' % geom
+            inner = geom.strip('() ')
+            line = ','.join([self.mk_wkt_point(x) for x in inner.split(',')])
+            out = "POLYGON((%s))" % line
+
+        return "ST_SetSRID('%s'::geometry, 4326)" % out

 
 

-        # TODO parse precision
-        return out, 0
+    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 = []
 
     def get_scene_geometry(self, default_scene, name):
         geoms = []

-        defscene = self.load_scene(default_scene)

         for obj in name.split('+'):
             oname = obj.strip()
             if oname.startswith(':'):
         for obj in name.split('+'):
             oname = obj.strip()
             if oname.startswith(':'):

+                assert_is_not_none(default_scene, "You need to set a scene")
+                defscene = self.load_scene(default_scene)

                 wkt = defscene[oname[1:]]
             else:
                 scene, obj = oname.split(':', 2)
                 wkt = defscene[oname[1:]]
             else:
                 scene, obj = oname.split(':', 2)

-                scene_geoms = world.load_scene(scene)
+                scene_geoms = self.load_scene(scene)

                 wkt = scene_geoms[obj]
 
             geoms.append("'%s'::geometry" % wkt)
                 wkt = scene_geoms[obj]
 
             geoms.append("'%s'::geometry" % wkt)


@@ -188,6 +211,15 @@ class OSMDataFactory(object):
 
         return scene
 
 
         return scene
 

+    def clear_grid(self):
+        self.grid = {}
+
+    def add_grid_node(self, nodeid, x, y):
+        self.grid[nodeid] = (x, y)
+
+    def grid_node(self, nodeid):
+        return self.grid.get(nodeid)
+

 
 def before_all(context):
     # logging setup
 
 def before_all(context):
     # logging setup


@@ -207,6 +239,8 @@ def after_all(context):
 def before_scenario(context, scenario):
     if 'DB' in context.tags:
         context.nominatim.setup_db(context)
 def before_scenario(context, scenario):
     if 'DB' in context.tags:
         context.nominatim.setup_db(context)

+    elif 'APIDB' in context.tags:
+        context.nominatim.setup_api_db(context)

     context.scene = None
 
 def after_scenario(context, scenario):
     context.scene = None
 
 def after_scenario(context, scenario):