X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f156da6b63e4a3e6a65ec49d2943b88255adb4c6..357a99c0ef86cd4d3276c7dd215b58f78640515a:/utils/setup.php?ds=sidebyside

diff --git a/utils/setup.php b/utils/setup.php
index be385698..3b04b161 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -33,7 +33,6 @@
 		array('disable-token-precalc', '', 0, 1, 0, 0, 'bool', 'Disable name precalculation (EXPERT)'),
 		array('import-tiger-data', '', 0, 1, 0, 0, 'bool', 'Import tiger data (not included in \'all\')'),
 		array('calculate-postcodes', '', 0, 1, 0, 0, 'bool', 'Calculate postcode centroids'),
-		array('create-roads', '', 0, 1, 0, 0, 'bool', ''),
 		array('osmosis-init', '', 0, 1, 0, 0, 'bool', 'Generate default osmosis configuration'),
 		array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'),
 		array('index-noanalyse', '', 0, 1, 0, 0, 'bool', 'Do not perform analyse operations during index (EXPERT)'),
@@ -200,7 +199,7 @@
 		if (CONST_Tablespace_Place_Index)
 			$osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
 		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
-		$osm2pgsql .= ' -C '.$iCacheMemory;
+		$osm2pgsql .= ' -C 25000';
 		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
 		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
 		passthruCheckReturn($osm2pgsql);
@@ -467,35 +466,6 @@
 		pgsqlRunScript('ANALYSE');
 	}
 
-	if ($aCMDResult['create-roads'])
-	{
-		$bDidSomething = true;
-
-		$oDB =& getDB();
-		$aDBInstances = array();
-		for($i = 0; $i < $iInstances; $i++)
-		{
-			$aDBInstances[$i] =& getDB(true);
-			if (!pg_query($aDBInstances[$i]->connection, 'set enable_bitmapscan = off')) fail(pg_last_error($oDB->connection));
-			$sSQL = 'select count(*) from (select insertLocationRoad(partition, place_id, calculated_country_code, geometry) from ';
-			$sSQL .= 'placex where osm_id % '.$iInstances.' = '.$i.' and rank_search between 26 and 27 and class = \'highway\') as x ';
-			if ($aCMDResult['verbose']) echo "$sSQL\n";
-			if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection));
-		}
-		$bAnyBusy = true;
-		while($bAnyBusy)
-		{
-			$bAnyBusy = false;
-			for($i = 0; $i < $iInstances; $i++)
-			{
-				if (pg_connection_busy($aDBInstances[$i]->connection)) $bAnyBusy = true;
-			}
-			sleep(1);
-			echo '.';
-		}
-		echo "\n";
-	}
-
 	if ($aCMDResult['import-tiger-data'])
 	{
 		$bDidSomething = true;
@@ -576,7 +546,7 @@
 		$sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',postcode,calculated_country_code,";
 		$sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from (select calculated_country_code,postcode,";
 		$sSQL .= "avg(st_x(st_centroid(geometry))) as x,avg(st_y(st_centroid(geometry))) as y ";
-		$sSQL .= "from placex where postcode is not null group by calculated_country_code,postcode) as x";
+		$sSQL .= "from placex where postcode is not null and calculated_country_code not in ('ie') group by calculated_country_code,postcode) as x";
 		if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
 
 		$sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,calculated_country_code,geometry) ";
@@ -613,7 +583,7 @@
 			}
 
 			// Find the last node in the DB
-			$iLastOSMID = $oDB->getOne("select max(id) from planet_osm_nodes");
+			$iLastOSMID = $oDB->getOne("select max(osm_id) from place where osm_type = 'N'");
 
 			// 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";