bdd: move place table inserter into separate file

Also simplifies usage by implementing a function that inserts
a complete table row.

diff --git a/test/bdd/steps/place_inserter.py b/test/bdd/steps/place_inserter.py
new file mode 100644 (file)
index 0000000..90f071b
--- /dev/null
+++ b/test/bdd/steps/place_inserter.py
@@ -0,0 +1,105 @@
+"""
+Helper classes for filling the place table.
+"""
+import random
+import string
+
+class PlaceColumn:
+    """ Helper class to collect contents from a behave table row and
+        insert it into the place table.
+    """
+    def __init__(self, context):
+        self.columns = {'admin_level' : 15}
+        self.context = context
+        self.geometry = None
+
+    def add_row(self, row, force_name):
+        """ Parse the content from the given behave row as place column data.
+        """
+        for name, value in zip(row.headings, row.cells):
+            self._add(name, value)
+
+        assert 'osm_type' in self.columns, "osm column missing"
+
+        if force_name and 'name' not in self.columns:
+            self._add_hstore('name', 'name',
+                             ''.join(random.choice(string.printable)
+                                     for _ in range(int(random.random()*30))))
+
+        return self
+
+    def _add(self, key, value):
+        if hasattr(self, '_set_key_' + key):
+            getattr(self, '_set_key_' + key)(value)
+        elif key.startswith('name+'):
+            self._add_hstore('name', key[5:], value)
+        elif key.startswith('extra+'):
+            self._add_hstore('extratags', key[6:], value)
+        elif key.startswith('addr+'):
+            self._add_hstore('address', key[5:], value)
+        elif key in ('name', 'address', 'extratags'):
+            self.columns[key] = eval('{' + value + '}')
+        else:
+            assert key in ('class', 'type'), "Unknown column '{}'.".format(key)
+            self.columns[key] = None if value == '' else value
+
+    def _set_key_name(self, value):
+        self._add_hstore('name', 'name', value)
+
+    def _set_key_osm(self, value):
+        assert value[0] in 'NRW' and value[1:].isdigit(), \
+               "OSM id needs to be of format <NRW><id>."
+
+        self.columns['osm_type'] = value[0]
+        self.columns['osm_id'] = int(value[1:])
+
+    def _set_key_admin(self, value):
+        self.columns['admin_level'] = int(value)
+
+    def _set_key_housenr(self, value):
+        if value:
+            self._add_hstore('address', 'housenumber', value)
+
+    def _set_key_postcode(self, value):
+        if value:
+            self._add_hstore('address', 'postcode', value)
+
+    def _set_key_street(self, value):
+        if value:
+            self._add_hstore('address', 'street', value)
+
+    def _set_key_addr_place(self, value):
+        if value:
+            self._add_hstore('address', 'place', value)
+
+    def _set_key_country(self, value):
+        if value:
+            self._add_hstore('address', 'country', value)
+
+    def _set_key_geometry(self, value):
+        self.geometry = self.context.osm.parse_geometry(value, self.context.scene)
+        assert self.geometry is not None, "Bad geometry: {}".format(value)
+
+    def _add_hstore(self, column, key, value):
+        if column in self.columns:
+            self.columns[column][key] = value
+        else:
+            self.columns[column] = {key: value}
+
+    def db_insert(self, cursor):
+        """ Insert the collected data into the database.
+        """
+        if self.columns['osm_type'] == 'N' and self.geometry is None:
+            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 self.geometry is not None, "Geometry missing"
+
+        query = 'INSERT INTO place ({}, geometry) values({}, {})'.format(
+            ','.join(self.columns.keys()),
+            ','.join(['%s' for x in range(len(self.columns))]),
+            self.geometry)
+        cursor.execute(query, list(self.columns.values()))

diff --git a/test/bdd/steps/steps_db_ops.py b/test/bdd/steps/steps_db_ops.py
index 194299995e08cd13ec3960e56bfe862b37d494bb..8f20cdaa2bbcb8d0861383bc58f439a579981be5 100644 (file)
--- a/test/bdd/steps/steps_db_ops.py
+++ b/test/bdd/steps/steps_db_ops.py
@@ -1,97 +1,8 @@
-import base64
-import random
-import string

 import re
 import psycopg2.extras
 
 from check_functions import Almost
 import re
 import psycopg2.extras
 
 from check_functions import Almost

