Merge remote-tracking branch 'upstream/master'

diff --combined sql/functions.sql
index 18ce50dc61b22ade61f067fbab7ad8a41d48b9c7,ae6c73df850de9967c22dbcc6408d4dc5ca8544a..9a1f228d2cb370d5722a6805e7af0eca51450a02
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -256,6 -256,28 +256,28 @@@ END
  $$
  LANGUAGE plpgsql IMMUTABLE;
  
+ CREATE OR REPLACE FUNCTION reverse_place_diameter(rank_search SMALLINT)
+   RETURNS FLOAT
+   AS $$
+ BEGIN
+   IF rank_search <= 4 THEN
+     RETURN 5.0;
+   ELSIF rank_search <= 8 THEN
+     RETURN 1.8;
+   ELSIF rank_search <= 12 THEN
+     RETURN 0.6;
+   ELSIF rank_search <= 17 THEN
+     RETURN 0.16;
+   ELSIF rank_search <= 18 THEN
+     RETURN 0.08;
+   ELSIF rank_search <= 19 THEN
+     RETURN 0.04;
+   END IF;
+ 
+   RETURN 0.02;
+ END;
+ $$
+ LANGUAGE plpgsql IMMUTABLE;
  
  CREATE OR REPLACE FUNCTION get_postcode_rank(country_code VARCHAR(2), postcode TEXT,
                                        OUT rank_search SMALLINT, OUT rank_address SMALLINT)
@@@ -1875,33 -1897,6 +1897,6 @@@ BEGI
    END LOOP;
    --DEBUG: RAISE WARNING 'address computed';
  
-   -- for long ways we should add search terms for the entire length
-   IF st_length(NEW.geometry) > 0.05 THEN
- 
-     location_rank_search := 0;
-     location_distance := 0;
- 
-     FOR location IN SELECT * from getNearFeatures(NEW.partition, NEW.geometry, search_maxrank, isin_tokens) LOOP
- 
-       IF location.rank_address != location_rank_search THEN
-         location_rank_search := location.rank_address;
-         location_distance := location.distance * 1.5;
-       END IF;
- 
-       IF location.rank_search > 4 AND location.distance < location_distance THEN
- 
-         -- Add it to the list of search terms
-         nameaddress_vector := array_merge(nameaddress_vector, location.keywords::integer[]);
-         INSERT INTO place_addressline (place_id, address_place_id, fromarea, isaddress, distance, cached_rank_address)
-           VALUES (NEW.place_id, location.place_id, true, false, location.distance, location.rank_address); 
- 
-       END IF;
- 
-     END LOOP;
- 
-   END IF;
-   --DEBUG: RAISE WARNING 'search terms for long ways added';
- 
    IF NEW.address is not null AND NEW.address ? 'postcode' 
       AND NEW.address->'postcode' not similar to '%(,|;)%' THEN
      NEW.postcode := upper(trim(NEW.address->'postcode'));
@@@ -2462,7 -2457,7 +2457,7 @@@ BEGI
      select placex.place_id, osm_type, osm_id, name,
        CASE WHEN extratags ? 'place' THEN 'place' ELSE class END as class,
        CASE WHEN extratags ? 'place' THEN extratags->'place' ELSE type END as type,
 -      admin_level, fromarea, isaddress,
 +      admin_level, fromarea, isaddress and linked_place_id is NULL as isaddress,
        CASE WHEN address_place_id = for_place_id AND rank_address = 0 THEN 100 WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
        distance,country_code,postcode
        from place_addressline join placex on (address_place_id = placex.place_id) 

diff --combined utils/update.php
index db920826bb0427cabc1e07c27a268e8d0dc859a1,c70bdf5461e25eac9798f87fd78630e35353d3f0..4897872b5fee5998dbc64ba1e1229e76c11e1025
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -5,6 -5,8 +5,8 @@@ require_once(dirname(dirname(__FILE__))
  require_once(CONST_BasePath.'/lib/init-cmd.php');
  ini_set('memory_limit', '800M');
  
+ # (long-opt, short-opt, min-occurs, max-occurs, num-arguments, num-arguments, type, help)
+ 
  $aCMDOptions
  = array(
     'Import / update / index osm data',
@@@ -14,6 -16,7 +16,7 @@@
  
     array('init-updates', '', 0, 1, 0, 0, 'bool', 'Set up database for updating'),
     array('check-for-updates', '', 0, 1, 0, 0, 'bool', 'Check if new updates are available'),
+    array('no-update-functions', '', 0, 1, 0, 0, 'bool', 'Do not update trigger functions to support differential updates (assuming the diff update logic is already present)'),
     array('import-osmosis', '', 0, 1, 0, 0, 'bool', 'Import updates once'),
     array('import-osmosis-all', '', 0, 1, 0, 0, 'bool', 'Import updates forever'),
     array('no-index', '', 0, 1, 0, 0, 'bool', 'Do not index the new data'),
@@@ -40,7 -43,6 +43,7 @@@
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
  if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');
@@@ -57,6 -59,17 +60,17 @@@ if ($iCacheMemory + 500 > getTotalMemor
      echo "WARNING: resetting cache memory to $iCacheMemory\n";
  }
  $sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
+ if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
+     $sOsm2pgsqlCmd .= ' -U ' . $aDSNInfo['username'];
+ }
+ if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
+     $sOsm2pgsqlCmd .= ' -H ' . $aDSNInfo['hostspec'];
+ }
+ $aProcEnv = null;
+ if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
+     $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
+ }
+ 
  if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
      $sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
  }
