Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / lookup.php

diff --git a/website/lookup.php b/website/lookup.php
index 93743e2d1c0b69872449126e4697d76effc3894f..f09506a4c0de7ae1aef97afa22b38a4aecc9cae1 100755 (executable)
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -8,10 +8,10 @@ require_once(CONST_BasePath.'/lib/PlaceLookup.php');
 require_once(CONST_BasePath.'/lib/output.php');
 ini_set('memory_limit', '200M');
 
 require_once(CONST_BasePath.'/lib/output.php');
 ini_set('memory_limit', '200M');
 

-$oParams = new ParameterParser();
+$oParams = new Nominatim\ParameterParser();

 
 // Format for output
 
 // Format for output

-$sOutputFormat = $oParams->getSet('format', array('xml', 'json'), 'xml');
+$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'geojson'), 'xml');

 
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();


@@ -23,16 +23,14 @@ $hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 $aSearchResults = array();
 $aCleanedQueryParts = array();
 
 $aSearchResults = array();
 $aCleanedQueryParts = array();
 

-$oPlaceLookup = new PlaceLookup($oDB);
-$oPlaceLookup->setLanguagePreference($aLangPrefOrder);
+$oPlaceLookup = new Nominatim\PlaceLookup($oDB);
+$oPlaceLookup->loadParamArray($oParams);

 $oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true));
 $oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true));

-$oPlaceLookup->setIncludeExtraTags($oParams->getBool('extratags', false));
-$oPlaceLookup->setIncludeNameDetails($oParams->getBool('namedetails', false));

 
 $aOsmIds = explode(',', $oParams->getString('osm_ids', ''));
 
 if (count($aOsmIds) > CONST_Places_Max_ID_count) {
 
 $aOsmIds = explode(',', $oParams->getString('osm_ids', ''));
 
 if (count($aOsmIds) > CONST_Places_Max_ID_count) {

-    userError('Bulk User: Only ' . CONST_Places_Max_ID_count . " ids are allowed in one request.");
+    userError('Bulk User: Only ' . CONST_Places_Max_ID_count . ' ids are allowed in one request.');

 }
 
 foreach ($aOsmIds as $sItem) {
 }
 
 foreach ($aOsmIds as $sItem) {


@@ -66,7 +64,8 @@ $sQuery = join(',', $aCleanedQueryParts);
 // we initialize these to avoid warnings in our logfile
 $sViewBox = '';
 $bShowPolygons = '';
 // we initialize these to avoid warnings in our logfile
 $sViewBox = '';
 $bShowPolygons = '';

-$aExcludePlaceIDs = [];
+$aExcludePlaceIDs = array();

 $sMoreURL = '';
 
 $sMoreURL = '';
 

-include(CONST_BasePath.'/lib/template/search-'.$sOutputFormat.'.php');
+$sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
+include(CONST_BasePath.'/lib/template/search-'.$sOutputTemplate.'.php');