Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 509ec0a8d6761a21184e48c78a0cb7319dc01e58..c56c9b29b2cbadc417092147f93fc30ee6501cf6 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -1,16 +1,20 @@
 <?php
 
+namespace Nominatim;
+
 class ReverseGeocode
 {
     protected $oDB;
     protected $iMaxRank = 28;
 
-    function ReverseGeocode(&$oDB)
+
+    public function __construct(&$oDB)
     {
         $this->oDB =& $oDB;
     }
 
-    function setZoom($iZoom)
+
+    public function setZoom($iZoom)
     {
         // Zoom to rank, this could probably be calculated but a lookup gives fine control
         $aZoomRank = array(
@@ -38,9 +42,14 @@ class ReverseGeocode
         $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
     }
 
-    // returns { place_id =>, type => '(osm|tiger)' }
-    // fails if no place was found
-    function lookup($fLat, $fLon, $bDoInterpolation = true)
+
+    /* lookup()
+     * returns { place_id =>, type => '(osm|tiger)' }
+     * fails if no place was found
+     */
+
+
+    public function lookup($fLat, $fLon, $bDoInterpolation = true)
     {
         $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)';
         $iMaxRank = $this->iMaxRank;
@@ -111,7 +120,7 @@ class ReverseGeocode
             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;
@@ -204,5 +213,4 @@ class ReverseGeocode
                 'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1
                );
     }
-    
 }