X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/832547f192904a9ec92e173c27a91e0874fcc757..441cd27a5327c28dff3a771b73fbe83a4fbeadb4:/website/search.php

diff --git a/website/search.php b/website/search.php
index bcec4f18..0ebf1814 100755
--- a/website/search.php
+++ b/website/search.php
@@ -9,9 +9,9 @@ require_once(CONST_BasePath.'/lib/output.php');
 ini_set('memory_limit', '200M');
 
 $oDB =& getDB();
-$oParams = new ParameterParser();
+$oParams = new Nominatim\ParameterParser();
 
-$oGeocode = new Geocode($oDB);
+$oGeocode = new Nominatim\Geocode($oDB);
 
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 $oGeocode->setLanguagePreference($aLangPrefOrder);
@@ -20,64 +20,23 @@ if (CONST_Search_ReversePlanForAll
     || isset($aLangPrefOrder['name:de'])
     || isset($aLangPrefOrder['name:ru'])
     || isset($aLangPrefOrder['name:ja'])
-    || isset($aLangPrefOrder['name:pl']))
-{
+    || isset($aLangPrefOrder['name:pl'])
+) {
     $oGeocode->setReverseInPlan(true);
 }
 
 // Format for output
-$sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2'), 'html');
+$sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'html');
 
-// Show / use polygons
-if ($sOutputFormat == 'html')
-{
-    $oGeocode->setIncludePolygonAsText($oParams->getBool('polygon'));
-    $bAsText = false;
-}
-else
-{
-    $bAsPoints = $oParams->getBool('polygon');
-    $bAsGeoJSON = $oParams->getBool('polygon_geojson');
-    $bAsKML = $oParams->getBool('polygon_kml');
-    $bAsSVG = $oParams->getBool('polygon_svg');
-    $bAsText = $oParams->getBool('polygon_text');
-    if ( ( ($bAsGeoJSON?1:0)
-             + ($bAsKML?1:0)
-             + ($bAsSVG?1:0)
-             + ($bAsText?1:0)
-             + ($bAsPoints?1:0)
-             ) > CONST_PolygonOutput_MaximumTypes)
-    {
-        if (CONST_PolygonOutput_MaximumTypes)
-        {
-            userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option");
-        }
-        else
-        {
-            userError("Polygon output is disabled");
-        }
-        exit;
-    }
-    $oGeocode->setIncludePolygonAsPoints($bAsPoints);
-    $oGeocode->setIncludePolygonAsText($bAsText);
-    $oGeocode->setIncludePolygonAsGeoJSON($bAsGeoJSON);
-    $oGeocode->setIncludePolygonAsKML($bAsKML);
-    $oGeocode->setIncludePolygonAsSVG($bAsSVG);
-}
-
-// Polygon simplification threshold (optional)
-$oGeocode->setPolygonSimplificationThreshold($oParams->getFloat('polygon_threshold', 0.0));
+$sForcedGeometry = ($sOutputFormat == 'html') ? 'geojson' : null;
+$oGeocode->loadParamArray($oParams, $sForcedGeometry);
 
-$oGeocode->loadParamArray($oParams);
-
-if (CONST_Search_BatchMode && isset($_GET['batch']))
-{
+if (CONST_Search_BatchMode && isset($_GET['batch'])) {
     $aBatch = json_decode($_GET['batch'], true);
     $aBatchResults = array();
-    foreach($aBatch as $aBatchParams)
-    {
+    foreach ($aBatch as $aBatchParams) {
         $oBatchGeocode = clone $oGeocode;
-        $oBatchParams = new ParameterParser($aBatchParams);
+        $oBatchParams = new Nominatim\ParameterParser($aBatchParams);
         $oBatchGeocode->loadParamArray($oBatchParams);
         $oBatchGeocode->setQueryFromParams($oBatchParams);
         $aSearchResults = $oBatchGeocode->lookup();
@@ -90,43 +49,37 @@ if (CONST_Search_BatchMode && isset($_GET['batch']))
 $oGeocode->setQueryFromParams($oParams);
 
 if (!$oGeocode->getQueryString()
-    && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
-{
+    && 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);
+    $sQuery = join(', ', $aPhrases);
     $oGeocode->setQuery($sQuery);
 }
 
 $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
 
 $aSearchResults = $oGeocode->lookup();
-if ($aSearchResults === false) $aSearchResults = array();
 
-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"));
+if ($sOutputFormat=='html') {
+    $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
 }
-logEnd($oDB, $hLog, sizeof($aSearchResults));
+logEnd($oDB, $hLog, count($aSearchResults));
 
 $sQuery = $oGeocode->getQueryString();
-$sViewBox = $oGeocode->getViewBoxString();
-$bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
-$aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
-
-$sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs);
-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);
+
+$aMoreParams = $oGeocode->getMoreUrlParams();
+if ($sOutputFormat != 'html') $aMoreParams['format'] = $sOutputFormat;
+if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+    $aMoreParams['accept-language'] = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+}
+$sMoreURL = CONST_Website_BaseURL.'search.php?'.http_build_query($aMoreParams);
 
 if (CONST_Debug) exit;
 
-include(CONST_BasePath.'/lib/template/search-'.$sOutputFormat.'.php');
+$sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
+include(CONST_BasePath.'/lib/template/search-'.$sOutputTemplate.'.php');