Vagrant ubuntu: install dotenv package

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
old mode 100755 (executable)
new mode 100644 (file)
index db78345..553c269
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,32 +1,29 @@
 <?php
 <?php

-@define('CONST_ConnectionBucket_PageType', 'Reverse');
-
-require_once(dirname(dirname(__FILE__)).'/settings/settings.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
 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();
 
 
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 

-$oDB =& getDB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
+$oDB->connect();

 
 $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 $oPlaceLookup = new Nominatim\PlaceLookup($oDB);
 $oPlaceLookup->loadParamArray($oParams);
 
 $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 $oPlaceLookup = new Nominatim\PlaceLookup($oDB);
 $oPlaceLookup->loadParamArray($oParams);

-if ($sOutputFormat == 'geocodejson') {
-    $oPlaceLookup->setIncludeAddressDetails(true);
-    $oPlaceLookup->setAddressAdminLevels(true);
-}
+$oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true));

 
 $sOsmType = $oParams->getSet('osm_type', array('N', 'W', 'R'));
 $iOsmId = $oParams->getInt('osm_id', -1);
 
 $sOsmType = $oParams->getSet('osm_type', array('N', 'W', 'R'));
 $iOsmId = $oParams->getInt('osm_id', -1);


@@ -41,7 +38,6 @@ if ($sOsmType && $iOsmId > 0) {
     $oReverseGeocode->setZoom($iZoom);
 
     $oLookup = $oReverseGeocode->lookup($fLat, $fLon);
     $oReverseGeocode->setZoom($iZoom);
 
     $oLookup = $oReverseGeocode->lookup($fLat, $fLon);

-    if (CONST_Debug) var_dump($oLookup);

 
     if ($oLookup) {
         $aPlaces = $oPlaceLookup->lookup(array($oLookup->iId => $oLookup));
 
     if ($oLookup) {
         $aPlaces = $oPlaceLookup->lookup(array($oLookup->iId => $oLookup));


@@ -49,19 +45,18 @@ if ($sOsmType && $iOsmId > 0) {
             $aPlace = reset($aPlaces);
         }
     }
             $aPlace = reset($aPlaces);
         }
     }

-} elseif ($sOutputFormat != 'html') {
+} else {

     userError('Need coordinates or OSM object to lookup.');
 }
 
 if (isset($aPlace)) {
     userError('Need coordinates or OSM object to lookup.');
 }
 
 if (isset($aPlace)) {

-    $fRadius = $fDiameter = getResultDiameter($aPlace);

     $aOutlineResult = $oPlaceLookup->getOutlines(
         $aPlace['place_id'],
         $aPlace['lon'],
         $aPlace['lat'],
     $aOutlineResult = $oPlaceLookup->getOutlines(
         $aPlace['place_id'],
         $aPlace['lon'],
         $aPlace['lat'],

-        $fRadius, 
-        $fLat, 
-        $fLon 
+        Nominatim\ClassTypes\getDefRadius($aPlace),
+        $fLat,
+        $fLon

     );
 
     if ($aOutlineResult) {
     );
 
     if ($aOutlineResult) {


@@ -71,22 +66,22 @@ if (isset($aPlace)) {
     $aPlace = array();
 }
 
     $aPlace = array();
 }
 

+logEnd($oDB, $hLog, count($aPlace) ? 1 : 0);

 
 if (CONST_Debug) {
     var_dump($aPlace);
     exit;
 }
 
 
 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'])) {
     $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'])
+        );

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

-include(CONST_BasePath.'/lib/template/address-'.$sOutputTemplate.'.php');
+include(CONST_LibDir.'/template/address-'.$sOutputTemplate.'.php');