X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/11153633ffdf9631d411bd6ea1999cd90a5bd98b..1d248ac86db873873bc06896573e3dd81113ff5f:/lib/Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index cc846f54..7563a26d 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1181,6 +1181,10 @@
 									if (CONST_Debug) var_dump($sSQL);
 									$aPlaceIDs = $this->oDB->getCol($sSQL);
 								}
+								else
+								{
+									$aPlaceIDs = array();
+								}
 							}
 							else
 							{
@@ -1339,8 +1343,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).")";
@@ -1463,7 +1467,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));
@@ -1485,7 +1489,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));
@@ -1566,7 +1570,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]);
@@ -1727,7 +1731,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