X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ff1c78fef5d64b1b0b7eba96332caffb46bc3e21..c0d21d0bd3ec04d340c2e716a9f9482d36dff310:/website/search.php

diff --git a/website/search.php b/website/search.php
index 55705656..d2a1cc67 100644
--- a/website/search.php
+++ b/website/search.php
@@ -25,11 +25,10 @@ if (CONST_Search_ReversePlanForAll
 }
 
 // Format for output
-$sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'html');
+$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'jsonv2');
 set_exception_handler_by_format($sOutputFormat);
 
-$sForcedGeometry = ($sOutputFormat == 'html') ? 'geojson' : null;
-$oGeocode->loadParamArray($oParams, $sForcedGeometry);
+$oGeocode->loadParamArray($oParams, null);
 
 if (CONST_Search_BatchMode && isset($_GET['batch'])) {
     $aBatch = json_decode($_GET['batch'], true);
@@ -66,15 +65,12 @@ $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
 
 $aSearchResults = $oGeocode->lookup();
 
-if ($sOutputFormat=='html') {
-    $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
-}
 logEnd($oDB, $hLog, count($aSearchResults));
 
 $sQuery = $oGeocode->getQueryString();
 
 $aMoreParams = $oGeocode->getMoreUrlParams();
-if ($sOutputFormat != 'html') $aMoreParams['format'] = $sOutputFormat;
+$aMoreParams['format'] = $sOutputFormat;
 if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
     $aMoreParams['accept-language'] = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
 }