remove support for AUX housenumber tables

[nominatim.git] / nominatim / tools / refresh.py

diff --git a/nominatim/tools/refresh.py b/nominatim/tools/refresh.py
index 581c69e8a110875406dfc76cf4a0f245ef0e3d9a..8fc0c69dd16dca16ec680daebf6544d25f50d847 100644 (file)
--- a/nominatim/tools/refresh.py
+++ b/nominatim/tools/refresh.py
@@ -7,9 +7,9 @@ from textwrap import dedent
 
 from psycopg2.extras import execute_values
 
-from ..db.utils import execute_file
-from ..db.sql_preprocessor import SQLPreprocessor
-from ..version import NOMINATIM_VERSION
+from nominatim.db.utils import execute_file
+from nominatim.db.sql_preprocessor import SQLPreprocessor
+from nominatim.version import NOMINATIM_VERSION
 
 LOG = logging.getLogger()
 
@@ -77,11 +77,10 @@ def load_address_levels_from_file(conn, config_file):
         load_address_levels(conn, 'address_levels', json.load(fdesc))
 
 
-def create_functions(conn, config, sqllib_dir,
-                     enable_diff_updates=True, enable_debug=False):
+def create_functions(conn, config, enable_diff_updates=True, enable_debug=False):
     """ (Re)create the PL/pgSQL functions.
     """
-    sql = SQLPreprocessor(conn, config, sqllib_dir)
+    sql = SQLPreprocessor(conn, config)
 
     sql.run_sql_file(conn, 'functions.sql',
                      disable_diff_updates=not enable_diff_updates,
@@ -112,7 +111,6 @@ PHP_CONST_DEFS = (
     ('Search_BatchMode', 'SEARCH_BATCH_MODE', bool),
     ('Search_NameOnlySearchFrequencyThreshold', 'SEARCH_NAME_ONLY_THRESHOLD', str),
     ('Term_Normalization_Rules', 'TERM_NORMALIZATION', str),
-    ('Use_Aux_Location_data', 'USE_AUX_LOCATION_DATA', bool),
     ('Use_US_Tiger_Data', 'USE_US_TIGER_DATA', bool),
     ('MapIcon_URL', 'MAPICON_URL', str),
 )
@@ -165,7 +163,7 @@ def recompute_importance(conn):
     conn.commit()
 
 
-def setup_website(basedir, phplib_dir, config):
+def setup_website(basedir, config):
     """ Create the website script stubs.
     """
     if not basedir.exists():
@@ -179,7 +177,7 @@ def setup_website(basedir, phplib_dir, config):
                       @define('CONST_LibDir', '{0}');
                       @define('CONST_NominatimVersion', '{1[0]}.{1[1]}.{1[2]}-{1[3]}');
 
-                      """.format(phplib_dir, NOMINATIM_VERSION))
+                      """.format(config.lib_dir.php, NOMINATIM_VERSION))
 
     for php_name, conf_name, var_type in PHP_CONST_DEFS:
         if var_type == bool:
@@ -193,7 +191,7 @@ def setup_website(basedir, phplib_dir, config):
 
         template += "@define('CONST_{}', {});\n".format(php_name, varout)
 
-    template += "\nrequire_once('{}/website/{{}}');\n".format(phplib_dir)
+    template += "\nrequire_once('{}/website/{{}}');\n".format(config.lib_dir.php)
 
     for script in WEBSITE_SCRIPTS:
         (basedir / script).write_text(template.format(script), 'utf-8')