X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/70f0d6ba8bc0e8c4115155b27a36e8a9a037d727..5d160ec514af97af2f430bbe9b02360ae4f0767c:/lib/Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 32b50580..6908ac98 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -520,7 +520,7 @@
 				foreach($this->aRoutePoints as $aPoint)
 				{
 					if (!$bFirst) $sViewboxCentreSQL .= ",";
-					$sViewboxCentreSQL .= $aPoint[1].' '.$aPoint[0];
+					$sViewboxCentreSQL .= $aPoint[0].' '.$aPoint[1];
 					$bFirst = false;
 				}
 				$sViewboxCentreSQL .= ")'::geometry,4326)";
@@ -960,7 +960,7 @@
 										{
 											if (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])
 											{
-												if ((!$bStructuredPhrases || $iPhrase > 0) && sizeof($aCurrentSearch['aName']) && strlen($sToken) >= 4)
+												if ((!$bStructuredPhrases || $iPhrase > 0) && sizeof($aCurrentSearch['aName']) && strpos($sToken, ' ') === false)
 												{
 													$aSearch = $aCurrentSearch;
 													$aSearch['iSearchRank'] += 1;
@@ -969,8 +969,11 @@
 														$aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
 														if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
 													}
-													elseif (isset($aValidTokens[' '.$sToken])) // revert to the token version?
+													elseif (isset($aValidTokens[' '.$sToken]) && strlen($sToken) >= 4) // revert to the token version?
 													{
+														$aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
+														$aSearch['iSearchRank'] += 1;
+														if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
 														foreach($aValidTokens[' '.$sToken] as $aSearchTermToken)
 														{
 															if (empty($aSearchTermToken['country_code'])
@@ -987,6 +990,7 @@
 													else
 													{
 														$aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
+														if (preg_match('#^[0-9]+$#', $sToken)) $aSearch['iSearchRank'] += 2;
 														if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
 													}
 												}
@@ -994,7 +998,8 @@
 												if (!sizeof($aCurrentSearch['aName']) || $aCurrentSearch['iNamePhrase'] == $iPhrase)
 												{
 													$aSearch = $aCurrentSearch;
-													$aSearch['iSearchRank'] += 2;
+													$aSearch['iSearchRank'] += 1;
+													if (!sizeof($aCurrentSearch['aName'])) $aSearch['iSearchRank'] += 1;
 													if (preg_match('#^[0-9]+$#', $sToken)) $aSearch['iSearchRank'] += 2;
 													if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency)
 														$aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
@@ -1183,6 +1188,10 @@
 									if (CONST_Debug) var_dump($sSQL);
 									$aPlaceIDs = $this->oDB->getCol($sSQL);
 								}
+								else
+								{
+									$aPlaceIDs = array();
+								}
 							}
 							else
 							{
@@ -1207,7 +1216,8 @@
 									// If excluded place IDs are given, it is fair to assume that
 									// there have been results in the small box, so no further
 									// expansion in that case.
-									if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs))
+									// Also don't expand if bounded results were requested.
+									if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs) && !$this->bBoundedSearch)
 									{
 										$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
 										if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
@@ -1260,7 +1270,21 @@
 								}
 							}
 							if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
-							if ($aSearch['sHouseNumber']) $aTerms[] = "address_rank between 16 and 27";
+							if ($aSearch['sHouseNumber'])
+							{
+								$aTerms[] = "address_rank between 16 and 27";
+							}
+							else
+							{
+								if ($this->iMinAddressRank > 0)
+								{
+									$aTerms[] = "address_rank >= ".$this->iMinAddressRank;
+								}
+								if ($this->iMaxAddressRank < 30)
+								{
+									$aTerms[] = "address_rank <= ".$this->iMaxAddressRank;
+								}
+							}
 							if ($aSearch['fLon'] && $aSearch['fLat'])
 							{
 								$aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")";
@@ -1341,8 +1365,8 @@
 								$sPlaceIDs = join(',',$aPlaceIDs);
 
 								// Now they are indexed look for a house attached to a street we found
-								$sHouseNumberRegex = '\\\\m'.str_replace(' ','[-,/ ]',$aSearch['sHouseNumber']).'\\\\M';
-								$sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and housenumber ~* E'".$sHouseNumberRegex."'";
+								$sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
+								$sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and transliteration(housenumber) ~* E'".$sHouseNumberRegex."'";
 								if (sizeof($this->aExcludePlaceIDs))
 								{
 									$sSQL .= " and place_id not in (".join(',',$this->aExcludePlaceIDs).")";
@@ -1467,7 +1491,7 @@
 											}
 											if ($sCountryCodesSQL) $sSQL .= " and lp.calculated_country_code in ($sCountryCodesSQL)";
 											if ($sOrderBySQL) $sSQL .= "order by ".$sOrderBySQL." asc";
-											if ($iOffset) $sSQL .= " offset $iOffset";
+											if ($this->iOffset) $sSQL .= " offset $this->iOffset";
 											$sSQL .= " limit $this->iLimit";
 											if (CONST_Debug) var_dump($sSQL);
 											$aClassPlaceIDs = array_merge($aClassPlaceIDs, $this->oDB->getCol($sSQL));
@@ -1489,7 +1513,7 @@
 											}
 											if ($sCountryCodesSQL) $sSQL .= " and l.calculated_country_code in ($sCountryCodesSQL)";
 											if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc";
-											if ($iOffset) $sSQL .= " offset $iOffset";
+											if ($this->iOffset) $sSQL .= " offset $this->iOffset";
 											$sSQL .= " limit $this->iLimit";
 											if (CONST_Debug) var_dump($sSQL);
 											$aClassPlaceIDs = array_merge($aClassPlaceIDs, $this->oDB->getCol($sSQL));
@@ -1570,7 +1594,7 @@
 			}
 
 			$aClassType = getClassTypesWithImportance();
-			$aRecheckWords = preg_split('/\b/u',$sQuery);
+			$aRecheckWords = preg_split('/\b[\s,\\-]*/u',$sQuery);
 			foreach($aRecheckWords as $i => $sWord)
 			{
 				if (!$sWord) unset($aRecheckWords[$i]);
@@ -1733,7 +1757,11 @@
 				$sAddress = $aResult['langaddress'];
 				foreach($aRecheckWords as $i => $sWord)
 				{
-					if (stripos($sAddress, $sWord)!==false) $iCountWords++;
+					if (stripos($sAddress, $sWord)!==false)
+					{
+						$iCountWords++;
+						if (preg_match("/(^|,)\s*$sWord\s*(,|$)/", $sAddress)) $iCountWords += 0.1;
+					}
 				}
 
 				$aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1); // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right
@@ -1797,17 +1825,3 @@
 
 	} // end class
 
-
-/*
-		if (isset($_GET['route']) && $_GET['route'] && isset($_GET['routewidth']) && $_GET['routewidth'])
-		{
-			$aPoints = explode(',',$_GET['route']);
-			if (sizeof($aPoints) % 2 != 0)
-			{
-				userError("Uneven number of points");
-				exit;
-			}
-			$sViewboxCentreSQL = "ST_SetSRID('LINESTRING(";
-			$fPrevCoord = false;
-		}
-*/