Vagrant centos8: proj52 not needed, use postgresql 12/postgis 3.0

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
old mode 100755 (executable)
new mode 100644 (file)
index 4952465..5570565
--- a/website/search.php
+++ b/website/search.php
@@ -1,14 +1,13 @@
 <?php
 <?php

-@define('CONST_ConnectionBucket_PageType', 'Search');

 
 

-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');
 
 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();
+$oDB = new Nominatim\DB();
+$oDB->connect();

 $oParams = new Nominatim\ParameterParser();
 
 $oGeocode = new Nominatim\Geocode($oDB);
 $oParams = new Nominatim\ParameterParser();
 
 $oGeocode = new Nominatim\Geocode($oDB);


@@ -26,38 +25,11 @@ if (CONST_Search_ReversePlanForAll
 }
 
 // Format for output
 }
 
 // Format for output

-$sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2'), 'html');
-
-// Show / use polygons
-if ($sOutputFormat == 'html') {
-    $oGeocode->setIncludePolygonAsGeoJSON($oParams->getBool('polygon_geojson'));
-    $bAsGeoJSON = 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');
-    $iWantedTypes = ($bAsGeoJSON?1:0) + ($bAsKML?1:0) + ($bAsSVG?1:0) + ($bAsText?1:0) + ($bAsPoints?1:0);
-    if ($iWantedTypes > 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));
+$sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'html');
+set_exception_handler_by_format($sOutputFormat);

 
 

-$oGeocode->loadParamArray($oParams);
+$sForcedGeometry = ($sOutputFormat == 'html') ? 'geojson' : null;
+$oGeocode->loadParamArray($oParams, $sForcedGeometry);

 
 if (CONST_Search_BatchMode && isset($_GET['batch'])) {
     $aBatch = json_decode($_GET['batch'], true);
 
 if (CONST_Search_BatchMode && isset($_GET['batch'])) {
     $aBatch = json_decode($_GET['batch'], true);


@@ -78,6 +50,7 @@ $oGeocode->setQueryFromParams($oParams);
 
 if (!$oGeocode->getQueryString()
     && isset($_SERVER['PATH_INFO'])
 
 if (!$oGeocode->getQueryString()
     && isset($_SERVER['PATH_INFO'])

+    && strlen($_SERVER['PATH_INFO']) > 0

     && $_SERVER['PATH_INFO'][0] == '/'
 ) {
     $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);
     && $_SERVER['PATH_INFO'][0] == '/'
 ) {
     $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);


@@ -94,19 +67,20 @@ $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
 $aSearchResults = $oGeocode->lookup();
 
 if ($sOutputFormat=='html') {
 $aSearchResults = $oGeocode->lookup();
 
 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"));
+    $sDataDate = $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();
 
 $aMoreParams = $oGeocode->getMoreUrlParams();
 if ($sOutputFormat != 'html') $aMoreParams['format'] = $sOutputFormat;
 
 $sQuery = $oGeocode->getQueryString();
 
 $aMoreParams = $oGeocode->getMoreUrlParams();
 if ($sOutputFormat != 'html') $aMoreParams['format'] = $sOutputFormat;

-if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
-    $aMoreParams['accept-language'] = $_SERVER["HTTP_ACCEPT_LANGUAGE"];
+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;
 
 }
 $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');