Merge branch 'PSR2-fixes-for-settings' of https://github.com/mtmail/Nominatim into...

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 509ec0a8d6761a21184e48c78a0cb7319dc01e58..41eed262b8d20689896e9d38965874feaefa6862 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -5,11 +5,13 @@ class ReverseGeocode
     protected $oDB;
     protected $iMaxRank = 28;
 
     protected $oDB;
     protected $iMaxRank = 28;
 

+

     function ReverseGeocode(&$oDB)
     {
         $this->oDB =& $oDB;
     }
 
     function ReverseGeocode(&$oDB)
     {
         $this->oDB =& $oDB;
     }
 

+

     function setZoom($iZoom)
     {
         // Zoom to rank, this could probably be calculated but a lookup gives fine control
     function setZoom($iZoom)
     {
         // Zoom to rank, this could probably be calculated but a lookup gives fine control


@@ -38,8 +40,13 @@ class ReverseGeocode
         $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
     }
 
         $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
     }
 

-    // returns { place_id =>, type => '(osm|tiger)' }
-    // fails if no place was found
+
+    /* lookup()
+     * returns { place_id =>, type => '(osm|tiger)' }
+     * fails if no place was found
+     */
+
+

     function lookup($fLat, $fLon, $bDoInterpolation = true)
     {
         $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)';
     function lookup($fLat, $fLon, $bDoInterpolation = true)
     {
         $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)';


@@ -111,7 +118,7 @@ class ReverseGeocode
             if ($aPlaceLine) {
                 if (CONST_Debug) var_dump('found housenumber in interpolation lines table', $aPlaceLine);
                 if ($aPlace['rank_search'] == 30) {
             if ($aPlaceLine) {
                 if (CONST_Debug) var_dump('found housenumber in interpolation lines table', $aPlaceLine);
                 if ($aPlace['rank_search'] == 30) {

-                    // if a house was already found in placex, we have to find out, 
+                    // if a house was already found in placex, we have to find out,

                     // if the placex house or the interpolated house are closer to the searched point
                     // distance between point and placex house
                     $sSQL = 'SELECT ST_distance('.$sPointSQL.', house.geometry) as distance FROM placex as house WHERE house.place_id='.$iPlaceID;
                     // if the placex house or the interpolated house are closer to the searched point
                     // distance between point and placex house
                     $sSQL = 'SELECT ST_distance('.$sPointSQL.', house.geometry) as distance FROM placex as house WHERE house.place_id='.$iPlaceID;


@@ -204,5 +211,4 @@ class ReverseGeocode
                 'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1
                );
     }
                 'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1
                );
     }

-    

 }
 }