hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-12 05:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify interface for adding tiger data

Browse Source 
Also simplifies tests using existing fixtures.
This commit is contained in:
Sarah Hoffmann
2021-04-19 09:23:37 +02:00
parent 995ba2c7c2
commit 8f63f9516b
4 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nominatim/cli.py
View File

@@ -148,11 +148,8 @@ class UpdateAddData:
@staticmethod
def run(args):
if args.tiger_data:
return tiger_data.add_tiger_data(args.config.get_libpq_dsn(),
args.tiger_data,
args.threads or 1,
args.config,
args.sqllib_dir)
return tiger_data.add_tiger_data(args.tiger_data,
args.config, args.threads or 1)
params = ['update.php']
if args.file:

10
nominatim/tools/tiger_data.py
View File

@@ -76,17 +76,17 @@ def handle_unregister_connection_pool(sel, place_threads):
conn.close()
place_threads -= 1
def add_tiger_data(dsn, data_dir, threads, config, sqllib_dir):
""" Import tiger data from directory or tar file
def add_tiger_data(data_dir, config, threads):
""" Import tiger data from directory or tar file `data dir`.
"""
dsn = config.get_libpq_dsn()
sql_files, tar = handle_tarfile_or_directory(data_dir)
if not sql_files:
return
with connect(dsn) as conn:
sql = SQLPreprocessor(conn, config, sqllib_dir)
sql = SQLPreprocessor(conn, config, config.lib_dir.sql)
sql.run_sql_file(conn, 'tiger_import_start.sql')
# Reading sql_files and then for each file line handling
@@ -116,5 +116,5 @@ def add_tiger_data(dsn, data_dir, threads, config, sqllib_dir):
print('\n')
LOG.warning("Creating indexes on Tiger data")
with connect(dsn) as conn:
sql = SQLPreprocessor(conn, config, sqllib_dir)
sql = SQLPreprocessor(conn, config, config.lib_dir.sql)
sql.run_sql_file(conn, 'tiger_import_finish.sql')