X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/effd8e12af440586594a18a04beb33abed260d15..513bf485f20f0308c7f25c96717190a354bf0ec3:/website/reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 8864ab64..a7261802 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -9,30 +9,10 @@ require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 require_once(CONST_BasePath.'/lib/output.php');
 ini_set('memory_limit', '200M');
 
-$oParams = new ParameterParser();
-
-$bAsGeoJSON = $oParams->getBool('polygon_geojson');
-$bAsKML = $oParams->getBool('polygon_kml');
-$bAsSVG = $oParams->getBool('polygon_svg');
-$bAsText = $oParams->getBool('polygon_text');
-if ((($bAsGeoJSON?1:0) + ($bAsKML?1:0) + ($bAsSVG?1:0)
-    + ($bAsText?1:0)) > 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);
+$oParams = new Nominatim\ParameterParser();
 
 // 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');
 
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
@@ -41,68 +21,68 @@ $oDB =& getDB();
 
 $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
-
-$oPlaceLookup = new PlaceLookup($oDB);
-$oPlaceLookup->setLanguagePreference($aLangPrefOrder);
+$oPlaceLookup = new Nominatim\PlaceLookup($oDB);
+$oPlaceLookup->loadParamArray($oParams);
 $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');
-if ($sOsmType && $iOsmId > 0)
-{
-    $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId);
-}
-else if ($fLat !== false && $fLon !== false)
-{
-    $oReverseGeocode = new ReverseGeocode($oDB);
-    $oReverseGeocode->setZoom($oParams->getInt('zoom', 18));
+$iZoom = $oParams->getInt('zoom', 18);
 
-    $aLookup = $oReverseGeocode->lookup($fLat, $fLon);
-    if (CONST_Debug) var_dump($aLookup);
-
-    $aPlace = $oPlaceLookup->lookup((int)$aLookup['place_id'],
-                                    $aLookup['type'], $aLookup['fraction']);
-}
-else if ($sOutputFormat != 'html')
-{
-    userError("Need coordinates or OSM object to lookup.");
+if ($sOsmType && $iOsmId > 0) {
+    $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId);
+} elseif ($fLat !== false && $fLon !== false) {
+    $oReverseGeocode = new Nominatim\ReverseGeocode($oDB);
+    $oReverseGeocode->setZoom($iZoom);
+
+    $oLookup = $oReverseGeocode->lookup($fLat, $fLon);
+    if (CONST_Debug) var_dump($oLookup);
+
+    if ($oLookup) {
+        $aPlaces = $oPlaceLookup->lookup(array($oLookup->iId => $oLookup));
+        if (!empty($aPlaces)) {
+            $aPlace = reset($aPlaces);
+        }
+    }
+} elseif ($sOutputFormat != 'html') {
+    userError('Need coordinates or OSM object to lookup.');
 }
 
-if ($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'],
-                                                 $fRadius);
-
-    if ($aOutlineResult)
-    {
+if (isset($aPlace)) {
+    $aOutlineResult = $oPlaceLookup->getOutlines(
+        $aPlace['place_id'],
+        $aPlace['lon'],
+        $aPlace['lat'],
+        Nominatim\ClassTypes\getProperty($aPlace, 'defdiameter', 0.0001),
+        $fLat,
+        $fLon
+    );
+
+    if ($aOutlineResult) {
         $aPlace = array_merge($aPlace, $aOutlineResult);
     }
+} else {
+    $aPlace = array();
 }
 
 
-if (CONST_Debug)
-{
+if (CONST_Debug) {
     var_dump($aPlace);
     exit;
 }
 
-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"));
+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') {
+    $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']));
+    }
 }
-include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
+
+$sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
+include(CONST_BasePath.'/lib/template/address-'.$sOutputTemplate.'.php');