check if query is valid unicode string

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index 509ec0a8d6761a21184e48c78a0cb7319dc01e58..d955492027e292bc238110feaf9368863743c675 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;
@@ -89,7 +98,7 @@ class ReverseGeocode
         // if a street or house was found, look in interpolation lines table
         if ($bDoInterpolation && $this->iMaxRank >= 28 && $aPlace && $aPlace['rank_search'] >= 26) {
             // if a house was found, search the interpolation line that is at least as close as the house
-            $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction';
+            $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search, ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction';
             $sSQL .= ' FROM location_property_osmline';
             $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';
             $sSQL .= ' and indexed_status = 0 ';
@@ -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;
@@ -152,7 +161,7 @@ class ReverseGeocode
         // Only street found? If it's in the US we can check TIGER data for nearest housenumber
         if (CONST_Use_US_Tiger_Data && $bDoInterpolation && $bIsInUnitedStates && $this->iMaxRank >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 )) {
             $fSearchDiam = 0.001;
-            $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction';
+            $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search, ST_LineLocatePoint(linegeo,'.$sPointSQL.') as fraction';
             //if (CONST_Debug) { $sSQL .= ', housenumber, ST_distance('.$sPointSQL.', centroid) as distance, st_y(centroid) as lat, st_x(centroid) as lon'; }
             $sSQL .= ' FROM location_property_tiger WHERE parent_place_id = '.$iPlaceID;
             $sSQL .= ' AND ST_DWithin('.$sPointSQL.', linegeo, '.$fSearchDiam.')';  //no centroid anymore in Tiger data, now we have lines
@@ -204,5 +213,4 @@ class ReverseGeocode
                 'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1
                );
     }
-    
 }