Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / steps / place_inserter.py

diff --git a/test/bdd/steps/place_inserter.py b/test/bdd/steps/place_inserter.py
index 90f071b282369e944efda0d2bed99b1779883da1..c033ac17f008ce3bc46237815795a5dccbd8e060 100644 (file)
--- a/test/bdd/steps/place_inserter.py
+++ b/test/bdd/steps/place_inserter.py
@@ -1,3 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2022 by the Nominatim developer community.
+# For a full list of authors see the git log.

 """
 Helper classes for filling the place table.
 """
 """
 Helper classes for filling the place table.
 """


@@ -77,7 +83,7 @@ class PlaceColumn:
             self._add_hstore('address', 'country', value)
 
     def _set_key_geometry(self, value):
             self._add_hstore('address', 'country', value)
 
     def _set_key_geometry(self, value):

-        self.geometry = self.context.osm.parse_geometry(value, self.context.scene)
+        self.geometry = self.context.osm.parse_geometry(value)

         assert self.geometry is not None, "Bad geometry: {}".format(value)
 
     def _add_hstore(self, column, key, value):
         assert self.geometry is not None, "Bad geometry: {}".format(value)
 
     def _add_hstore(self, column, key, value):


@@ -86,6 +92,12 @@ class PlaceColumn:
         else:
             self.columns[column] = {key: value}
 
         else:
             self.columns[column] = {key: value}
 

+    def db_delete(self, cursor):
+        """ Issue a delete for the given OSM object.
+        """
+        cursor.execute('DELETE FROM place WHERE osm_type = %s and osm_id = %s',
+                       (self.columns['osm_type'] , self.columns['osm_id']))
+

     def db_insert(self, cursor):
         """ Insert the collected data into the database.
         """
     def db_insert(self, cursor):
         """ Insert the collected data into the database.
         """