updates to admin and develop documentation

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 0ba1771474512b7255a2e0cc1e640421786552ec..640ea2abc15691491a63dfb5fabd0191a5fe372d 100644 (file)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -10,13 +10,14 @@ 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 =& getDB();
+$oDB = new Nominatim\DB();
+$oDB->connect();
 
 $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
@@ -37,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));
@@ -45,7 +45,7 @@ if ($sOsmType && $iOsmId > 0) {
             $aPlace = reset($aPlaces);
         }
     }
-} elseif ($sOutputFormat != 'html') {
+} else {
     userError('Need coordinates or OSM object to lookup.');
 }
 
@@ -54,7 +54,7 @@ if (isset($aPlace)) {
         $aPlace['place_id'],
         $aPlace['lon'],
         $aPlace['lat'],
-        Nominatim\ClassTypes\getProperty($aPlace, 'defdiameter', 0.0001),
+        Nominatim\ClassTypes\getDefRadius($aPlace),
         $fLat,
         $fLon
     );
@@ -66,20 +66,20 @@ if (isset($aPlace)) {
     $aPlace = array();
 }
 
+logEnd($oDB, $hLog, count($aPlace) ? 1 : 0);
 
 if (CONST_Debug) {
     var_dump($aPlace);
     exit;
 }
 
-if ($sOutputFormat == 'html') {
-    $sDataDate = chksql($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 = chksql($oDB->getOne('SELECT ST_Distance(ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326), centroid) FROM placex where place_id='.$aPlace['place_id']));
+        $fDistance = $oDB->getOne(
+            'SELECT ST_Distance(ST_SetSRID(ST_Point(:lon,:lat),4326), centroid) FROM placex where place_id = :placeid',
+            array(':lon' => $fLon, ':lat' => $fLat, ':placeid' => $aPlace['place_id'])
+        );
     }
 }