X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b0521f5150093d7b1481bf2739e89a909ec18a56..8ffa5be81fddc6e82df7466cd3f07cad873a440c:/utils/setup.php?ds=sidebyside

diff --git a/utils/setup.php b/utils/setup.php
index 6b0a5b37..90474fcf 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -154,6 +154,11 @@
 			echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
 			fail("osm2pgsql not found in '$osm2pgsql'");
 		}
+
+		if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+		{
+			$osm2pgsql .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+		}
 		$osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
 		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
 		$osm2pgsql .= ' -C 16000';
@@ -498,75 +503,80 @@
 		if (!file_exists(CONST_Osmosis_Binary))
 		{
 			echo "Please download osmosis.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
-			fail("osmosis not found in '".CONST_Osmosis_Binary."'");
-		}
-		if (file_exists(CONST_BasePath.'/settings/configuration.txt'))
-		{
-			echo "settings/configuration.txt already exists\n";
+			if (!$aCMDResult['all'])
+			{
+				fail("osmosis not found in '".CONST_Osmosis_Binary."'");
+			}
 		}
 		else
 		{
-			passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings');
-			// update osmosis configuration.txt with our settings
-			passthru("sed -i 's!baseUrl=.*!baseUrl=".CONST_Replication_Url."!' ".CONST_BasePath.'/settings/configuration.txt');
-			passthru("sed -i 's:maxInterval = .*:maxInterval = ".CONST_Replication_MaxInterval.":' ".CONST_BasePath.'/settings/configuration.txt');
-		}
-
-		// Find the last node in the DB
-		$iLastOSMID = $oDB->getOne("select max(id) from planet_osm_nodes");
-
-		// Lookup the timestamp that node was created (less 3 hours for margin for changsets to be closed)
-		$sLastNodeURL = 'http://www.openstreetmap.org/api/0.6/node/'.$iLastOSMID."/1";
-		$sLastNodeXML = file_get_contents($sLastNodeURL);
-		preg_match('#timestamp="(([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z)"#', $sLastNodeXML, $aLastNodeDate);
-		$iLastNodeTimestamp = strtotime($aLastNodeDate[1]) - (3*60*60);
-
+			if (file_exists(CONST_BasePath.'/settings/configuration.txt'))
+			{
+				echo "settings/configuration.txt already exists\n";
+			}
+			else
+			{
+				passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings');
+				// update osmosis configuration.txt with our settings
+				passthru("sed -i 's!baseUrl=.*!baseUrl=".CONST_Replication_Url."!' ".CONST_BasePath.'/settings/configuration.txt');
+				passthru("sed -i 's:maxInterval = .*:maxInterval = ".CONST_Replication_MaxInterval.":' ".CONST_BasePath.'/settings/configuration.txt');
+			}
 
-		// Search for the correct state file - uses file timestamps so need to sort by date descending
-		$sRepURL = CONST_Replication_Url."/";
-		$sRep = file_get_contents($sRepURL."?C=M;O=D");
-		// download.geofabrik.de:    <a href="000/">000/</a></td><td align="right">26-Feb-2013 11:53  </td>
-		// planet.openstreetmap.org: <a href="273/">273/</a>                    22-Mar-2013 07:41    -
-		preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
-		$aPrevRepMatch = false;
-		foreach($aRepMatches as $aRepMatch)
-		{
-			if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
-			$aPrevRepMatch = $aRepMatch;
-		}
-		if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
+			// Find the last node in the DB
+			$iLastOSMID = $oDB->getOne("select max(id) from planet_osm_nodes");
+
+			// Lookup the timestamp that node was created (less 3 hours for margin for changsets to be closed)
+			$sLastNodeURL = 'http://www.openstreetmap.org/api/0.6/node/'.$iLastOSMID."/1";
+			$sLastNodeXML = file_get_contents($sLastNodeURL);
+			preg_match('#timestamp="(([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z)"#', $sLastNodeXML, $aLastNodeDate);
+			$iLastNodeTimestamp = strtotime($aLastNodeDate[1]) - (3*60*60);
+
+			// Search for the correct state file - uses file timestamps so need to sort by date descending
+			$sRepURL = CONST_Replication_Url."/";
+			$sRep = file_get_contents($sRepURL."?C=M;O=D");
+			// download.geofabrik.de:    <a href="000/">000/</a></td><td align="right">26-Feb-2013 11:53  </td>
+			// planet.openstreetmap.org: <a href="273/">273/</a>                    22-Mar-2013 07:41    -
+			preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
+			$aPrevRepMatch = false;
+			foreach($aRepMatches as $aRepMatch)
+			{
+				if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
+				$aPrevRepMatch = $aRepMatch;
+			}
+			if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
 
