fix function declaration errors according to PSR2 coding style guide

[nominatim.git] / lib / ReverseGeocode.php

diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php
index a1915c50ccb640a201d3d7579bfd0aa7ee175305..509ec0a8d6761a21184e48c78a0cb7319dc01e58 100644 (file)
--- a/lib/ReverseGeocode.php
+++ b/lib/ReverseGeocode.php
@@ -14,27 +14,27 @@ class ReverseGeocode
     {
         // 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(

-            0 => 2, // Continent / Sea
-            1 => 2,
-            2 => 2,
-            3 => 4, // Country
-            4 => 4,
-            5 => 8, // State
-            6 => 10, // Region
-            7 => 10,
-            8 => 12, // County
-            9 => 12,
-            10 => 17, // City
-            11 => 17,
-            12 => 18, // Town / Village
-            13 => 18,
-            14 => 22, // Suburb
-            15 => 22,
-            16 => 26, // Street, TODO: major street?
-            17 => 26,
-            18 => 30, // or >, Building
-            19 => 30, // or >, Building
-            );
+                      0 => 2, // Continent / Sea
+                      1 => 2,
+                      2 => 2,
+                      3 => 4, // Country
+                      4 => 4,
+                      5 => 8, // State
+                      6 => 10, // Region
+                      7 => 10,
+                      8 => 12, // County
+                      9 => 12,
+                      10 => 17, // City
+                      11 => 17,
+                      12 => 18, // Town / Village
+                      13 => 18,
+                      14 => 22, // Suburb
+                      15 => 22,
+                      16 => 26, // Street, TODO: major street?
+                      17 => 26,
+                      18 => 30, // or >, Building
+                      19 => 30, // or >, Building
+                     );

         $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
     }
 
         $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28;
     }
 


@@ -78,8 +78,10 @@ class ReverseGeocode
             $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
             $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
             if (CONST_Debug) var_dump($sSQL);
             $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
             $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
             if (CONST_Debug) var_dump($sSQL);

-            $aPlace = chksql($this->oDB->getRow($sSQL),
-                             "Could not determine closest place.");
+            $aPlace = chksql(
+                $this->oDB->getRow($sSQL),
+                "Could not determine closest place."
+            );

             $iPlaceID = $aPlace['place_id'];
             $iParentPlaceID = $aPlace['parent_place_id'];
             $bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us');
             $iPlaceID = $aPlace['place_id'];
             $iParentPlaceID = $aPlace['parent_place_id'];
             $bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us');


@@ -102,8 +104,10 @@ class ReverseGeocode
                     echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "<br>\n";
                 }
             }
                     echo $i['housenumber'] . ' | ' . $i['distance'] * 1000 . ' | ' . $i['lat'] . ' | ' . $i['lon']. ' | '. "<br>\n";
                 }
             }

-            $aPlaceLine = chksql($this->oDB->getRow($sSQL),
-                                 "Could not determine closest housenumber on an osm interpolation line.");
+            $aPlaceLine = chksql(
+                $this->oDB->getRow($sSQL),
+                "Could not determine closest housenumber on an osm interpolation line."
+            );

             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) {


@@ -111,14 +115,18 @@ class ReverseGeocode
                     // 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;

-                    $aDistancePlacex = chksql($this->oDB->getRow($sSQL),
-                                              "Could not determine distance between searched point and placex house.");
+                    $aDistancePlacex = chksql(
+                        $this->oDB->getRow($sSQL),
+                        "Could not determine distance between searched point and placex house."
+                    );

                     $fDistancePlacex = $aDistancePlacex['distance'];
                     // distance between point and interpolated house (fraction on interpolation line)
                     $sSQL = 'SELECT ST_distance('.$sPointSQL.', ST_LineInterpolatePoint(linegeo, '.$aPlaceLine['fraction'].')) as distance';
                     $sSQL .= ' FROM location_property_osmline WHERE place_id = '.$aPlaceLine['place_id'];
                     $fDistancePlacex = $aDistancePlacex['distance'];
                     // distance between point and interpolated house (fraction on interpolation line)
                     $sSQL = 'SELECT ST_distance('.$sPointSQL.', ST_LineInterpolatePoint(linegeo, '.$aPlaceLine['fraction'].')) as distance';
                     $sSQL .= ' FROM location_property_osmline WHERE place_id = '.$aPlaceLine['place_id'];

-                    $aDistanceInterpolation = chksql($this->oDB->getRow($sSQL),
-                                                     "Could not determine distance between searched point and interpolated house.");
+                    $aDistanceInterpolation = chksql(
+                        $this->oDB->getRow($sSQL),
+                        "Could not determine distance between searched point and interpolated house."
+                    );

                     $fDistanceInterpolation = $aDistanceInterpolation['distance'];
                     if ($fDistanceInterpolation < $fDistancePlacex) {
                         // interpolation is closer to point than placex house
                     $fDistanceInterpolation = $aDistanceInterpolation['distance'];
                     if ($fDistanceInterpolation < $fDistancePlacex) {
                         // interpolation is closer to point than placex house


@@ -160,8 +168,10 @@ class ReverseGeocode
                 }
             }
 
                 }
             }
 

-            $aPlaceTiger = chksql($this->oDB->getRow($sSQL),
-                                  "Could not determine closest Tiger place.");
+            $aPlaceTiger = chksql(
+                $this->oDB->getRow($sSQL),
+                "Could not determine closest Tiger place."
+            );

             if ($aPlaceTiger) {
                 if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger);
                 $bPlaceIsTiger = true;
             if ($aPlaceTiger) {
                 if (CONST_Debug) var_dump('found Tiger housenumber', $aPlaceTiger);
                 $bPlaceIsTiger = true;


@@ -183,15 +193,16 @@ class ReverseGeocode
             $sSQL .= " WHERE place_id = $iPlaceID";
             $sSQL .= " ORDER BY abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc";
             $sSQL .= ' LIMIT 1';
             $sSQL .= " WHERE place_id = $iPlaceID";
             $sSQL .= " ORDER BY abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc";
             $sSQL .= ' LIMIT 1';

-            $iPlaceID = chksql($this->oDB->getOne($sSQL),
-                               "Could not get parent for place.");
+            $iPlaceID = chksql($this->oDB->getOne($sSQL), "Could not get parent for place.");

             if (!$iPlaceID) {
                 $iPlaceID = $aPlace['place_id'];
             }
         }
             if (!$iPlaceID) {
                 $iPlaceID = $aPlace['place_id'];
             }
         }

-        return array('place_id' => $iPlaceID,
-                    'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'),
-                    'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1);
+        return array(
+                'place_id' => $iPlaceID,
+                'type' => $bPlaceIsTiger ? 'tiger' : ($bPlaceIsLine ? 'interpolation' : 'osm'),
+                'fraction' => ($bPlaceIsTiger || $bPlaceIsLine) ? $fFraction : -1
+               );

     }
     
 }
     }
     
 }