X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/91d72617e6d90dac20968ac34b6d981226280ffe..11a6b8a6e23a150d6e9e6d0094ef4613df4650a5:/website/search.php

diff --git a/website/search.php b/website/search.php
index 11c98c69..a3a926fd 100755
--- a/website/search.php
+++ b/website/search.php
@@ -3,7 +3,7 @@
 
 	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
-        require_once(CONST_BasePath.'/lib/Geocode.php');
+	require_once(CONST_BasePath.'/lib/Geocode.php');
 
 	ini_set('memory_limit', '200M');
 
@@ -20,12 +20,12 @@
 	$aLangPrefOrder = getPreferredLanguages();
 	$oGeocode->setLanguagePreference($aLangPrefOrder);
 
-	if (isset($_GET['addressdetails'])) $oGeocode->setIncludeAddressDetails((bool)$_GET['addressdetails']);
-	if (isset($_GET['bounded'])) $oGeocode->setBounded((bool)$_GET['bounded']);
-	if (isset($_GET['dedupe'])) $oGeocode->setDedupe((bool)$_GET['dedupe']);
-
-	if (isset($_GET['limit'])) $oGeocode->setLimit((int)$_GET['limit']);
-	if (isset($_GET['offset'])) $oGeocode->setOffset((int)$_GET['offset']);
+    /*
+	if (isset($aLangPrefOrder['name:de'])) $oGeocode->setReverseInPlan(true);
+	if (isset($aLangPrefOrder['name:ru'])) $oGeocode->setReverseInPlan(true);
+	if (isset($aLangPrefOrder['name:ja'])) $oGeocode->setReverseInPlan(true);
+	if (isset($aLangPrefOrder['name:pl'])) $oGeocode->setReverseInPlan(true);
+    */
 
 	// Format for output
 	$sOutputFormat = 'html';
@@ -63,108 +63,48 @@
 			}
 			exit;
 		}
-		$oGeocode->setIncludePolygonAsText($bAsPoints);
+		$oGeocode->setIncludePolygonAsPoints($bAsPoints);
 		$oGeocode->setIncludePolygonAsText($bAsText);
 		$oGeocode->setIncludePolygonAsGeoJSON($bAsGeoJSON);
 		$oGeocode->setIncludePolygonAsKML($bAsKML);
 		$oGeocode->setIncludePolygonAsSVG($bAsSVG);
 	}
 