-		$sRepURL .= $aRepMatch[1];
-		$sRep = file_get_contents($sRepURL."?C=M;O=D");
-		preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
-		$aPrevRepMatch = false;
-		foreach($aRepMatches as $aRepMatch)
-		{
-			if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
-			$aPrevRepMatch = $aRepMatch;
-		}
-		if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
+			$sRepURL .= $aRepMatch[1];
+			$sRep = file_get_contents($sRepURL."?C=M;O=D");
+			preg_match_all('#<a href="[0-9]{3}/">([0-9]{3}/)</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
+			$aPrevRepMatch = false;
+			foreach($aRepMatches as $aRepMatch)
+			{
+				if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
+				$aPrevRepMatch = $aRepMatch;
+			}
+			if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
 
-		$sRepURL .= $aRepMatch[1];
-		$sRep = file_get_contents($sRepURL."?C=M;O=D");
-		preg_match_all('#<a href="[0-9]{3}.state.txt">([0-9]{3}).state.txt</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
-		$aPrevRepMatch = false;
-		foreach($aRepMatches as $aRepMatch)
-		{
-			if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
-			$aPrevRepMatch = $aRepMatch;
+			$sRepURL .= $aRepMatch[1];
+			$sRep = file_get_contents($sRepURL."?C=M;O=D");
+			preg_match_all('#<a href="[0-9]{3}.state.txt">([0-9]{3}).state.txt</a>.*(([0-9]{2})-([A-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}))#', $sRep, $aRepMatches, PREG_SET_ORDER);
+			$aPrevRepMatch = false;
+			foreach($aRepMatches as $aRepMatch)
+			{
+				if (strtotime($aRepMatch[2]) < $iLastNodeTimestamp) break;
+				$aPrevRepMatch = $aRepMatch;
+			}
+			if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
+
+			$sRepURL .= $aRepMatch[1].'.state.txt';
+			echo "Getting state file: $sRepURL\n";
+			$sStateFile = file_get_contents($sRepURL);
+			if (!$sStateFile || strlen($sStateFile) > 1000) fail("unable to obtain state file");
+			file_put_contents(CONST_BasePath.'/settings/state.txt', $sStateFile);
+			echo "Updating DB status\n";
+			pg_query($oDB->connection, 'TRUNCATE import_status');
+			$sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')";
+			pg_query($oDB->connection, $sSQL);
 		}
-		if ($aPrevRepMatch) $aRepMatch = $aPrevRepMatch;
-
-		$sRepURL .= $aRepMatch[1].'.state.txt';
-		echo "Getting state file: $sRepURL\n";
-		$sStateFile = file_get_contents($sRepURL);
-		if (!$sStateFile || strlen($sStateFile) > 1000) fail("unable to obtain state file");
-		file_put_contents(CONST_BasePath.'/settings/state.txt', $sStateFile);
-		echo "Updating DB status\n";
-		pg_query($oDB->connection, 'TRUNCATE import_status');
-		$sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')";
-		pg_query($oDB->connection, $sSQL);
 	}
 
 	if ($aCMDResult['index'] || $aCMDResult['all'])
@@ -631,6 +641,13 @@
 		@symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
 		@symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
 		echo "Symlinks created\n";
+
+		$sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/tiles.js');
+		if (!$sTestFile)
+		{
+			echo "\nWARNING: Unable to access the website at ".CONST_Website_BaseURL."\n";
+			echo "You may want to update settings/local.php with @define('CONST_Website_BaseURL', 'http://[HOST]/[PATH]/');\n";
+		}
 	}
 
 	if (!$bDidSomething)