alxarafe / alixar

public/htdocs/includes/geoPHP/lib/geometry/Point.class.php

Braces +3 added lines, -1 removed lines

@@ -83,7 +83,9 @@
     {
         if ($this->dimension == 3) {
             return $this->coords[2];
-        } else return null;
+        } else {
+            return null;
+        }
     }
 
     /**

public/htdocs/includes/geoPHP/lib/geometry/LineString.class.php

Braces +3 added lines, -1 removed lines

@@ -63,7 +63,9 @@
 
     public function dimension()
     {
-        if ($this->isEmpty()) return 0;
+        if ($this->isEmpty()) {
+            return 0;
+        }
         return 1;
     }
 

public/htdocs/includes/geoPHP/lib/geometry/Polygon.class.php

Braces +26 added lines, -9 removed lines

@@ -16,7 +16,9 @@ 
 
     public function area($exterior_only = false, $signed = false)
     {
-        if ($this->isEmpty()) return 0;
+        if ($this->isEmpty()) {
+            return 0;
+        }
 
         if ($this->geos() && $exterior_only == false) {
             return $this->geos()->area();
@@ -26,15 +28,20 @@ 
         $pts = $exterior_ring->getComponents();
 
         $c = count($pts);
-        if ((int) $c == '0') return null;
+        if ((int) $c == '0') {
+            return null;
+        }
         $a = '0';
         foreach ($pts as $k => $p) {
             $j = ($k + 1) % $c;
             $a = $a + ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
         }
 
-        if ($signed) $area = ($a / 2);
-        else $area = abs(($a / 2));
+        if ($signed) {
+            $area = ($a / 2);
+        } else {
+            $area = abs(($a / 2));
+        }
 
         if ($exterior_only == true) {
             return $area;
@@ -50,7 +57,9 @@ 
 
     public function centroid()
     {
-        if ($this->isEmpty()) return null;
+        if ($this->isEmpty()) {
+            return null;
+        }
 
         if ($this->geos()) {
             return geoPHP::geosToGeometry($this->geos()->centroid());
@@ -60,7 +69,9 @@ 
         $pts = $exterior_ring->getComponents();
 
         $c = count($pts);
-        if ((int) $c == '0') return null;
+        if ((int) $c == '0') {
+            return null;
+        }
         $cn = array('x' => '0', 'y' => '0');
         $a = $this->area(true, true);
 
@@ -108,13 +119,17 @@ 
 
     public function exteriorRing()
     {
-        if ($this->isEmpty()) return new LineString();
+        if ($this->isEmpty()) {
+            return new LineString();
+        }
         return $this->components[0];
     }
 
     public function numInteriorRings()
     {
-        if ($this->isEmpty()) return 0;
+        if ($this->isEmpty()) {
+            return 0;
+        }
         return $this->numGeometries() - 1;
     }
 
@@ -125,7 +140,9 @@ 
 
     public function dimension()
     {
-        if ($this->isEmpty()) return 0;
+        if ($this->isEmpty()) {
+            return 0;
+        }
         return 2;
     }
 

public/htdocs/includes/geoPHP/lib/adapters/WKT.class.php

Braces +55 added lines, -19 removed lines

@@ -63,7 +63,9 @@ 
         $data_string = $this->trimParens($data_string);
 
         // If it's marked as empty, then return an empty point
-        if ($data_string == 'EMPTY') return new Point();
+        if ($data_string == 'EMPTY') {
+            return new Point();
+        }
 
         $parts = explode(' ', $data_string);
         return new Point($parts[0], $parts[1]);
@@ -74,7 +76,9 @@ 
         $data_string = $this->trimParens($data_string);
 
         // If it's marked as empty, then return an empty line
-        if ($data_string == 'EMPTY') return new LineString();
+        if ($data_string == 'EMPTY') {
+            return new LineString();
+        }
 
         $parts = explode(',', $data_string);
         $points = array();
@@ -89,13 +93,19 @@ 
         $data_string = $this->trimParens($data_string);
 
         // If it's marked as empty, then return an empty polygon
-        if ($data_string == 'EMPTY') return new Polygon();
+        if ($data_string == 'EMPTY') {
+            return new Polygon();
+        }
 
         $parts = explode('),(', $data_string);
         $lines = array();
         foreach ($parts as $part) {
-            if (!$this->beginsWith($part, '(')) $part = '(' . $part;
-            if (!$this->endsWith($part, ')'))   $part = $part . ')';
+            if (!$this->beginsWith($part, '(')) {
+                $part = '(' . $part;
+            }
+            if (!$this->endsWith($part, ')')) {
+                $part = $part . ')';
+            }
             $lines[] = $this->parseLineString($part);
         }
         return new Polygon($lines);
@@ -106,7 +116,9 @@ 
         $data_string = $this->trimParens($data_string);
 
         // If it's marked as empty, then return an empty MutiPoint
-        if ($data_string == 'EMPTY') return new MultiPoint();
+        if ($data_string == 'EMPTY') {
+            return new MultiPoint();
+        }
 
         $parts = explode(',', $data_string);
         $points = array();
@@ -121,14 +133,20 @@ 
         $data_string = $this->trimParens($data_string);
 
         // If it's marked as empty, then return an empty multi-linestring
-        if ($data_string == 'EMPTY') return new MultiLineString();
+        if ($data_string == 'EMPTY') {
+            return new MultiLineString();
+        }
 
         $parts = explode('),(', $data_string);
         $lines = array();
         foreach ($parts as $part) {
             // Repair the string if the explode broke it
-            if (!$this->beginsWith($part, '(')) $part = '(' . $part;
-            if (!$this->endsWith($part, ')'))   $part = $part . ')';
+            if (!$this->beginsWith($part, '(')) {
+                $part = '(' . $part;
+            }
+            if (!$this->endsWith($part, ')')) {
+                $part = $part . ')';
+            }
             $lines[] = $this->parseLineString($part);
         }
         return new MultiLineString($lines);
@@ -139,14 +157,20 @@ 
         $data_string = $this->trimParens($data_string);
 
         // If it's marked as empty, then return an empty multi-polygon
-        if ($data_string == 'EMPTY') return new MultiPolygon();
+        if ($data_string == 'EMPTY') {
+            return new MultiPolygon();
+        }
 
         $parts = explode(')),((', $data_string);
         $polys = array();
         foreach ($parts as $part) {
             // Repair the string if the explode broke it
-            if (!$this->beginsWith($part, '((')) $part = '((' . $part;
-            if (!$this->endsWith($part, '))'))   $part = $part . '))';
+            if (!$this->beginsWith($part, '((')) {
+                $part = '((' . $part;
+            }
+            if (!$this->endsWith($part, '))')) {
+                $part = $part . '))';
+            }
             $polys[] = $this->parsePolygon($part);
         }
         return new MultiPolygon($polys);
@@ -157,7 +181,9 @@ 
         $data_string = $this->trimParens($data_string);
 
         // If it's marked as empty, then return an empty geom-collection
-        if ($data_string == 'EMPTY') return new GeometryCollection();
+        if ($data_string == 'EMPTY') {
+            return new GeometryCollection();
+        }
 
         $geometries = array();
         $matches = array();
@@ -178,7 +204,9 @@ 
             return substr($wkt, $first_paren);
         } elseif (strstr($wkt, 'EMPTY')) {
             return 'EMPTY';
-        } else return false;
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -191,19 +219,27 @@ 
         // We want to only strip off one set of parenthesis
         if ($this->beginsWith($str, '(')) {
             return substr($str, 1, -1);
-        } else return $str;
+        } else {
+            return $str;
+        }
     }
 
     protected function beginsWith($str, $char)
     {
-        if (substr($str, 0, strlen($char)) == $char) return true;
-        else return false;
+        if (substr($str, 0, strlen($char)) == $char) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     protected function endsWith($str, $char)
     {
-        if (substr($str, (0 - strlen($char))) == $char) return true;
-        else return false;
+        if (substr($str, (0 - strlen($char))) == $char) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /**

public/htdocs/includes/geoPHP/lib/adapters/GPX.class.php

Braces +3 added lines, -1 removed lines

@@ -37,7 +37,9 @@
      */
     public function write(Geometry $geometry, $namespace = false)
     {
-        if ($geometry->isEmpty()) return null;
+        if ($geometry->isEmpty()) {
+            return null;
+        }
         if ($namespace) {
             $this->namespace = $namespace;
             $this->nss = $namespace . ':';

public/htdocs/includes/geoPHP/lib/adapters/WKB.class.php

Braces +3 added lines, -1 removed lines

@@ -102,7 +102,9 @@
         $line_length = unpack('L', fread($mem, 4));
 
         // Return an empty linestring if there is no line-length
-        if (!$line_length[1]) return new LineString();
+        if (!$line_length[1]) {
+            return new LineString();
+        }
 
         // Read the nubmer of points x2 (each point is two coords) into decimal-floats
         $line_coords = unpack('d*', fread($mem, $line_length[1] * $this->dimension * 8));

public/htdocs/includes/geoPHP/lib/adapters/GoogleGeocode.class.php

Braces +13 added lines, -5 removed lines

@@ -31,7 +31,9 @@ 
      */
     public function read($address, $return_type = 'point', $bounds = false, $return_multiple = false)
     {
-        if (is_array($address)) $address = join(',', $address);
+        if (is_array($address)) {
+            $address = join(',', $address);
+        }
 
         if (gettype($bounds) == 'object') {
             $bounds = $bounds->getBBox();
@@ -74,8 +76,11 @@ 
                 }
             }
         } else {
-            if ($this->result->status) throw new Exception('Error in Google Geocoder: ' . $this->result->status);
-            else throw new Exception('Unknown error in Google Geocoder');
+            if ($this->result->status) {
+                throw new Exception('Error in Google Geocoder: ' . $this->result->status);
+            } else {
+                throw new Exception('Unknown error in Google Geocoder');
+            }
             return false;
         }
     }
