X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/02c219d40e567cc42576648fc1b459078dc95897..95961d098da553a335c9c44dc6a9827b83e7fc99:/website/search.php

diff --git a/website/search.php b/website/search.php
index a9e20d4e..4baf3ef5 100755
--- a/website/search.php
+++ b/website/search.php
@@ -1,55 +1,51 @@
 <?php
 	@define('CONST_ConnectionBucket_PageType', 'Search');
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
 	require_once(CONST_BasePath.'/lib/Geocode.php');
+	require_once(CONST_BasePath.'/lib/output.php');
 
 	ini_set('memory_limit', '200M');
 
 	$oDB =& getDB();
 
-	// Display defaults
-	$fLat = CONST_Default_Lat;
-	$fLon = CONST_Default_Lon;
-	$iZoom = CONST_Default_Zoom;
-	$sSuggestionURL = false;
-
-	$oGeocode =& new Geocode($oDB);
+	$oGeocode = new Geocode($oDB);
 
 	$aLangPrefOrder = getPreferredLanguages();
 	$oGeocode->setLanguagePreference($aLangPrefOrder);
 
-	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';
-	if (isset($_GET['format']) && ($_GET['format'] == 'html' || $_GET['format'] == 'xml' || $_GET['format'] == 'json' ||  $_GET['format'] == 'jsonv2'))
+	if (CONST_Search_ReversePlanForAll
+		|| isset($aLangPrefOrder['name:de'])
+		|| isset($aLangPrefOrder['name:ru'])
+		|| isset($aLangPrefOrder['name:ja'])
+		|| isset($aLangPrefOrder['name:pl']))
 	{
-		$sOutputFormat = $_GET['format'];
+		$oGeocode->setReverseInPlan(true);
 	}
 
+	// Format for output
+	$sOutputFormat = getParamSet('format', array('html', 'xml', 'json', 'jsonv2'), 'html');
+
 	// Show / use polygons
 	if ($sOutputFormat == 'html')
 	{
-		if (isset($_GET['polygon'])) $oGeocode->setIncludePolygonAsText((bool)$_GET['polygon']);
+		$oGeocode->setIncludePolygonAsText(getParamBool('polygon'));
 	}
 	else
 	{
-		$bAsPoints = (boolean)isset($_GET['polygon']) && $_GET['polygon'];
-		$bAsGeoJSON = (boolean)isset($_GET['polygon_geojson']) && $_GET['polygon_geojson'];
-		$bAsKML = (boolean)isset($_GET['polygon_kml']) && $_GET['polygon_kml'];
-		$bAsSVG = (boolean)isset($_GET['polygon_svg']) && $_GET['polygon_svg'];
-		$bAsText = (boolean)isset($_GET['polygon_text']) && $_GET['polygon_text'];
+		$bAsPoints = getParamBool('polygon');
+		$bAsGeoJSON = getParamBool('polygon_geojson');
+		$bAsKML = getParamBool('polygon_kml');
+		$bAsSVG = getParamBool('polygon_svg');
+		$bAsText = getParamBool('polygon_text');
 		if ( ( ($bAsGeoJSON?1:0)
-		     + ($bAsKML?1:0)
-		     + ($bAsSVG?1:0)
-		     + ($bAsText?1:0)
-		     + ($bAsPoints?1:0)
-		     ) > CONST_PolygonOutput_MaximumTypes)
+				 + ($bAsKML?1:0)
+				 + ($bAsSVG?1:0)
+				 + ($bAsText?1:0)
+				 + ($bAsPoints?1:0)
+				 ) > CONST_PolygonOutput_MaximumTypes)
 		{
 			if (CONST_PolygonOutput_MaximumTypes)
 			{
@@ -68,6 +64,9 @@
 		$oGeocode->setIncludePolygonAsSVG($bAsSVG);
 	}
 
+	// Polygon simplification threshold (optional)
+	$oGeocode->setPolygonSimplificationThreshold(getParamFloat('polygon_threshold', 0.0));
+
 	$oGeocode->loadParamArray($_GET);
 
 	if (CONST_Search_BatchMode && isset($_GET['batch']))
@@ -84,31 +83,34 @@
 		}
 		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(rawurldecode($_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);
-        }
-
-    }
+	}
+	else
+	{
+		if (!getParamString('q') && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
+		{
+			$sQuery = substr(rawurldecode($_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();
 
-	$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
-
+	if ($sOutputFormat=='html')
+	{
+		$sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
+	}
 	logEnd($oDB, $hLog, sizeof($aSearchResults));
 
 	$bAsText = $oGeocode->getIncludePolygonAsText();
@@ -117,10 +119,12 @@
 	$bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
 	$aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
 
-	$sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());
+	$sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());
 	if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
 	if ($bShowPolygons) $sMoreURL .= '&polygon=1';
 	if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';
+	if ($oGeocode->getIncludeExtraTags()) $sMoreURL .= '&extratags=1';
+	if ($oGeocode->getIncludeNameDetails()) $sMoreURL .= '&namedetails=1';
 	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);