@@@ -85,11 -98,13 +99,13 @@@ if ($aResult['init-updates']) 
          echo "and have set up CONST_Pyosmium_Binary to point to pyosmium-get-changes.\n";
          fail('pyosmium-get-changes not found or not usable');
      }
-     $sSetup = CONST_InstallPath.'/utils/setup.php';
-     $iRet = -1;
-     passthru($sSetup.' --create-functions --enable-diff-updates', $iRet);
-     if ($iRet != 0) {
-         fail('Error running setup script');
+     if (!$aResult['no-update-functions']) {
+         $sSetup = CONST_InstallPath.'/utils/setup.php';
+         $iRet = -1;
+         passthru($sSetup.' --create-functions --enable-diff-updates', $iRet);
+         if ($iRet != 0) {
+             fail('Error running setup script');
+         }
      }
  
      $sDatabaseDate = getDatabaseDate($oDB);
@@@ -138,7 -153,7 +154,7 @@@ if (isset($aResult['import-diff']) || i
      // Import the file
      $sCMD = $sOsm2pgsqlCmd.' '.$sNextFile;
      echo $sCMD."\n";
-     exec($sCMD, $sJunk, $iErrorLevel);
+     $iErrorLevel = runWithEnv($sCMD, $aProcEnv);
  
      if ($iErrorLevel) {
          fail("Error from osm2pgsql, $iErrorLevel\n");
@@@ -190,7 -205,7 +206,7 @@@ if ($bHaveDiff) 
      // import generated change file
      $sCMD = $sOsm2pgsqlCmd.' '.$sTemporaryFile;
      echo $sCMD."\n";
-     exec($sCMD, $sJunk, $iErrorLevel);
+     $iErrorLevel = runWithEnv($sCMD, $aProcEnv);
      if ($iErrorLevel) {
          fail("osm2pgsql exited with error level $iErrorLevel\n");
      }
@@@ -274,7 -289,15 +290,15 @@@ if ($aResult['recompute-word-counts']) 
  }
  
  if ($aResult['index']) {
-     passthru(CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
+     $sCmd = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank'];
+     if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
+         $sCmd .= ' -H ' . $aDSNInfo['hostspec'];
+     }
+     if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
+         $sCmd .= ' -U ' . $aDSNInfo['username'];
+     }
+ 
+     runWithEnv($sCmd, $aProcEnv);
  }
  
  if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
@@@ -288,6 -311,12 +312,12 @@@
      $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'];
+     if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
+         $sCMDIndex .= ' -H ' . $aDSNInfo['hostspec'];
+     }
+     if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
+         $sCMDIndex .= ' -U ' . $aDSNInfo['username'];
+     }
  
      while (true) {
          $fStartTime = time();
@@@ -355,7 -384,7 +385,7 @@@
              $fCMDStartTime = time();
              echo $sCMDImport."\n";
              unset($sJunk);
-             exec($sCMDImport, $sJunk, $iErrorLevel);
+             $iErrorLevel = runWithEnv($sCMDImport, $aProcEnv);
              if ($iErrorLevel) {
                  echo "Error executing osm2pgsql: $iErrorLevel\n";
                  exit($iErrorLevel);
@@@ -384,7 -413,7 +414,7 @@@
              $fCMDStartTime = time();
  
              echo "$sThisIndexCmd\n";
-             exec($sThisIndexCmd, $sJunk, $iErrorLevel);
+             $iErrorLevel = runWithEnv($sThisIndexCmd, $aProcEnv);
              if ($iErrorLevel) {
                  echo "Error: $iErrorLevel\n";
                  exit($iErrorLevel);