fix merge error

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 41eed262b8d20689896e9d38965874feaefa6862..c56c9b29b2cbadc417092147f93fc30ee6501cf6 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -1,18 +1,20 @@
 <?php
 
 <?php
 

+namespace Nominatim;
+

 class ReverseGeocode
 {
     protected $oDB;
     protected $iMaxRank = 28;
 
 
 class ReverseGeocode
 {
     protected $oDB;
     protected $iMaxRank = 28;
 
 

-    function ReverseGeocode(&$oDB)
+    public function __construct(&$oDB)

     {
         $this->oDB =& $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(
     {
         // Zoom to rank, this could probably be calculated but a lookup gives fine control
         $aZoomRank = array(


@@ -47,7 +49,7 @@ class ReverseGeocode
      */
 
 
      */
 
 

-    function lookup($fLat, $fLon, $bDoInterpolation = true)
+    public function lookup($fLat, $fLon, $bDoInterpolation = true)

     {
         $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)';
         $iMaxRank = $this->iMaxRank;
     {
         $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)';
         $iMaxRank = $this->iMaxRank;