fix merge issues

[nominatim.git] / settings / flex-base.lua

diff --git a/settings/flex-base.lua b/settings/flex-base.lua
index fbfb4d54620decaf791550ebc76e0302c2792896..4d960d7267a3cc502c57938a2ebb12057ca95b31 100644 (file)
--- a/settings/flex-base.lua
+++ b/settings/flex-base.lua
@@ -5,6 +5,7 @@ local module = {}
 
 local PRE_DELETE = nil
 local PRE_EXTRAS = nil
 
 local PRE_DELETE = nil
 local PRE_EXTRAS = nil

+local POST_DELETE = nil

 local MAIN_KEYS = nil
 local NAMES = nil
 local ADDRESS_TAGS = nil
 local MAIN_KEYS = nil
 local NAMES = nil
 local ADDRESS_TAGS = nil


@@ -30,6 +31,8 @@ local place_table = osm2pgsql.define_table{
         { column = 'extratags', type = 'hstore' },
         { column = 'geometry', type = 'geometry', projection = 'WGS84', not_null = true },
     },
         { column = 'extratags', type = 'hstore' },
         { column = 'geometry', type = 'geometry', projection = 'WGS84', not_null = true },
     },

+    data_tablespace = os.getenv("NOMINATIM_TABLESPACE_PLACE_DATA"),
+    index_tablespace = os.getenv("NOMINATIM_TABLESPACE_PLACE_INDEX"),

     indexes = {}
 }
 
     indexes = {}
 }
 


@@ -247,9 +250,9 @@ function Place:write_row(k, v, save_extra_mains)
     }
 
     if save_extra_mains then
     }
 
     if save_extra_mains then

-        for k, v in pairs(self.object.tags) do
-            if save_extra_mains(k, v) then
-                self.extratags[k] = nil
+        for tk, tv in pairs(self.object.tags) do
+            if save_extra_mains(tk, tv) then
+                self.extratags[tk] = nil

             end
         end
     end
             end
         end
     end


@@ -537,7 +540,7 @@ function module.set_unused_handling(data)
     end
 end
 
     end
 end
 

-function set_relation_types(data)
+function module.set_relation_types(data)

     module.RELATION_TYPES = {}
     for k, v in data do
         if v == 'multipolygon' then
     module.RELATION_TYPES = {}
     for k, v in data do
         if v == 'multipolygon' then