From 4080fbb95cd2a12c93276c1f6e58226d1c534406 Mon Sep 17 00:00:00 2001
From: Darkshredder <srivastavayash58@gmail.com>
Date: Tue, 9 Mar 2021 01:00:56 +0530
Subject: [PATCH] Test fixes

---
 lib-php/admin/setup.php | 2 +-
 nominatim/cli.py        | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib-php/admin/setup.php b/lib-php/admin/setup.php
index f81c0ca8..0b008495 100644
--- a/lib-php/admin/setup.php
+++ b/lib-php/admin/setup.php
@@ -161,7 +161,7 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) {
 if ($aCMDResult['import-tiger-data']) {
     $bDidSomething = true;
     $sTigerPath = getSetting('TIGER_DATA_PATH', CONST_InstallDir.'/tiger');
-    $oSetup->importTigerData($sTigerPath);
+    run((clone($oNominatimCmd))->addParams('transition', '--tiger-data', $sTigerPath));
 }
 
 if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
diff --git a/nominatim/cli.py b/nominatim/cli.py
index b3d9eee6..7459711f 100644
--- a/nominatim/cli.py
+++ b/nominatim/cli.py
@@ -13,7 +13,6 @@ from .tools.exec_utils import run_legacy_script, run_php_server
 from .errors import UsageError
 from . import clicmd
 from .clicmd.args import NominatimArgs
-from .tools import tiger_data
 
 LOG = logging.getLogger()
 
@@ -167,11 +166,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)
+            os.environ['NOMINATIM_TIGER_DATA_PATH'] = args.tiger_data
+            return run_legacy_script('setup.php', '--import-tiger-data', nominatim_env=args)
 
         params = ['update.php']
         if args.file:
-- 
2.45.1