X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/03d6c48ef1bbc4ccd057125db6df015c0f8e53f0..e42d5e09e70aa884873e5d76f0745ed196dc1d9a:/website/search.php

diff --git a/website/search.php b/website/search.php
index a2d8729f..c165b92b 100755
--- a/website/search.php
+++ b/website/search.php
@@ -421,12 +421,12 @@
 				{
 					$aNewPhraseSearches = array();
 
-					foreach($aPhrases[$iPhrase]['wordsets'] as $iWordset => $aWordset)
+					foreach($aPhrases[$iPhrase]['wordsets'] as $aWordset)
 					{
 						$aWordsetSearches = $aSearches;
 
 						// Add all words from this wordset
-						foreach($aWordset as $sToken)
+						foreach($aWordset as $iToken => $sToken)
 						{
 //echo "<br><b>$sToken</b>";
 							$aNewWordsetSearches = array();
@@ -450,7 +450,7 @@
 											{
 												$aSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
 												// Country is almost always at the end of the string - increase score for finding it anywhere else (optimisation)
-												if ($iWordset+1 != sizeof($aPhrases[$iPhrase]['wordsets']) || $iPhrase+1 != sizeof($aPhrases)) $aSearch['iSearchRank'] += 5;
+												if ($iToken+1 != sizeof($aWordset) || $iPhrase+1 != sizeof($aPhrases)) $aSearch['iSearchRank'] += 5;
 												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
 											}
 										}
@@ -730,7 +730,7 @@
 							else
 							{
 								$sSQL = "select place_id from placex where class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'";
-								$sSQL .= " and st_contains($sViewboxSmallSQL, centroid)";
+								$sSQL .= " and st_contains($sViewboxSmallSQL, geometry)";
 								if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";								
 								if ($sViewboxCentreSQL)	$sSQL .= " order by st_distance($sViewboxCentreSQL, centroid) asc";
 								$sSQL .= " limit $iLimit";