mprins / dokuwiki-plugin-geophp

geoPHP/lib/geometry/Polygon.class.php

Braces +27 added lines, -11 removed lines

@@ -14,7 +14,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();
@@ -24,15 +26,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;
@@ -47,7 +54,9 @@ 
   }
   
   public function centroid() {
-    if ($this->isEmpty()) return NULL;
+    if ($this->isEmpty()) {
+      return NULL;
+    }
     
     if ($this->geos()) {
       return geoPHP::geosToGeometry($this->geos()->centroid());
@@ -57,7 +66,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);
     
@@ -103,12 +114,16 @@ 
   }
 
   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;
   }
   
@@ -117,7 +132,9 @@ 
   }
   
   public function dimension() {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+      return 0;
+    }
     return 2;
   }
 
@@ -192,8 +209,7 @@ 
     // If the number of edges we passed through is even, then it's in the polygon.
     if ($intersections % 2 != 0) {
       return TRUE;
-    }
-    else {
+    } else {
       return FALSE;
     }
   }

geoPHP/lib/geometry/Collection.class.php

Braces +21 added lines, -13 removed lines

@@ -24,8 +24,7 @@ 
     foreach ($components as $component) {
       if ($component instanceof Geometry) {
         $this->components[] = $component;
-      }
-      else {
+      } else {
         throw new Exception("Cannot create a collection with non-geometries");
       }
     }
@@ -53,13 +52,16 @@ 
   {
 	for($i=0;$i<count($this->components);$i++)
 	{
-		if( method_exists($this->components[$i], 'invertxy' ) )
-			$this->components[$i]->invertxy();
+		if( method_exists($this->components[$i], 'invertxy' ) ) {
+					$this->components[$i]->invertxy();
+		}
 	}
   }
 
   public function centroid() {
-    if ($this->isEmpty()) return NULL;
+    if ($this->isEmpty()) {
+      return NULL;
+    }
 
     if ($this->geos()) {
       $geos_centroid = $this->geos()->centroid();
@@ -77,7 +79,9 @@ 
   }
 
   public function getBBox() {
-    if ($this->isEmpty()) return NULL;
+    if ($this->isEmpty()) {
+      return NULL;
+    }
 
     if ($this->geos()) {
       $envelope = $this->geos()->envelope();
@@ -145,7 +149,9 @@ 
 
   // By default, the boundary of a collection is the boundary of it's components
   public function boundary() {
-    if ($this->isEmpty()) return new LineString();
+    if ($this->isEmpty()) {
+      return new LineString();
+    }
 
     if ($this->geos()) {
       return $this->geos()->boundary();
@@ -167,8 +173,7 @@ 
     $n = intval($n);
     if (array_key_exists($n-1, $this->components)) {
       return $this->components[$n-1];
-    }
-    else {
+    } else {
       return NULL;
     }
   }
@@ -211,10 +216,11 @@ 
   public function isEmpty() {
     if (!count($this->components)) {
       return TRUE;
-    }
-    else {
+    } else {
       foreach ($this->components as $component) {
-        if (!$component->isEmpty()) return FALSE;
+        if (!$component->isEmpty()) {
+          return FALSE;
+        }
       }
       return TRUE;
     }
@@ -281,7 +287,9 @@ 
 
     // A collection is simple if all it's components are simple
     foreach ($this->components as $component) {
-      if (!$component->isSimple()) return FALSE;
+      if (!$component->isSimple()) {
+        return FALSE;
+      }
     }
 
     return TRUE;

geoPHP/lib/geometry/Point.class.php

Braces +5 added lines, -7 removed lines

@@ -79,8 +79,9 @@ 
   public function z() {
     if ($this->dimension == 3) {
       return $this->coords[2];
+    } else {
+      return NULL;
     }
-    else return NULL;
   }
 
   /**
@@ -144,8 +145,7 @@ 
   public function isEmpty() {
     if ($this->dimension == 0) {
       return TRUE;
-    }
-    else {
+    } else {
       return FALSE;
     }
   }
@@ -169,11 +169,9 @@ 
        * @see: http://tubalmartin.github.io/spherical-geometry-php/#LatLng
        */
       return (abs($this->x() - $geometry->x()) <= 1.0E-9 && abs($this->y() - $geometry->y()) <= 1.0E-9);
-    }
-    else if ($this->isEmpty() && $geometry->isEmpty()) {
+    } else if ($this->isEmpty() && $geometry->isEmpty()) {
       return TRUE;
-    }
-    else {
+    } else {
       return FALSE;
     }
   }

geoPHP/lib/geometry/Geometry.class.php

Braces +6 added lines, -7 removed lines

@@ -57,7 +57,9 @@ 
   }
 
   public function envelope() {
-    if ($this->isEmpty()) return new Polygon();
+    if ($this->isEmpty()) {
+      return new Polygon();
+    }
 
     if ($this->geos()) {
       return geoPHP::geosToGeometry($this->geos()->envelope());
@@ -148,8 +150,7 @@ 
     if (geoPHP::geosInstalled()) {
       $reader = new GEOSWKBReader();
       $this->geos = $reader->readHEX($this->out('wkb',TRUE));
-    }
-    else {
+    } else {
       $this->geos = FALSE;
     }
     return $this->geos;
@@ -175,8 +176,7 @@ 
     if ($this->geos()) {
       if ($pattern) {
         return $this->geos()->relate($geometry->geos(), $pattern);
-      }
-      else {
+      } else {
         return $this->geos()->relate($geometry->geos());
       }
     }
@@ -227,8 +227,7 @@ 
           $geom = $geom->union($item->geos());
         }
         return geoPHP::geosToGeometry($geom);
-      }
-      else {
+      } else {
         return geoPHP::geosToGeometry($this->geos()->union($geometry->geos()));
       }
     }

geoPHP/lib/geometry/LineString.class.php

Braces +3 added lines, -1 removed lines

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

geoPHP/lib/adapters/GPX.class.php

Braces +3 added lines, -1 removed lines

@@ -34,7 +34,9 @@
    * @return string The GPX string representation of the input geometries
    */
   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.':';    

geoPHP/lib/adapters/EWKT.class.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
       $wkt = 'SRID=' . $srid . ';';
       $wkt .= $geometry->out('wkt');
       return $wkt;
-    }
-    else {
+    } else {
       return $geometry->out('wkt');
     }
   }