-	// List of excluded Place IDs - used for more acurate pageing
-	if (isset($_GET['exclude_place_ids']) && $_GET['exclude_place_ids'])
-	{
-		foreach(explode(',',$_GET['exclude_place_ids']) as $iExcludedPlaceID)
-		{
-			$iExcludedPlaceID = (int)$iExcludedPlaceID;
-			if ($iExcludedPlaceID) $aExcludePlaceIDs[$iExcludedPlaceID] = $iExcludedPlaceID;
-		}
-		$oGeocode->setExcludedPlaceIds($aExcludePlaceIDs);
-	}
-
-	// Only certain ranks of feature
-	if (isset($_GET['featureType'])) $oGeocode->setFeatureType($_GET['featureType']);
-	if (isset($_GET['featuretype'])) $oGeocode->setFeatureType($_GET['featuretype']);
-
-	// Country code list
-	if (isset($_GET['countrycodes']))
-	{
-		$aCountryCodes = array();
-		foreach(explode(',',$_GET['countrycodes']) as $sCountryCode)
-		{
-			if (preg_match('/^[a-zA-Z][a-zA-Z]$/', $sCountryCode))
-			{
-				$aCountryCodes[] = strtolower($sCountryCode);
-			}
-		}
-		$oGeocode->setCountryCodeList($aCountryCodes);
-	}
-
-	if (isset($_GET['viewboxlbrt']) && $_GET['viewboxlbrt'])
-	{
-		$aCoOrdinatesLBRT = explode(',',$_GET['viewboxlbrt']);
-		$oGeocode->setViewBox($aCoOrdinatesLBRT[0], $aCoOrdinatesLBRT[1], $aCoOrdinatesLBRT[2], $aCoOrdinatesLBRT[3]);
-	}
-
-	if (isset($_GET['viewbox']) && $_GET['viewbox'])
-	{
-		$aCoOrdinatesLTRB = explode(',',$_GET['viewbox']);
-		$oGeocode->setViewBox($aCoOrdinatesLTRB[0], $aCoOrdinatesLTRB[3], $aCoOrdinatesLTRB[2], $aCoOrdinatesLTRB[1]);
-	}
-
-	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;
-		}
-		$fPrevCoord = false;
-		$aRoute = array();
-		foreach($aPoints as $i => $fPoint)
-		{
-			if ($i%2)
-			{
-				$aRoute[] = array((float)$fPoint, $fPrevCoord);
-			}
-			else
-			{
-				$fPrevCoord = (float)$fPoint;
-			}
-		}
-		$oGeocode->setRoute($aRoute);
-	}
-
-	// Search query
-	$sQuery = (isset($_GET['q'])?trim($_GET['q']):'');
-	if (!$sQuery && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
-	{
-		$sQuery = substr($_SERVER['PATH_INFO'], 1);
+	$oGeocode->loadParamArray($_GET);
 
-		// reverse order of '/' separated string
-		$aPhrases = explode('/', $sQuery);
-		$aPhrases = array_reverse($aPhrases);
-		$sQuery = join(', ',$aPhrases);
-	}
-	if (!$sQuery)
-	{
-		$oGeocode->setStructuredQuery(@$_GET['amenity'], @$_GET['street'], @$_GET['city'], @$_GET['county'], @$_GET['state'], @$_GET['country'], @$_GET['postalcode']);
-	}
-	else
-	{
-		$oGeocode->setQuery($sQuery);
-	}
-
-	$hLog = logStart($oDB, 'search', $sQuery, $aLangPrefOrder);
-
-	if (isset($_GET['batch']))
+	if (CONST_Search_BatchMode && isset($_GET['batch']))
 	{
 		$aBatch = json_decode($_GET['batch'], true);
-		foreach($aBatch as $aItem) {
-			var_dump($aItem);
+		$aBatchResults = array();
+		foreach($aBatch as $aBatchParams)
+		{
+			$oBatchGeocode = clone $oGeocode;
+			$oBatchGeocode->loadParamArray($aBatchParams);
+			$oBatchGeocode->setQueryFromParams($aBatchParams);
+			$aSearchResults = $oBatchGeocode->lookup();
+			$aBatchResults[] = $aSearchResults;
 		}
+		include(CONST_BasePath.'/lib/template/search-batch-json.php');
 		exit;
-	}
+	} else {
+        if (!(isset($_GET['q']) && $_GET['q']) && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
+        {
+            $sQuery = substr($_SERVER['PATH_INFO'], 1);
+
+            // reverse order of '/' separated string
+            $aPhrases = explode('/', $sQuery);
+            $aPhrases = array_reverse($aPhrases);
+            $sQuery = join(', ',$aPhrases);
+            $oGeocode->setQuery($sQuery);
+        }
+        else
+        {
+            $oGeocode->setQueryFromParams($_GET);
+        }
+
+    }
+
+	$hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
 
 	$aSearchResults = $oGeocode->lookup();
 	if ($aSearchResults === false) $aSearchResults = array();
@@ -175,12 +115,15 @@
 
 	$bAsText = $oGeocode->getIncludePolygonAsText();
 	$sQuery = $oGeocode->getQueryString();
+	$sViewBox = $oGeocode->getViewBoxString();
+	$bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
+	$aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
 
 	$sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());
 	if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
-	if (isset($_GET['polygon']) && isset($_GET['polygon'])) $sMoreURL .= '&polygon=1';
+	if ($bShowPolygons) $sMoreURL .= '&polygon=1';
 	if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';
-	if (isset($_GET['viewbox']) && $_GET['viewbox']) $sMoreURL .= '&viewbox='.urlencode($_GET['viewbox']);
+	if ($sViewBox) $sMoreURL .= '&viewbox='.urlencode($sViewBox);
 	if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon'];
 	$sMoreURL .= '&q='.urlencode($sQuery);