Merge remote-tracking branch 'upstream/master'

diff --combined utils/update.php
index d4dc60c5278622713df2439643142197afc966f1,ca700f0bd8a676628f377bd55f577429cf537cab..334ad123c41445eb0e9c4dce6435128125dcb952
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -15,10 -15,9 +15,9 @@@ $aCMDOption
     array('init-updates', '', 0, 1, 0, 0, 'bool', 'Set up database for updating'),
     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-npi', '', 0, 1, 0, 0, 'bool', '(obsolate)'),
     array('no-index', '', 0, 1, 0, 0, 'bool', 'Do not index the new data'),
  
-    array('import-all', '', 0, 1, 0, 0, 'bool', 'Import all available files'),
+    array('calculate-postcodes', '', 0, 1, 0, 0, 'bool', 'Update postcode centroid table'),
  
     array('import-file', '', 0, 1, 1, 1, 'realpath', 'Re-import data from an OSM file'),
     array('import-diff', '', 0, 1, 1, 1, 'realpath', 'Import a diff (osc) file from local file system'),
@@@ -34,11 -33,11 +33,12 @@@
     array('index-instances', '', 0, 1, 1, 1, 'int', 'Number of indexing instances (threads)'),
  
     array('deduplicate', '', 0, 1, 0, 0, 'bool', 'Deduplicate tokens'),
+    array('no-npi', '', 0, 1, 0, 0, 'bool', '(obsolete)'),
    );
  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');
@@@ -102,6 -101,7 +102,7 @@@ if ($aResult['init-updates']) 
  if (isset($aResult['import-diff']) || isset($aResult['import-file'])) {
      // import diffs and files directly (e.g. from osmosis --rri)
      $sNextFile = isset($aResult['import-diff']) ? $aResult['import-diff'] : $aResult['import-file'];
+ 
      if (!file_exists($sNextFile)) {
          fail("Cannot open $sNextFile\n");
      }
@@@ -118,6 -118,12 +119,12 @@@
      // Don't update the import status - we don't know what this file contains
  }
  
+ if ($aResult['calculate-postcodes']) {
+     info("Update postcodes centroids");
+     $sTemplate = file_get_contents(CONST_BasePath.'/sql/update-postcodes.sql');
+     runSQLScript($sTemplate, true, true);
+ }
+ 
  $sTemporaryFile = CONST_BasePath.'/data/osmosischange.osc';
  $bHaveDiff = false;
  $bUseOSMApi = isset($aResult['import-from-main-api']) && $aResult['import-from-main-api'];