add remianing osm2pgsql import tests

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 6d6490f8303260b901102a9b4da64e5a832f2f7e..026fa85b434b4dcabc7af6dc2ecf6db1ea3650ba 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -9,7 +9,7 @@ require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 require_once(CONST_BasePath.'/lib/output.php');
 ini_set('memory_limit', '200M');
 
-$oParams = new ParameterParser();
+$oParams = new Nominatim\ParameterParser();
 
 $bAsGeoJSON = $oParams->getBool('polygon_geojson');
 $bAsKML = $oParams->getBool('polygon_kml');
@@ -39,7 +39,7 @@ $oDB =& getDB();
 $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 
-$oPlaceLookup = new PlaceLookup($oDB);
+$oPlaceLookup = new Nominatim\PlaceLookup($oDB);
 $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
 $oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true));
 $oPlaceLookup->setIncludeExtraTags($oParams->getBool('extratags', false));
@@ -49,11 +49,12 @@ $sOsmType = $oParams->getSet('osm_type', array('N', 'W', 'R'));
 $iOsmId = $oParams->getInt('osm_id', -1);
 $fLat = $oParams->getFloat('lat');
 $fLon = $oParams->getFloat('lon');
+$iZoom = $oParams->getInt('zoom');
 if ($sOsmType && $iOsmId > 0) {
     $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId);
 } elseif ($fLat !== false && $fLon !== false) {
-    $oReverseGeocode = new ReverseGeocode($oDB);
-    $oReverseGeocode->setZoom($oParams->getInt('zoom', 18));
+    $oReverseGeocode = new Nominatim\ReverseGeocode($oDB);
+    $oReverseGeocode->setZoom($iZoom !== false ? $iZoom : 18);
 
     $aLookup = $oReverseGeocode->lookup($fLat, $fLon);
     if (CONST_Debug) var_dump($aLookup);
@@ -67,7 +68,7 @@ if ($sOsmType && $iOsmId > 0) {
     userError("Need coordinates or OSM object to lookup.");
 }
 
-if ($aPlace) {
+if (isset($aPlace)) {
     $oPlaceLookup->setIncludePolygonAsPoints(false);
     $oPlaceLookup->setIncludePolygonAsText($bAsText);
     $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON);
@@ -86,6 +87,8 @@ if ($aPlace) {
     if ($aOutlineResult) {
         $aPlace = array_merge($aPlace, $aOutlineResult);
     }
+} else {
+    $aPlace = [];
 }
 
 
@@ -94,7 +97,7 @@ if (CONST_Debug) {
     exit;
 }
 
-if ($sOutputFormat=='html') {
+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"));
     $sTileURL = CONST_Map_Tile_URL;
     $sTileAttribution = CONST_Map_Tile_Attribution;