index admin boundaries before everything else

Avoids irregularities that might happen because the address
rank of a boundary is changed through linking.
This commit is contained in:
Sarah Hoffmann
2020-08-14 16:13:06 +02:00
parent fc50eb8688
commit a4b30fc649
3 changed files with 61 additions and 7 deletions

View File

@@ -278,9 +278,11 @@ if ($aResult['recompute-word-counts']) {
if ($aResult['index']) {
$oCmd = (clone $oIndexCmd)
->addParams('--minrank', $aResult['index-rank']);
->addParams('--minrank', $aResult['index-rank'], '-b');
$oCmd->run();
// echo $oCmd->escapedCmd()."\n";
$oCmd = (clone $oIndexCmd)
->addParams('--minrank', $aResult['index-rank']);
$oCmd->run();
$oDB->exec('update import_status set indexed = true');
@@ -421,9 +423,18 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
// Index file
if (!$aResult['no-index']) {
$oThisIndexCmd = clone($oIndexCmd);
$fCMDStartTime = time();
$oThisIndexCmd = clone($oIndexCmd);
$oThisIndexCmd->addParams('-b');
echo $oThisIndexCmd->escapedCmd()."\n";
$iErrorLevel = $oThisIndexCmd->run();
if ($iErrorLevel) {
echo "Error: $iErrorLevel\n";
exit($iErrorLevel);
}
$oThisIndexCmd = clone($oIndexCmd);
echo $oThisIndexCmd->escapedCmd()."\n";
$iErrorLevel = $oThisIndexCmd->run();
if ($iErrorLevel) {