geoPHP/lib/adapters/GeoJSON.class.php

Braces +5 added lines, -6 removed lines

@@ -57,8 +57,7 @@ 
   private function arrayToPoint($array) {
     if (!empty($array)) {
       return new Point($array[0], $array[1]);
-    }
-    else {
+    } else {
       return new Point();
     }
   }
@@ -125,8 +124,7 @@ 
   public function write(Geometry $geometry, $return_array = FALSE) {
     if ($return_array) {
       return $this->getArray($geometry);
-    }
-    else {
+    } else {
       return json_encode($this->getArray($geometry));
     }
   }
@@ -144,11 +142,12 @@ 
         'type'=> 'GeometryCollection',
         'geometries'=> $component_array,
       );
-    }
-    else return array(
+    } else {
+      return array(
       'type'=> $geometry->getGeomType(),
       'coordinates'=> $geometry->asArray(),
     );
+    }
   }
 }
 

geoPHP/lib/adapters/GeoRSS.class.php

Braces +9 added lines, -8 removed lines

@@ -92,8 +92,7 @@ 
       if (!($key % 2)) {
         // It's a latitude
         $lat = $item;
-      }
-      else {
+      } else {
         // It's a longitude
         $lon = $item;
         $coords[] = new Point($lon, $lat);
@@ -111,8 +110,7 @@ 
       }
       if (!empty($point_array)) {
         $points[] = $point_array[0];
-      }
-      else {
+      } else {
         $points[] = new Point();
       }
     }
@@ -137,8 +135,7 @@ 
         $points = $this->getPointsFromCoords(trim($poly->firstChild->nodeValue));
         $exterior_ring = new LineString($points);
         $polygons[] = new Polygon(array($exterior_ring));
-      }
-      else {
+      } else {
         // It's an EMPTY polygon
         $polygons[] = new Polygon(); 
       }
@@ -212,7 +209,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;
@@ -223,7 +222,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;