@@ -114,8 +119,11 @@ 
                 return $this->result->results;
             }
         } else {
-            if ($this->result->status) throw new Exception('Error in Google Reverse Geocoder: ' . $this->result->status);
-            else throw new Exception('Unknown error in Google Reverse Geocoder');
+            if ($this->result->status) {
+                throw new Exception('Error in Google Reverse Geocoder: ' . $this->result->status);
+            } else {
+                throw new Exception('Unknown error in Google Reverse Geocoder');
+            }
             return false;
         }
     }

public/htdocs/includes/geoPHP/lib/adapters/KML.class.php

Braces +3 added lines, -1 removed lines

@@ -244,7 +244,9 @@
             $str .= '<' . $this->nss . 'coordinates>';
             $i = 0;
             foreach ($geom->getComponents() as $comp) {
-                if ($i != 0) $str .= ' ';
+                if ($i != 0) {
+                    $str .= ' ';
+                }
                 $str .= $comp->getX() . ',' . $comp->getY();
                 $i++;
             }

public/htdocs/includes/geoPHP/lib/adapters/GeoRSS.class.php

Braces +6 added lines, -2 removed lines

@@ -223,7 +223,9 @@ 
         $output = '<' . $this->nss . 'line>';
         foreach ($geom->getComponents() as $k => $point) {
             $output .= $point->getY() . ' ' . $point->getX();
-            if ($k < ($geom->numGeometries() - 1)) $output .= ' ';
+            if ($k < ($geom->numGeometries() - 1)) {
+                $output .= ' ';
+            }
         }
         $output .= '</' . $this->nss . 'line>';
         return $output;
@@ -235,7 +237,9 @@ 
         $exterior_ring = $geom->exteriorRing();
         foreach ($exterior_ring->getComponents() as $k => $point) {
             $output .= $point->getY() . ' ' . $point->getX();
-            if ($k < ($exterior_ring->numGeometries() - 1)) $output .= ' ';
+            if ($k < ($exterior_ring->numGeometries() - 1)) {
+                $output .= ' ';
+            }
         }
         $output .= '</' . $this->nss . 'polygon>';
         return $output;