search/reverse/lookup with geojson,geocodejson output

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index 0dddaccec9cf2dc2a2cec98236bea128b16b4dcd..0ebf1814bcb129fafc63477b637fe5a5c52832cc 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -26,7 +26,7 @@ if (CONST_Search_ReversePlanForAll
 }
 
 // Format for output
 }
 
 // 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');

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


@@ -68,7 +68,7 @@ $aSearchResults = $oGeocode->lookup();
 if ($sOutputFormat=='html') {
     $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate,'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();
 
 
 $sQuery = $oGeocode->getQueryString();
 


@@ -81,5 +81,5 @@ $sMoreURL = CONST_Website_BaseURL.'search.php?'.http_build_query($aMoreParams);
 
 if (CONST_Debug) exit;
 
 
 if (CONST_Debug) exit;
 

-$sOutputTemplate = ($sOutputFormat=='jsonv2' ? 'json' : $sOutputFormat);
+$sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;

 include(CONST_BasePath.'/lib/template/search-'.$sOutputTemplate.'.php');
 include(CONST_BasePath.'/lib/template/search-'.$sOutputTemplate.'.php');