add a timeout for DB queries

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

diff --git a/settings/flex-base.lua b/settings/flex-base.lua
index 000d01f3679e290f989dc1dd5fc7802df857d764..fbfb4d54620decaf791550ebc76e0302c2792896 100644 (file)
--- a/settings/flex-base.lua
+++ b/settings/flex-base.lua
@@ -11,6 +11,11 @@ local ADDRESS_TAGS = nil
 local SAVE_EXTRA_MAINS = false
 local POSTCODE_FALLBACK = true
 
 local SAVE_EXTRA_MAINS = false
 local POSTCODE_FALLBACK = true
 

+-- tables required for taginfo
+module.TAGINFO_MAIN = {keys = {}, delete_tags = {}}
+module.TAGINFO_NAME_KEYS = {}
+module.TAGINFO_ADDRESS_KEYS = {}
+

 
 -- The single place table.
 local place_table = osm2pgsql.define_table{
 
 -- The single place table.
 local place_table = osm2pgsql.define_table{


@@ -231,7 +236,6 @@ function Place:write_row(k, v, save_extra_mains)
         end
     end
 
         end
     end
 

-    print(k, v)

     place_table:insert{
         class = k,
         type = v,
     place_table:insert{
         class = k,
         type = v,


@@ -373,6 +377,17 @@ function module.tag_group(data)
     end
 end
 
     end
 end
 

+-- Returns prefix part of the keys, and reject suffix matching keys
+local function process_key(key)
+    if key:sub(1, 1) == '*' then
+        return nil
+    end
+    if key:sub(#key, #key) == '*' then
+        return key:sub(1, #key - 2)
+    end
+    return key
+end
+

 -- Process functions for all data types
 function module.process_node(object)
 
 -- Process functions for all data types
 function module.process_node(object)
 


@@ -466,14 +481,29 @@ function module.set_prefilters(data)
     PRE_DELETE = module.tag_match{keys = data.delete_keys, tags = data.delete_tags}
     PRE_EXTRAS = module.tag_match{keys = data.extra_keys,
                                   tags = data.extra_tags}
     PRE_DELETE = module.tag_match{keys = data.delete_keys, tags = data.delete_tags}
     PRE_EXTRAS = module.tag_match{keys = data.extra_keys,
                                   tags = data.extra_tags}

+    module.TAGINFO_MAIN.delete_tags = data.delete_tags

 end
 
 function module.set_main_tags(data)
     MAIN_KEYS = data
 end
 
 function module.set_main_tags(data)
     MAIN_KEYS = data

+    local keys = {}
+    for k, _ in pairs(data) do
+        table.insert(keys, k)
+    end
+    module.TAGINFO_MAIN.keys = keys

 end
 
 function module.set_name_tags(data)
     NAMES = module.tag_group(data)
 end
 
 function module.set_name_tags(data)
     NAMES = module.tag_group(data)

+
+    for _, lst in pairs(data) do
+        for _, k in ipairs(lst) do
+            local key = process_key(k)
+            if key ~= nil then
+                module.TAGINFO_NAME_KEYS[key] = true
+            end
+        end
+    end

 end
 
 function module.set_address_tags(data)
 end
 
 function module.set_address_tags(data)


@@ -481,8 +511,18 @@ function module.set_address_tags(data)
         POSTCODE_FALLBACK = data.postcode_fallback
         data.postcode_fallback = nil
     end
         POSTCODE_FALLBACK = data.postcode_fallback
         data.postcode_fallback = nil
     end

-

     ADDRESS_TAGS = module.tag_group(data)
     ADDRESS_TAGS = module.tag_group(data)

+
+    for _, lst in pairs(data) do
+        if lst ~= nil then
+            for _, k in ipairs(lst) do
+                local key = process_key(k)
+                if key ~= nil then
+                    module.TAGINFO_ADDRESS_KEYS[key] = true
+                end
+            end
+        end
+    end

 end
 
 function module.set_unused_handling(data)
 end
 
 function module.set_unused_handling(data)