From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 4 Dec 2013 07:14:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~562
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c603ccce31f031253351353f4056197684d9ff81

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/Geocode.php
	utils/update.php
---

c603ccce31f031253351353f4056197684d9ff81
diff --cc lib/Geocode.php
index 52f66e5b,48518dd3..eda692b0
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -246,17 -245,13 +247,17 @@@
  			// Get the details for display (is this a redundant extra step?)
  			$sPlaceIDs = join(',',$aPlaceIDs);
  
 +			$sImportanceSQL = '';
 +			if ($this->sViewboxSmallSQL) $sImportanceSQL .= " case when ST_Contains($this->sViewboxSmallSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
 +			if ($this->sViewboxLargeSQL) $sImportanceSQL .= " case when ST_Contains($this->sViewboxLargeSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
 +
- 			$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
+ 			$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code,";
  			$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
  			$sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
  			$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
  			$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
 -			$sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
 +			$sSQL .= $sImportanceSQL."coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
- 			$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(placex.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
+ 			$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
  			$sSQL .= "(extratags->'place') as extra_place ";
  			$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
  			$sSQL .= "and (placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
@@@ -280,22 -275,21 +281,22 @@@
  				$sSQL .= "null as placename,";
  				$sSQL .= "null as ref,";
  				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
 -				$sSQL .= "-0.15 as importance, ";
 +				$sSQL .= $sImportanceSQL."-1.15 as importance, ";
- 				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_tiger.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
+ 				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_tiger.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
  				$sSQL .= "null as extra_place ";
  				$sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
  				$sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
  				$sSQL .= "group by place_id";
 -				if (!$this->bDeDupe) $sSQL .= ",place_id";
 +				if (!$this->bDeDupe) $sSQL .= ",place_id ";
 +				/*
  				$sSQL .= " union ";
- 				$sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
+ 				$sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id, min(parent_place_id) as parent_place_id,'us' as country_code,";
  				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
  				$sSQL .= "null as placename,";
  				$sSQL .= "null as ref,";
  				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
 -				$sSQL .= "-0.10 as importance, ";
 +				$sSQL .= $sImportanceSQL."-1.10 as importance, ";
- 				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
+ 				$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
  				$sSQL .= "null as extra_place ";
  				$sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
  				$sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
diff --cc utils/update.php
index 7448348f,8dd1dfc3..256d5a15
--- a/utils/update.php
+++ b/utils/update.php
@@@ -359,8 -361,7 +360,8 @@@
  
  	if ($aResult['index'])
  	{
 +		if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
- 		passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
+ 		passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
  	}
  
  	if ($aResult['import-osmosis'] || $aResult['import-osmosis-all'])
@@@ -377,7 -378,7 +378,7 @@@
  		$sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
  		$sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
  		$sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
- 		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'];
 -		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
++		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
  		if (!$aResult['no-npi']) {
  			$sCMDIndex .= '-F ';
  		}