X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/859347523fb2c7340b2df9980e52d5ea4543c82d..c3238682a8867edfb3c052ca4d2d27b3926ad17a:/website/reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 29340a92..553c2692 100644
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,22 +1,22 @@
 <?php
 
-require_once(CONST_BasePath.'/lib/init-website.php');
-require_once(CONST_BasePath.'/lib/log.php');
-require_once(CONST_BasePath.'/lib/PlaceLookup.php');
-require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
-require_once(CONST_BasePath.'/lib/output.php');
+require_once(CONST_LibDir.'/init-website.php');
+require_once(CONST_LibDir.'/log.php');
+require_once(CONST_LibDir.'/PlaceLookup.php');
+require_once(CONST_LibDir.'/ReverseGeocode.php');
+require_once(CONST_LibDir.'/output.php');
 ini_set('memory_limit', '200M');
 
 $oParams = new Nominatim\ParameterParser();
 
 // Format for output
-$sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'xml');
+$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'xml');
 set_exception_handler_by_format($sOutputFormat);
 
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 
-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
 $oDB->connect();
 
 $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
@@ -38,7 +38,6 @@ if ($sOsmType && $iOsmId > 0) {
     $oReverseGeocode->setZoom($iZoom);
 
     $oLookup = $oReverseGeocode->lookup($fLat, $fLon);
-    if (CONST_Debug) var_dump($oLookup);
 
     if ($oLookup) {
         $aPlaces = $oPlaceLookup->lookup(array($oLookup->iId => $oLookup));
@@ -46,7 +45,7 @@ if ($sOsmType && $iOsmId > 0) {
             $aPlace = reset($aPlaces);
         }
     }
-} elseif ($sOutputFormat != 'html') {
+} else {
     userError('Need coordinates or OSM object to lookup.');
 }
 
@@ -74,11 +73,7 @@ if (CONST_Debug) {
     exit;
 }
 
-if ($sOutputFormat == 'html') {
-    $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
-    $sTileURL = CONST_Map_Tile_URL;
-    $sTileAttribution = CONST_Map_Tile_Attribution;
-} elseif ($sOutputFormat == 'geocodejson') {
+if ($sOutputFormat == 'geocodejson') {
     $sQuery = $fLat.','.$fLon;
     if (isset($aPlace['place_id'])) {
         $fDistance = $oDB->getOne(
@@ -89,4 +84,4 @@ if ($sOutputFormat == 'html') {
 }
 
 $sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
-include(CONST_BasePath.'/lib/template/address-'.$sOutputTemplate.'.php');
+include(CONST_LibDir.'/template/address-'.$sOutputTemplate.'.php');