get precomputed housenumbers and postcodes from address column

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index b106c56740907a6c225127557e282cdcb392f80d..2b72fe821e0e390fa9ea5f5690758d8ec6aaa63f 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -72,7 +72,7 @@ if ($aResult['init-updates']) {
 
     // get the appropriate state id
     $aOutput = 0;
 
     // get the appropriate state id
     $aOutput = 0;

-    exec(CONST_Pyosmium_Get_Changes.' -D '.$sWindBack.' --server '.CONST_Replication_Url,
+    exec(CONST_Pyosmium_Binary.' -D '.$sWindBack.' --server '.CONST_Replication_Url,

         $aOutput, $iRet);
     if ($iRet != 0) {
         fail('Error running pyosmium tools');
         $aOutput, $iRet);
     if ($iRet != 0) {
         fail('Error running pyosmium tools');


@@ -232,7 +232,7 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
     }
 
     $sImportFile = CONST_InstallPath.'/osmosischange.osc';
     }
 
     $sImportFile = CONST_InstallPath.'/osmosischange.osc';

-    $sCMDDownload = CONST_Pyosmium_Get_Changes.' --server '.CONST_Replication_Url.' -o '.$sImportFile.' -s '.CONST_Replication_Max_Diff_size;
+    $sCMDDownload = CONST_Pyosmium_Binary.' --server '.CONST_Replication_Url.' -o '.$sImportFile.' -s '.CONST_Replication_Max_Diff_size;

     $sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
     $sCMDIndex = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
 
     $sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
     $sCMDIndex = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
 


@@ -262,12 +262,12 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
             }
 
             // Download the next batch of changes.
             }
 
             // Download the next batch of changes.

-            unlink($sImportFile);

             do {
                 $fCMDStartTime = time();
             do {
                 $fCMDStartTime = time();

-                $iNextSeq = (int) $aLastState['sequence_id'] + 1;
+                $iNextSeq = (int) $aLastState['sequence_id'];

                 unset($aOutput);
                 echo "$sCMDDownload -I $iNextSeq\n";
                 unset($aOutput);
                 echo "$sCMDDownload -I $iNextSeq\n";

+                unlink($sImportFile);

                 exec($sCMDDownload.' -I '.$iNextSeq, $aOutput, $iResult);
 
                 if ($iResult == 3) {
                 exec($sCMDDownload.' -I '.$iNextSeq, $aOutput, $iResult);
 
                 if ($iResult == 3) {