From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 29 Oct 2014 20:03:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~506
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/59540972b64aff5351e4fc8654d5c1100c88dfc6?hp=-c

Merge remote-tracking branch 'upstream/master'
---

59540972b64aff5351e4fc8654d5c1100c88dfc6
diff --combined utils/setup.php
index cece8686,42a132bf..32b56700
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -112,7 -112,7 +112,7 @@@
  		$oDB =& getDB();
  
  		$sVersionString = $oDB->getOne('select version()');
- 		preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[.]([0-9]+) #', $sVersionString, $aMatches);
+ 		preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[^0-9]#', $sVersionString, $aMatches);
  		if (CONST_Postgresql_Version != $aMatches[1].'.'.$aMatches[2])
  		{
  			echo "ERROR: PostgreSQL version is not correct.  Expected ".CONST_Postgresql_Version." found ".$aMatches[1].'.'.$aMatches[2]."\n";
@@@ -191,9 -191,8 +191,9 @@@
  		{
  			$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 '.$iCacheMemory;
 +		$osm2pgsql .= ' -C 25000';
  		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
  		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
  		passthruCheckReturn($osm2pgsql);
@@@ -527,7 -526,7 +527,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) ";