From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 14 May 2016 19:09:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'markus/master' into master
X-Git-Tag: v3.0.0~170^2~11
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/234b1b0293aff8fe8bd13df986805e7d1b39bca2?ds=inline;hp=-c

Merge remote-tracking branch 'markus/master' into master
---

234b1b0293aff8fe8bd13df986805e7d1b39bca2
diff --combined utils/setup.php
index 01402842,166dfee9..b9045e70
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -353,6 -353,8 +353,8 @@@
  		echo '.';
  		if (!pg_query($oDB->connection, 'TRUNCATE placex')) fail(pg_last_error($oDB->connection));
  		echo '.';
+ 		if (!pg_query($oDB->connection, 'TRUNCATE location_property_osmline')) fail(pg_last_error($oDB->connection));
+ 		echo '.';
  		if (!pg_query($oDB->connection, 'TRUNCATE place_addressline')) fail(pg_last_error($oDB->connection));
  		echo '.';
  		if (!pg_query($oDB->connection, 'TRUNCATE place_boundingbox')) fail(pg_last_error($oDB->connection));
@@@ -397,9 -399,19 +399,19 @@@
  		for($i = 0; $i < $iInstances; $i++)
  		{
  			$aDBInstances[$i] =& getDB(true);
- 			$sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, ';
- 			$sSQL .= 'housenumber, street, addr_place, isin, postcode, country_code, extratags, ';
- 			$sSQL .= 'geometry) select * from place where osm_id % '.$iInstances.' = '.$i;
+ 			if( $i < $iInstances-1 )
+ 			{
+ 				$sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, ';
+ 				$sSQL .= 'housenumber, street, addr_place, isin, postcode, country_code, extratags, ';
+ 				$sSQL .= 'geometry) select * from place where osm_id % '.$iInstances-1.' = '.$i;
+ 			}
+ 			else
+ 			{
+ 				// last thread for interpolation lines
+ 				$sSQL = 'select insert_osmline (osm_id, housenumber, street, addr_place, postcode, country_code, ';
+ 				$sSQL .= 'geometry) from place where ';
+ 				$sSQL .= 'class=\'place\' and type=\'houses\' and osm_type=\'W\' and ST_GeometryType(geometry) = \'ST_LineString\'';
+ 			}
  			if ($aCMDResult['verbose']) echo "$sSQL\n";
  			if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection));
  		}
@@@ -656,7 -668,7 +668,7 @@@
  		@symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
  		echo "Symlinks created\n";
  
 -		$sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/tiles.js');
 +		$sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/nominatim-ui.js');
  		if (!$sTestFile)
  		{
  			echo "\nWARNING: Unable to access the website at ".CONST_Website_BaseURL."\n";