-
-class PlaceColumn:
-
-    def __init__(self, context, force_name):
-        self.columns = { 'admin_level' : 15}
-        self.force_name = force_name
-        self.context = context
-        self.geometry = None
-
-    def add(self, key, value):
-        if hasattr(self, 'set_key_' + key):
-            getattr(self, 'set_key_' + key)(value)
-        elif key.startswith('name+'):
-            self.add_hstore('name', key[5:], value)
-        elif key.startswith('extra+'):
-            self.add_hstore('extratags', key[6:], value)
-        elif key.startswith('addr+'):
-            self.add_hstore('address', key[5:], value)
-        elif key in ('name', 'address', 'extratags'):
-            self.columns[key] = eval('{' + value + '}')
-        else:
-            assert key in ('class', 'type')
-            self.columns[key] = None if value == '' else value
-
-    def set_key_name(self, value):
-        self.add_hstore('name', 'name', value)
-
-    def set_key_osm(self, value):
-        assert value[0] in 'NRW'
-        assert value[1:].isdigit()
-
-        self.columns['osm_type'] = value[0]
-        self.columns['osm_id'] = int(value[1:])
-
-    def set_key_admin(self, value):
-        self.columns['admin_level'] = int(value)
-
-    def set_key_housenr(self, value):
-        if value:
-            self.add_hstore('address', 'housenumber', value)
-
-    def set_key_postcode(self, value):
-        if value:
-            self.add_hstore('address', 'postcode', value)
-
-    def set_key_street(self, value):
-        if value:
-            self.add_hstore('address', 'street', value)
-
-    def set_key_addr_place(self, value):
-        if value:
-            self.add_hstore('address', 'place', value)
-
-    def set_key_country(self, value):
-        if value:
-            self.add_hstore('address', 'country', value)
-
-    def set_key_geometry(self, value):
-        self.geometry = self.context.osm.parse_geometry(value, self.context.scene)
-        assert self.geometry is not None
-
-    def add_hstore(self, column, key, value):
-        if column in self.columns:
-            self.columns[column][key] = value
-        else:
-            self.columns[column] = { key : value }
-
-    def db_insert(self, cursor):
-        assert 'osm_type' in self.columns
-        if self.force_name and 'name' not in self.columns:
-            self.add_hstore('name', 'name', ''.join(random.choice(string.printable)
-                                           for _ in range(int(random.random()*30))))
-
-        if self.columns['osm_type'] == 'N' and self.geometry is None:
-            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 self.geometry is not None, "Geometry missing"
-        query = 'INSERT INTO place (%s, geometry) values(%s, %s)' % (
-                     ','.join(self.columns.keys()),
-                     ','.join(['%s' for x in range(len(self.columns))]),
-                     self.geometry)
-        cursor.execute(query, list(self.columns.values()))
-
+from place_inserter import PlaceColumn

 
 class PlaceObjName(object):
 
 
 class PlaceObjName(object):
 


@@ -224,13 +135,8 @@ def assert_db_column(row, column, value, context):
 def add_data_to_place_table(context, named):
     with context.db.cursor() as cur:
         cur.execute('ALTER TABLE place DISABLE TRIGGER place_before_insert')
 def add_data_to_place_table(context, named):
     with context.db.cursor() as cur:
         cur.execute('ALTER TABLE place DISABLE TRIGGER place_before_insert')

-        for r in context.table:
-            col = PlaceColumn(context, named is not None)
-
-            for h in r.headings:
-                col.add(h, r[h])
-
-            col.db_insert(cur)
+        for row in context.table:
+            PlaceColumn(context).add_row(row, named is not None).db_insert(cur)

         cur.execute('ALTER TABLE place ENABLE TRIGGER place_before_insert')
 
 @given("the relations")
         cur.execute('ALTER TABLE place ENABLE TRIGGER place_before_insert')
 
 @given("the relations")


@@ -296,13 +202,8 @@ def update_place_table(context):
     context.nominatim.run_setup_script(
         'create-functions', 'create-partition-functions', 'enable-diff-updates')
     with context.db.cursor() as cur:
     context.nominatim.run_setup_script(
         'create-functions', 'create-partition-functions', 'enable-diff-updates')
     with context.db.cursor() as cur:

-        for r in context.table:
-            col = PlaceColumn(context, False)
-
-            for h in r.headings:
-                col.add(h, r[h])
-
-            col.db_insert(cur)
+        for row in context.table:
+            PlaceColumn(context).add_row(row, False).db_insert(cur)

 
         while True:
             context.nominatim.run_update_script('index')
 
         while True:
             context.nominatim.run_update_script('index')