X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9ab59cdf423777105470235363919018a8cc25bb..70f0d6ba8bc0e8c4115155b27a36e8a9a037d727:/lib/Geocode.php?ds=sidebyside

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 532a7720..32b50580 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -204,6 +204,98 @@
 			return $this->sQuery;
 		}
 
+
+		function loadParamArray($aParams)
+		{
+			if (isset($aParams['addressdetails'])) $this->bIncludeAddressDetails = (bool)$aParams['addressdetails'];
+			if (isset($aParams['bounded'])) $this->bBoundedSearch = (bool)$aParams['bounded'];
+			if (isset($aParams['dedupe'])) $this->bDeDupe = (bool)$aParams['dedupe'];
+
+			if (isset($aParams['limit'])) $this->setLimit((int)$aParams['limit']);
+			if (isset($aParams['offset'])) $this->iOffset = (int)$aParams['offset'];
+
+			if (isset($aParams['fallback'])) $this->bFallback = (bool)$aParams['fallback'];
+
+			// List of excluded Place IDs - used for more acurate pageing
+			if (isset($aParams['exclude_place_ids']) && $aParams['exclude_place_ids'])
+			{
+				foreach(explode(',',$aParams['exclude_place_ids']) as $iExcludedPlaceID)
+				{
+					$iExcludedPlaceID = (int)$iExcludedPlaceID;
+					if ($iExcludedPlaceID) $aExcludePlaceIDs[$iExcludedPlaceID] = $iExcludedPlaceID;
+				}
+				$this->aExcludePlaceIDs = $aExcludePlaceIDs;
+			}
+
+			// Only certain ranks of feature
+			if (isset($aParams['featureType'])) $this->setFeatureType($aParams['featureType']);
+			if (isset($aParams['featuretype'])) $this->setFeatureType($aParams['featuretype']);
+
+			// Country code list
+			if (isset($aParams['countrycodes']))
+			{
+				$aCountryCodes = array();
+				foreach(explode(',',$aParams['countrycodes']) as $sCountryCode)
+				{
+					if (preg_match('/^[a-zA-Z][a-zA-Z]$/', $sCountryCode))
+					{
+						$aCountryCodes[] = strtolower($sCountryCode);
+					}
+				}
+				$this->aCountryCodes = $aCountryCodes;
+			}
+
+			if (isset($aParams['viewboxlbrt']) && $aParams['viewboxlbrt'])
+			{
+				$aCoOrdinatesLBRT = explode(',',$aParams['viewboxlbrt']);
+				$this->setViewBox($aCoOrdinatesLBRT[0], $aCoOrdinatesLBRT[1], $aCoOrdinatesLBRT[2], $aCoOrdinatesLBRT[3]);
+			}
+			else if (isset($aParams['viewbox']) && $aParams['viewbox'])
+			{
+				$aCoOrdinatesLTRB = explode(',',$aParams['viewbox']);
+				$this->setViewBox($aCoOrdinatesLTRB[0], $aCoOrdinatesLTRB[3], $aCoOrdinatesLTRB[2], $aCoOrdinatesLTRB[1]);
+			}
+
+			if (isset($aParams['route']) && $aParams['route'] && isset($aParams['routewidth']) && $aParams['routewidth'])
+			{
+				$aPoints = explode(',',$aParams['route']);
+				if (sizeof($aPoints) % 2 != 0)
+				{
+					userError("Uneven number of points");
+					exit;
+				}
+				$fPrevCoord = false;
+				$aRoute = array();
+				foreach($aPoints as $i => $fPoint)
+				{
+					if ($i%2)
+					{
+						$aRoute[] = array((float)$fPoint, $fPrevCoord);
+					}
+					else
+					{
+						$fPrevCoord = (float)$fPoint;
+					}
+				}
+				$this->aRoutePoints = $aRoute;
+			}
+		}
+
+		function setQueryFromParams($aParams)
+		{
+			// Search query
+			$sQuery = (isset($aParams['q'])?trim($aParams['q']):'');
+			if (!$sQuery)
+			{
+				$this->setStructuredQuery(@$aParams['amenity'], @$aParams['street'], @$aParams['city'], @$aParams['county'], @$aParams['state'], @$aParams['country'], @$aParams['postalcode']);
+				$this->setReverseInPlan(false);
+			}
+			else
+			{
+				$this->setQuery($sQuery);
+			}
+		}
+
 		function loadStructuredAddressElement($sValue, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank, $aItemListValues)
 		{
 			$sValue = trim($sValue);
@@ -393,20 +485,18 @@
 				$sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
 			}
 
-			// Hack to make it handle "new york, ny" (and variants) correctly
-			//$sQuery = str_ireplace(array('New York, ny','new york, new york', 'New York ny','new york new york'), 'new york city, ny', $this->sQuery);
 			$sQuery = $this->sQuery;
 
 			// Conflicts between US state abreviations and various words for 'the' in different languages
 			if (isset($this->aLangPrefOrder['name:en']))
 			{
-				$sQuery = preg_replace('/,\s*il\s*(,|$)/',', illinois\1', $sQuery);
-				$sQuery = preg_replace('/,\s*al\s*(,|$)/',', alabama\1', $sQuery);
-				$sQuery = preg_replace('/,\s*la\s*(,|$)/',', louisiana\1', $sQuery);
+				$sQuery = preg_replace('/(^|,)\s*il\s*(,|$)/','\1illinois\2', $sQuery);
+				$sQuery = preg_replace('/(^|,)\s*al\s*(,|$)/','\1alabama\2', $sQuery);
+				$sQuery = preg_replace('/(^|,)\s*la\s*(,|$)/','\1louisiana\2', $sQuery);
 			}
 
 			// View Box SQL
-			$sViewboxCentreSQL;
+			$sViewboxCentreSQL = false;
 			$bBoundingBoxSearch = false;
 			if ($this->aViewBox)
 			{
@@ -802,6 +892,9 @@
 												if ($aSearch['sHouseNumber'] === '')
 												{
 													$aSearch['sHouseNumber'] = $sToken;
+													// sanity check: if the housenumber is not mainly made
+													// up of numbers, add a penalty
+													if (preg_match_all("/[^0-9]/", $sToken, $aMatches) > 2) $aSearch['iSearchRank']++;
 													if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
 													/*
 													// Fall back to not searching for this item (better than nothing)
@@ -1185,9 +1278,17 @@
 							if ($bBoundingBoxSearch) $aTerms[] = "centroid && $this->sViewboxSmallSQL";
 							if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";
 
-							$sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
+							if ($aSearch['sHouseNumber'])
+							{
+								$sImportanceSQL = '- abs(26 - address_rank) + 3';
+							}
+							else
+							{
+								$sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
+							}
 							if ($this->sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($this->sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
 							if ($this->sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($this->sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
+
 							$aOrder[] = "$sImportanceSQL DESC";
 							if (sizeof($aSearch['aFullNameAddress']))
 							{
@@ -1596,7 +1697,7 @@
 							$aResult['aPolyPoints'][] = array($aPoint[1], $aPoint[2]);
 						}
 					}
-					$aResult['aBoundingBox'] = array($aPointPolygon['minlat'],$aPointPolygon['maxlat'],$aPointPolygon['minlon'],$aPointPolygon['maxlon']);
+					$aResult['aBoundingBox'] = array((string)$aPointPolygon['minlat'],(string)$aPointPolygon['maxlat'],(string)$aPointPolygon['minlon'],(string)$aPointPolygon['maxlon']);
 				}
 
 				// Is there an icon set for this type of result?