Merge pull request #506 from mtmail/primary-vagrant-vm

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 07ef2d745b1d9517def19a83068068d964983c31..f7c01860f0fb30438e1843937ac2721d7c06d88e 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -43,37 +43,38 @@
        $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 
        $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 

+       $oPlaceLookup = new PlaceLookup($oDB);
+       $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
+       $oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true));
+       $oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false));
+       $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
+

        $sOsmType = getParamSet('osm_type', array('N', 'W', 'R'));
        $iOsmId = getParamInt('osm_id', -1);
        $fLat = getParamFloat('lat');
        $fLon = getParamFloat('lon');
        if ($sOsmType && $iOsmId > 0)
        {
        $sOsmType = getParamSet('osm_type', array('N', 'W', 'R'));
        $iOsmId = getParamInt('osm_id', -1);
        $fLat = getParamFloat('lat');
        $fLon = getParamFloat('lon');
        if ($sOsmType && $iOsmId > 0)
        {

-               $aLookup = array('osm_type' => $sOsmType, 'osm_id' => $iOsmId);
+               $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId);

        }
        }

-       else if ($fLat !== false && $fLon !==false)
+       else if ($fLat !== false && $fLon !== false)

        {
                $oReverseGeocode = new ReverseGeocode($oDB);
                $oReverseGeocode->setZoom(getParamInt('zoom', 18));
 
                $aLookup = $oReverseGeocode->lookup($fLat, $fLon);
                if (CONST_Debug) var_dump($aLookup);
        {
                $oReverseGeocode = new ReverseGeocode($oDB);
                $oReverseGeocode->setZoom(getParamInt('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.");
        }
 
        }
        else if ($sOutputFormat != 'html')
        {
                userError("Need coordinates or OSM object to lookup.");
        }
 

-       if ($aLookup)
+       if ($aPlace)

        {
        {

-               $oPlaceLookup = new PlaceLookup($oDB);
-               $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
-               $oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true));
-               $oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false));
-               $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
-
-               $aPlace = $oPlaceLookup->lookupPlace($aLookup);
-

                $oPlaceLookup->setIncludePolygonAsPoints(false);
                $oPlaceLookup->setIncludePolygonAsText($bAsText);
                $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON);
                $oPlaceLookup->setIncludePolygonAsPoints(false);
                $oPlaceLookup->setIncludePolygonAsText($bAsText);
                $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON);


@@ -82,17 +83,15 @@
                $oPlaceLookup->setPolygonSimplificationThreshold($fThreshold);
 
                $fRadius = $fDiameter = getResultDiameter($aPlace);
                $oPlaceLookup->setPolygonSimplificationThreshold($fThreshold);
 
                $fRadius = $fDiameter = getResultDiameter($aPlace);

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

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

-       else
-       {
-               $aPlace = null;
-       }

 
 
        if (CONST_Debug)
 
 
        if (CONST_Debug)