safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Test fixes

Browse Source
This commit is contained in:
Darkshredder
2021-03-09 01:00:56 +05:30
parent 14ec83c886
commit 4080fbb95c
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib-php/admin/setup.php
View File

@@ -161,7 +161,7 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) {
if ($aCMDResult['import-tiger-data']) { if ($aCMDResult['import-tiger-data']) {
$bDidSomething = true; $bDidSomething = true;
$sTigerPath = getSetting('TIGER_DATA_PATH', CONST_InstallDir.'/tiger'); $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']) { if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {

8
nominatim/cli.py
View File

@@ -13,7 +13,6 @@ from .tools.exec_utils import run_legacy_script, run_php_server
from .errors import UsageError from .errors import UsageError
from . import clicmd from . import clicmd
from .clicmd.args import NominatimArgs from .clicmd.args import NominatimArgs
from .tools import tiger_data
LOG = logging.getLogger() LOG = logging.getLogger()
@@ -167,11 +166,8 @@ class UpdateAddData:
@staticmethod @staticmethod
def run(args): def run(args):
if args.tiger_data: if args.tiger_data:
return tiger_data.add_tiger_data(args.config.get_libpq_dsn(), os.environ['NOMINATIM_TIGER_DATA_PATH'] = args.tiger_data
args.tiger_data, return run_legacy_script('setup.php', '--import-tiger-data', nominatim_env=args)
args.threads or 1,
args.config,
args.sqllib_dir)
params = ['update.php'] params = ['update.php']
if args.file: if args.file: