fix style

diff --git a/lib/Geocode.php b/lib/Geocode.php
index c527dc14915719b38740b2cfa24333c4b8d1add2..3726f3379600675a00196020f7d18d7e37741c3f 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -695,9 +695,10 @@ class Geocode
                                 } elseif (isset($aSearchTerm['lat']) && $aSearchTerm['lat'] !== '' && $aSearchTerm['lat'] !== null) {
                                     if ($aSearch['oNear'] === false) {
                                         $aSearch['oNear'] = new NearPoint(
                                 } elseif (isset($aSearchTerm['lat']) && $aSearchTerm['lat'] !== '' && $aSearchTerm['lat'] !== null) {
                                     if ($aSearch['oNear'] === false) {
                                         $aSearch['oNear'] = new NearPoint(

-                                                 $aSearchTerm['lat'],
-                                                 $aSearchTerm['lon'],
-                                                 $aSearchTerm['radius']);
+                                            $aSearchTerm['lat'],
+                                            $aSearchTerm['lon'],
+                                            $aSearchTerm['radius']
+                                        );

                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }
                                 } elseif ($sPhraseType == 'postalcode') {
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }
                                 } elseif ($sPhraseType == 'postalcode') {


@@ -1574,7 +1575,7 @@ class Geocode
 
                                         $sOrderBySQL = '';
                                         if ($oNearPoint) {
 
                                         $sOrderBySQL = '';
                                         if ($oNearPoint) {

-                                           $sOrderBySQL = $oNearPoint->distanceSQL('l.centroid');
+                                            $sOrderBySQL = $oNearPoint->distanceSQL('l.centroid');

                                         } elseif ($sPlaceIDs) {
                                             $sOrderBySQL = "ST_Distance(l.centroid, f.geometry)";
                                         } elseif ($sPlaceGeom) {
                                         } elseif ($sPlaceIDs) {
                                             $sOrderBySQL = "ST_Distance(l.centroid, f.geometry)";
                                         } elseif ($sPlaceGeom) {

diff --git a/lib/NearPoint.php b/lib/NearPoint.php
index 16b6dff5276be2ff79f07486fc69cfd9152dd8e2..e8d595cc47ee5cf6603f2b7e6a4c51185c0e2613 100644 (file)
--- a/lib/NearPoint.php
+++ b/lib/NearPoint.php
@@ -13,6 +13,7 @@ class NearPoint
 
     private $sSQL;
 
 
     private $sSQL;
 

+

     public function __construct($lat, $lon, $radius = 0.1)
     {
         $this->fLat = (float)$lat;
     public function __construct($lat, $lon, $radius = 0.1)
     {
         $this->fLat = (float)$lat;


@@ -21,11 +22,20 @@ class NearPoint
         $this->sSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)';
     }
 
         $this->sSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)';
     }
 

-    public function lat() { return $this->fLat; }
+    public function lat()
+    {
+        return $this->fLat;
+    }

 
 

-    public function lon() { return $this->fLon; }
+    public function lon()
+    {
+        return $this->fLon;
+    }

 
 

-    public function radius() { return $this->fRadius; }
+    public function radius()
+    {
+        return $this->fRadius;
+    }

 
     public function distanceSQL($sObj)
     {
 
     public function distanceSQL($sObj)
     {


@@ -39,6 +49,8 @@ class NearPoint
 
     /**
      * Check that the coordinates are valid WSG84 coordinates.
 
     /**
      * Check that the coordinates are valid WSG84 coordinates.

+     *
+     * @return bool True if the coordinates are correctly bounded.

      */
     public function isValid()
     {
      */
     public function isValid()
     {


@@ -53,6 +65,12 @@ class NearPoint
      *
      * If a coordinate is found an array of a new NearPoint and the
      * remaining query is returned or false otherwise.
      *
      * If a coordinate is found an array of a new NearPoint and the
      * remaining query is returned or false otherwise.

+     *
+     * @param string $sQuery Query to scan.
+     *
+     * @return array|false If a coordinate was found, an array with
+     *                     `pt` as the NearPoint coordinates and `query`
+     *                      with the remaining query string. False otherwiese.

      */
     public static function extractFromQuery($sQuery)
     {
      */
     public static function extractFromQuery($sQuery)
     {


@@ -125,16 +143,15 @@ class NearPoint
             $fQueryLat = $aData[2];
             $fQueryLon = $aData[3];
         } else {
             $fQueryLat = $aData[2];
             $fQueryLon = $aData[3];
         } else {

-            return False;
+            return false;

         }
 
         $oPt = new NearPoint($fQueryLat, $fQueryLon);
 
         }
 
         $oPt = new NearPoint($fQueryLat, $fQueryLon);
 

-        if (!$oPt->isValid()) return False;
+        if (!$oPt->isValid()) return false;

 
         $sQuery = trim(str_replace($sFound, ' ', $sQuery));
 
         return array('pt' => $oPt, 'query' => $sQuery);
     }
 
         $sQuery = trim(str_replace($sFound, ' ', $sQuery));
 
         return array('pt' => $oPt, 'query' => $sQuery);
     }

-

 }
 }

diff --git a/test/php/Nominatim/NearPointTest.php b/test/php/Nominatim/NearPointTest.php
index eb11ee5b1f3c532d18bfc1b876aca807db032ec4..6fa9b515078a2e6264aad08e53c14ac86559c938 100644 (file)
--- a/test/php/Nominatim/NearPointTest.php
+++ b/test/php/Nominatim/NearPointTest.php
@@ -6,6 +6,8 @@ require '../../lib/NearPoint.php';
 
 class NearPointTest extends \PHPUnit_Framework_TestCase
 {
 
 class NearPointTest extends \PHPUnit_Framework_TestCase
 {

+
+

     protected function setUp()
     {
     }
     protected function setUp()
     {
     }