mprins / dokuwiki-plugin-geophp

geoPHP/lib/geometry/Polygon.class.php

Indentation +15 added lines, -15 removed lines

@@ -80,26 +80,26 @@
     return $centroid;
   }
 
-	/**
-	 * Find the outermost point from the centroid
-	 *
-	 * @returns Point The outermost point
-	 */
+  /**
+   * Find the outermost point from the centroid
+   *
+   * @returns Point The outermost point
+   */
   public function outermostPoint() {
-		$centroid = $this->getCentroid();
+    $centroid = $this->getCentroid();
 
-		$max = array('length' => 0, 'point' => null);
+    $max = array('length' => 0, 'point' => null);
 
-		foreach($this->getPoints() as $point) {
-			$lineString = new LineString(array($centroid, $point));
+    foreach($this->getPoints() as $point) {
+      $lineString = new LineString(array($centroid, $point));
 
-			if($lineString->length() > $max['length']) {
-				$max['length'] = $lineString->length();
-				$max['point'] = $point;
-			}
-		}
+      if($lineString->length() > $max['length']) {
+        $max['length'] = $lineString->length();
+        $max['point'] = $point;
+      }
+    }
 
-		return $max['point'];
+    return $max['point'];
   }
 
   public function exteriorRing() {

Spacing +18 added lines, -18 removed lines

@@ -24,11 +24,11 @@ 
     $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());
+    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);
@@ -57,7 +57,7 @@ 
     $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);
     
@@ -66,15 +66,15 @@ 
       return $this->exteriorRing()->pointN(1);
     }
     
