Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
old mode 100755 (executable)
new mode 100644 (file)
index 026fa85..7b9ef3b
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,7 +1,5 @@
 <?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/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/PlaceLookup.php');


@@ -11,86 +9,65 @@ ini_set('memory_limit', '200M');
 
 $oParams = new Nominatim\ParameterParser();
 
 
 $oParams = new Nominatim\ParameterParser();
 

-$bAsGeoJSON = $oParams->getBool('polygon_geojson');
-$bAsKML = $oParams->getBool('polygon_kml');
-$bAsSVG = $oParams->getBool('polygon_svg');
-$bAsText = $oParams->getBool('polygon_text');
-
-$iWantedTypes = ($bAsGeoJSON?1:0) + ($bAsKML?1:0) + ($bAsSVG?1:0) + ($bAsText?1:0);
-if ($iWantedTypes > CONST_PolygonOutput_MaximumTypes) {
-    if (CONST_PolygonOutput_MaximumTypes) {
-        userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option");
-    } else {
-        userError("Polygon output is disabled");
-    }
-}
-
-// Polygon simplification threshold (optional)
-$fThreshold = $oParams->getFloat('polygon_threshold', 0.0);
-

 // Format for output
 // Format for output

-$sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2'), 'xml');
+$sOutputFormat = $oParams->getSet('format', array('html', '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();
+$oDB->connect();

 
 $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 
 $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 

-

 $oPlaceLookup = new Nominatim\PlaceLookup($oDB);
 $oPlaceLookup = new Nominatim\PlaceLookup($oDB);

-$oPlaceLookup->setLanguagePreference($aLangPrefOrder);
+$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));

 
 $sOsmType = $oParams->getSet('osm_type', array('N', 'W', 'R'));
 $iOsmId = $oParams->getInt('osm_id', -1);
 $fLat = $oParams->getFloat('lat');
 $fLon = $oParams->getFloat('lon');
 
 $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');
+$iZoom = $oParams->getInt('zoom', 18);
+

 if ($sOsmType && $iOsmId > 0) {
     $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId);
 } elseif ($fLat !== false && $fLon !== false) {
     $oReverseGeocode = new Nominatim\ReverseGeocode($oDB);
 if ($sOsmType && $iOsmId > 0) {
     $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId);
 } elseif ($fLat !== false && $fLon !== false) {
     $oReverseGeocode = new Nominatim\ReverseGeocode($oDB);

-    $oReverseGeocode->setZoom($iZoom !== false ? $iZoom : 18);
+    $oReverseGeocode->setZoom($iZoom);

 
 

-    $aLookup = $oReverseGeocode->lookup($fLat, $fLon);
-    if (CONST_Debug) var_dump($aLookup);
+    $oLookup = $oReverseGeocode->lookup($fLat, $fLon);
+    if (CONST_Debug) var_dump($oLookup);

 
 

-    $aPlace = $oPlaceLookup->lookup(
-        (int)$aLookup['place_id'],
-        $aLookup['type'],
-        $aLookup['fraction']
-    );
+    if ($oLookup) {
+        $aPlaces = $oPlaceLookup->lookup(array($oLookup->iId => $oLookup));
+        if (!empty($aPlaces)) {
+            $aPlace = reset($aPlaces);
+        }
+    }

 } elseif ($sOutputFormat != 'html') {
 } elseif ($sOutputFormat != 'html') {

-    userError("Need coordinates or OSM object to lookup.");
+    userError('Need coordinates or OSM object to lookup.');

 }
 
 if (isset($aPlace)) {
 }
 
 if (isset($aPlace)) {

-    $oPlaceLookup->setIncludePolygonAsPoints(false);
-    $oPlaceLookup->setIncludePolygonAsText($bAsText);
-    $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON);
-    $oPlaceLookup->setIncludePolygonAsKML($bAsKML);
-    $oPlaceLookup->setIncludePolygonAsSVG($bAsSVG);
-    $oPlaceLookup->setPolygonSimplificationThreshold($fThreshold);
-
-    $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
+        Nominatim\ClassTypes\getProperty($aPlace, 'defdiameter', 0.0001),
+        $fLat,
+        $fLon

     );
 
     if ($aOutlineResult) {
         $aPlace = array_merge($aPlace, $aOutlineResult);
     }
 } else {
     );
 
     if ($aOutlineResult) {
         $aPlace = array_merge($aPlace, $aOutlineResult);
     }
 } else {

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

 }
 
 }
 

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

 
 if (CONST_Debug) {
     var_dump($aPlace);
 
 if (CONST_Debug) {
     var_dump($aPlace);


@@ -98,8 +75,18 @@ if (CONST_Debug) {
 }
 
 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"));
+    $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;
     $sTileURL = CONST_Map_Tile_URL;
     $sTileAttribution = CONST_Map_Tile_Attribution;

+} elseif ($sOutputFormat == 'geocodejson') {
+    $sQuery = $fLat.','.$fLon;
+    if (isset($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'])
+        );
+    }

 }
 }

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