-    foreach($pts as $k => $p){
-      $j = ($k + 1) % $c;
-      $P = ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
-      $cn['x'] = $cn['x'] + ($p->getX() + $pts[$j]->getX()) * $P;
-      $cn['y'] = $cn['y'] + ($p->getY() + $pts[$j]->getY()) * $P;
+    foreach ($pts as $k => $p) {
+      $j = ($k+1) % $c;
+      $P = ($p->getX() * $pts[$j]->getY())-($p->getY() * $pts[$j]->getX());
+      $cn['x'] = $cn['x']+($p->getX()+$pts[$j]->getX()) * $P;
+      $cn['y'] = $cn['y']+($p->getY()+$pts[$j]->getY()) * $P;
     }
     
-    $cn['x'] = $cn['x'] / ( 6 * $a);
-    $cn['y'] = $cn['y'] / ( 6 * $a);
+    $cn['x'] = $cn['x'] / (6 * $a);
+    $cn['y'] = $cn['y'] / (6 * $a);
     
     $centroid = new Point($cn['x'], $cn['y']);
     return $centroid;
@@ -90,10 +90,10 @@ 
 
 		$max = array('length' => 0, 'point' => null);
 
-		foreach($this->getPoints() as $point) {
+		foreach ($this->getPoints() as $point) {
 			$lineString = new LineString(array($centroid, $point));
 
-			if($lineString->length() > $max['length']) {
+			if ($lineString->length() > $max['length']) {
 				$max['length'] = $lineString->length();
 				$max['point'] = $point;
 			}
@@ -162,7 +162,7 @@ 
     $intersections = 0; 
     $vertices_count = count($vertices);
 
-    for ($i=1; $i < $vertices_count; $i++) {
+    for ($i = 1; $i < $vertices_count; $i++) {
       $vertex1 = $vertices[$i-1]; 
       $vertex2 = $vertices[$i];
       if ($vertex1->y() == $vertex2->y() 
@@ -177,8 +177,8 @@ 
       && $point->x() <= max($vertex1->x(), $vertex2->x())
       && $vertex1->y() != $vertex2->y()) {
         $xinters = 
-          ($point->y() - $vertex1->y()) * ($vertex2->x() - $vertex1->x())
-          / ($vertex2->y() - $vertex1->y()) 
+          ($point->y()-$vertex1->y()) * ($vertex2->x()-$vertex1->x())
+          / ($vertex2->y()-$vertex1->y()) 
           + $vertex1->x();
         if ($xinters == $point->x()) {
           // Check if point is on the polygon boundary (other than horizontal)
@@ -199,7 +199,7 @@ 
   }
   
   public function pointOnVertex($point) {
-    foreach($this->getPoints() as $vertex) {
+    foreach ($this->getPoints() as $vertex) {
       if ($point->equals($vertex)) {
         return true;
       }

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

Indentation +5 added lines, -5 removed lines

@@ -51,11 +51,11 @@
    * */
   public function invertxy()
   {
-	for($i=0;$i<count($this->components);$i++)
-	{
-		if( method_exists($this->components[$i], 'invertxy' ) )
-			$this->components[$i]->invertxy();
-	}
+  for($i=0;$i<count($this->components);$i++)
+  {
+    if( method_exists($this->components[$i], 'invertxy' ) )
+      $this->components[$i]->invertxy();
+  }
   }
 
   public function centroid() {

Spacing +12 added lines, -12 removed lines

@@ -51,9 +51,9 @@ 
    * */
   public function invertxy()
   {
-	for($i=0;$i<count($this->components);$i++)
+	for ($i = 0; $i < count($this->components); $i++)
 	{
-		if( method_exists($this->components[$i], 'invertxy' ) )
+		if (method_exists($this->components[$i], 'invertxy'))
 			$this->components[$i]->invertxy();
 	}
   }
@@ -297,16 +297,16 @@ 
 
   // Not valid for this geometry type
   // --------------------------------
-  public function x()                { return NULL; }
-  public function y()                { return NULL; }
-  public function startPoint()       { return NULL; }
-  public function endPoint()         { return NULL; }
-  public function isRing()           { return NULL; }
-  public function isClosed()         { return NULL; }
-  public function pointN($n)         { return NULL; }
-  public function exteriorRing()     { return NULL; }
+  public function x() { return NULL; }
+  public function y() { return NULL; }
+  public function startPoint() { return NULL; }
+  public function endPoint() { return NULL; }
+  public function isRing() { return NULL; }
+  public function isClosed() { return NULL; }
+  public function pointN($n) { return NULL; }
+  public function exteriorRing() { return NULL; }
   public function numInteriorRings() { return NULL; }
-  public function interiorRingN($n)  { return NULL; }
-  public function pointOnSurface()   { return NULL; }
+  public function interiorRingN($n) { return NULL; }
+  public function pointOnSurface() { return NULL; }
 }
 

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

Indentation +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
     // Check to see if this is a 3D point
     if ($z !== NULL) {
       if (!is_numeric($z)) {
-       throw new Exception("Cannot construct Point. z should be numeric");
+        throw new Exception("Cannot construct Point. z should be numeric");
       }
       $this->dimension = 3;
     }
@@ -92,9 +92,9 @@ 
    * */
   public function invertxy()
   {
-	$x=$this->coords[0];
-	$this->coords[0]=$this->coords[1];
-	$this->coords[1]=$x;
+  $x=$this->coords[0];
+  $this->coords[0]=$this->coords[1];
+  $this->coords[1]=$x;
   }
 
 

Spacing +15 added lines, -15 removed lines

@@ -92,9 +92,9 @@ 
    * */
   public function invertxy()
   {
-	$x=$this->coords[0];
-	$this->coords[0]=$this->coords[1];
-	$this->coords[1]=$x;
+	$x = $this->coords[0];
+	$this->coords[0] = $this->coords[1];
+	$this->coords[1] = $x;
   }
 
 
@@ -168,7 +168,7 @@ 
        * @see: http://php.net/manual/en/language.types.float.php
        * @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);
+      return (abs($this->x()-$geometry->x()) <= 1.0E-9 && abs($this->y()-$geometry->y()) <= 1.0E-9);
     }
     else if ($this->isEmpty() && $geometry->isEmpty()) {
       return TRUE;
@@ -183,17 +183,17 @@ 
   }
 
   // Not valid for this geometry type
-  public function numGeometries()    { return NULL; }
-  public function geometryN($n)      { return NULL; }
-  public function startPoint()       { return NULL; }
-  public function endPoint()         { return NULL; }
-  public function isRing()           { return NULL; }
-  public function isClosed()         { return NULL; }
-  public function pointN($n)         { return NULL; }
-  public function exteriorRing()     { return NULL; }
+  public function numGeometries() { return NULL; }
+  public function geometryN($n) { return NULL; }
+  public function startPoint() { return NULL; }
+  public function endPoint() { return NULL; }
+  public function isRing() { return NULL; }
+  public function isClosed() { return NULL; }
+  public function pointN($n) { return NULL; }
+  public function exteriorRing() { return NULL; }
   public function numInteriorRings() { return NULL; }
-  public function interiorRingN($n)  { return NULL; }
-  public function pointOnSurface()   { return NULL; }
-  public function explode()          { return NULL; }
+  public function interiorRingN($n) { return NULL; }
+  public function pointOnSurface() { return NULL; }
+  public function explode() { return NULL; }
 }
 

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

Spacing +9 added lines, -9 removed lines

@@ -21,8 +21,8 @@ 
   abstract public function geometryN($n);
   abstract public function startPoint();
   abstract public function endPoint();
-  abstract public function isRing();            // Mssing dependancy
-  abstract public function isClosed();          // Missing dependancy
+  abstract public function isRing(); // Mssing dependancy
+  abstract public function isClosed(); // Missing dependancy
   abstract public function numPoints();
   abstract public function pointN($n);
   abstract public function exteriorRing();
@@ -64,12 +64,12 @@ 
     }
 
     $bbox = $this->getBBox();
-    $points = array (
-      new Point($bbox['maxx'],$bbox['miny']),
-      new Point($bbox['maxx'],$bbox['maxy']),
-      new Point($bbox['minx'],$bbox['maxy']),
-      new Point($bbox['minx'],$bbox['miny']),
-      new Point($bbox['maxx'],$bbox['miny']),
+    $points = array(
+      new Point($bbox['maxx'], $bbox['miny']),
+      new Point($bbox['maxx'], $bbox['maxy']),
+      new Point($bbox['minx'], $bbox['maxy']),
+      new Point($bbox['minx'], $bbox['miny']),
+      new Point($bbox['maxx'], $bbox['miny']),
     );
 
     $outer_boundary = new LineString($points);
@@ -147,7 +147,7 @@ 
     // It hasn't been set yet, generate it
     if (geoPHP::geosInstalled()) {
       $reader = new GEOSWKBReader();
-      $this->geos = $reader->readHEX($this->out('wkb',TRUE));
+      $this->geos = $reader->readHEX($this->out('wkb', TRUE));
     }
     else {
       $this->geos = FALSE;

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

Spacing +17 added lines, -17 removed lines

@@ -69,7 +69,7 @@ 
     foreach ($this->getPoints() as $delta => $point) {
       $previous_point = $this->geometryN($delta);
       if ($previous_point) {
-        $length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY()- $point->getY()), 2));
+        $length += sqrt(pow(($previous_point->getX()-$point->getX()), 2)+pow(($previous_point->getY()-$point->getY()), 2));
       }
     }
     return $length;
@@ -78,25 +78,25 @@ 
   public function greatCircleLength($radius = 6378137) {
     $length = 0;
     $points = $this->getPoints();
-    for($i=0; $i<$this->numPoints()-1; $i++) {
+    for ($i = 0; $i < $this->numPoints()-1; $i++) {
       $point = $points[$i];
       $next_point = $points[$i+1];
-      if (!is_object($next_point)) {continue;}
+      if (!is_object($next_point)) {continue; }
       // Great circle method
       $lat1 = deg2rad($point->getY());
       $lat2 = deg2rad($next_point->getY());
       $lon1 = deg2rad($point->getX());
       $lon2 = deg2rad($next_point->getX());
-      $dlon = $lon2 - $lon1;
+      $dlon = $lon2-$lon1;
       $length +=
         $radius *
           atan2(
             sqrt(
-              pow(cos($lat2) * sin($dlon), 2) +
-                pow(cos($lat1) * sin($lat2) - sin($lat1) * cos($lat2) * cos($dlon), 2)
+              pow(cos($lat2) * sin($dlon), 2)+
+                pow(cos($lat1) * sin($lat2)-sin($lat1) * cos($lat2) * cos($dlon), 2)
             )
             ,
-            sin($lat1) * sin($lat2) +
+            sin($lat1) * sin($lat2)+
               cos($lat1) * cos($lat2) * cos($dlon)
           );
     }
@@ -107,15 +107,15 @@ 
   public function haversineLength() {
     $degrees = 0;
     $points = $this->getPoints();
-    for($i=0; $i<$this->numPoints()-1; $i++) {
+    for ($i = 0; $i < $this->numPoints()-1; $i++) {
       $point = $points[$i];
       $next_point = $points[$i+1];
-      if (!is_object($next_point)) {continue;}
+      if (!is_object($next_point)) {continue; }
       $degree = rad2deg(
         acos(
-          sin(deg2rad($point->getY())) * sin(deg2rad($next_point->getY())) +
+          sin(deg2rad($point->getY())) * sin(deg2rad($next_point->getY()))+
             cos(deg2rad($point->getY())) * cos(deg2rad($next_point->getY())) *
-              cos(deg2rad(abs($point->getX() - $next_point->getX())))
+              cos(deg2rad(abs($point->getX()-$next_point->getX())))
         )
       );
       $degrees += $degree;
@@ -167,18 +167,18 @@ 
     $p3_x = $segment->endPoint()->x();
     $p3_y = $segment->endPoint()->y();
 
-    $s1_x = $p1_x - $p0_x;     $s1_y = $p1_y - $p0_y;
-    $s2_x = $p3_x - $p2_x;     $s2_y = $p3_y - $p2_y;
+    $s1_x = $p1_x-$p0_x; $s1_y = $p1_y-$p0_y;
+    $s2_x = $p3_x-$p2_x; $s2_y = $p3_y-$p2_y;
 
-    $fps = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
-    $fpt = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
+    $fps = (-$s2_x * $s1_y)+($s1_x * $s2_y);
+    $fpt = (-$s2_x * $s1_y)+($s1_x * $s2_y);
 
     if ($fps == 0 || $fpt == 0) {
       return FALSE;
     }
 
-    $s = (-$s1_y * ($p0_x - $p2_x) + $s1_x * ($p0_y - $p2_y)) / $fps;
-    $t = ( $s2_x * ($p0_y - $p2_y) - $s2_y * ($p0_x - $p2_x)) / $fpt;
+    $s = (-$s1_y * ($p0_x-$p2_x)+$s1_x * ($p0_y-$p2_y)) / $fps;
+    $t = ($s2_x * ($p0_y-$p2_y)-$s2_y * ($p0_x-$p2_x)) / $fpt;
 
     if ($s > 0 && $s < 1 && $t > 0 && $t < 1) {
       // Collision detected

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

Spacing +6 added lines, -6 removed lines

@@ -45,21 +45,21 @@ 
   public function geomFromText($text) {
     // Change to lower-case and strip all CDATA
     $text = strtolower($text);
-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);
+    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s', '', $text);
     
     // Load into DOMDocument
     $xmlobj = new DOMDocument();
     @$xmlobj->loadXML($text);
     if ($xmlobj === false) {
-      throw new Exception("Invalid GPX: ". $text);
+      throw new Exception("Invalid GPX: ".$text);
     }
     
     $this->xmlobj = $xmlobj;
     try {
       $geom = $this->geomFromXML();
-    } catch(InvalidText $e) {
-        throw new Exception("Cannot Read Geometry From GPX: ". $text);
-    } catch(Exception $e) {
+    } catch (InvalidText $e) {
+        throw new Exception("Cannot Read Geometry From GPX: ".$text);
+    } catch (Exception $e) {
         throw $e;
     }
 
@@ -112,7 +112,7 @@ 
           $components[] = new Point($lon, $lat);
         }
       }
-      if ($components) {$lines[] = new LineString($components);}
+      if ($components) {$lines[] = new LineString($components); }
     }
     return $lines;
   }

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     if ($type == 'GeometryCollection') {
       return $this->objToGeometryCollection($obj);
     }
-    $method = 'arrayTo' . $type;
+    $method = 'arrayTo'.$type;
     return $this->$method($obj->coordinates);
   }
 

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

Spacing +10 added lines, -10 removed lines

@@ -44,21 +44,21 @@ 
   public function geomFromText($text) {
     // Change to lower-case, strip all CDATA, and de-namespace
     $text = strtolower($text);
-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);
+    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s', '', $text);
         
     // Load into DOMDOcument
     $xmlobj = new DOMDocument();
     @$xmlobj->loadXML($text);
     if ($xmlobj === false) {
-      throw new Exception("Invalid GeoRSS: ". $text);
+      throw new Exception("Invalid GeoRSS: ".$text);
     }
     
     $this->xmlobj = $xmlobj;
     try {
       $geom = $this->geomFromXML();
-    } catch(InvalidText $e) {
-        throw new Exception("Cannot Read Geometry From GeoRSS: ". $text);
-    } catch(Exception $e) {
+    } catch (InvalidText $e) {
+        throw new Exception("Cannot Read Geometry From GeoRSS: ".$text);
+    } catch (Exception $e) {
         throw $e;
     }
 
@@ -87,7 +87,7 @@ 
       return $coords;
     }
 
-    $latlon = explode(' ',$string);
+    $latlon = explode(' ', $string);
     foreach ($latlon as $key => $item) {
       if (!($key % 2)) {
         // It's a latitude
@@ -151,7 +151,7 @@ 
     $polygons = array();
     $box_elements = $this->xmlobj->getElementsByTagName('box');
     foreach ($box_elements as $box) {
-      $parts = explode(' ',trim($box->firstChild->nodeValue));
+      $parts = explode(' ', trim($box->firstChild->nodeValue));
       $components = array(
         new Point($parts[3], $parts[2]),
         new Point($parts[3], $parts[0]),
@@ -171,7 +171,7 @@ 
     $points = array();
     $circle_elements = $this->xmlobj->getElementsByTagName('circle');
     foreach ($circle_elements as $circle) {
-      $parts = explode(' ',trim($circle->firstChild->nodeValue));
+      $parts = explode(' ', trim($circle->firstChild->nodeValue));
       $points[] = new Point($parts[1], $parts[0]);
     }
     return $points;
@@ -212,7 +212,7 @@ 
     $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 +223,7 @@ 
     $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;

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;