Ysurac / FlightAirMap

require/libs/geoPHP/tests/tests/placeholdersTest.php

Indentation +55 added lines, -55 removed lines

@@ -9,65 +9,65 @@
   }
 
   function testPlaceholders() {
-    foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
-      if ($parts[0]) {
-        $format = $parts[1];
-        $value = file_get_contents('./input/'.$file);
-        $geometry = geoPHP::load($value, $format);
+	foreach (scandir('./input') as $file) {
+	  $parts = explode('.',$file);
+	  if ($parts[0]) {
+		$format = $parts[1];
+		$value = file_get_contents('./input/'.$file);
+		$geometry = geoPHP::load($value, $format);
 
-        $placeholders = array(
-          array('name' => 'hasZ'),
-          array('name' => 'is3D'),
-          array('name' => 'isMeasured'),
-          array('name' => 'isEmpty'),
-          array('name' => 'coordinateDimension'),
-          array('name' => 'z'),
-          array('name' => 'm'),
-        );
+		$placeholders = array(
+		  array('name' => 'hasZ'),
+		  array('name' => 'is3D'),
+		  array('name' => 'isMeasured'),
+		  array('name' => 'isEmpty'),
+		  array('name' => 'coordinateDimension'),
+		  array('name' => 'z'),
+		  array('name' => 'm'),
+		);
 
-        foreach($placeholders as $method) {
-          $argument = NULL;
-          $method_name = $method['name'];
-          if (isset($method['argument'])) {
-            $argument = $method['argument'];
-          }
+		foreach($placeholders as $method) {
+		  $argument = NULL;
+		  $method_name = $method['name'];
+		  if (isset($method['argument'])) {
+			$argument = $method['argument'];
+		  }
 
-          switch ($method_name) {
-            case 'm':
-            case 'z':
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              break;
-            case 'coordinateDimension':
-            case 'isEmpty':
-            case 'isMeasured':
-            case 'is3D':
-            case 'hasZ':
-              if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-              }
-              break;
-            default:
-              $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
-          }
-        }
+		  switch ($method_name) {
+			case 'm':
+			case 'z':
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  break;
+			case 'coordinateDimension':
+			case 'isEmpty':
+			case 'isMeasured':
+			case 'is3D':
+			case 'hasZ':
+			  if ($geometry->geometryType() == 'Point') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'LineString') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  if ($geometry->geometryType() == 'MultiLineString') {
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+			  }
+			  break;
+			default:
+			  $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		  }
+		}
 
-      }
-    }
+	  }
+	}
 
   }
 }

Spacing +9 added lines, -9 removed lines

@@ -10,7 +10,7 @@ 
 
   function testPlaceholders() {
     foreach (scandir('./input') as $file) {
-      $parts = explode('.',$file);
+      $parts = explode('.', $file);
       if ($parts[0]) {
         $format = $parts[1];
         $value = file_get_contents('./input/'.$file);
@@ -26,7 +26,7 @@ 
           array('name' => 'm'),
         );
 
-        foreach($placeholders as $method) {
+        foreach ($placeholders as $method) {
           $argument = NULL;
           $method_name = $method['name'];
           if (isset($method['argument'])) {
@@ -37,13 +37,13 @@ 
             case 'm':
             case 'z':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               break;
             case 'coordinateDimension':
@@ -52,17 +52,17 @@ 
             case 'is3D':
             case 'hasZ':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               if ($geometry->geometryType() == 'MultiLineString') {
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
               }
               break;
             default:
-              $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+              $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name);
           }
         }
 

require/libs/geoPHP/lib/adapters/EWKT.class.php

Indentation +10 added lines, -10 removed lines

@@ -13,15 +13,15 @@
    * @return string The Extended-WKT string representation of the input geometries
    */
   public function write(Geometry $geometry) {
-    $srid = $geometry->SRID();
-    $wkt = '';
-    if ($srid) {
-      $wkt = 'SRID=' . $srid . ';';
-      $wkt .= $geometry->out('wkt');
-      return $wkt;
-    }
-    else {
-      return $geometry->out('wkt');
-    }
+	$srid = $geometry->SRID();
+	$wkt = '';
+	if ($srid) {
+	  $wkt = 'SRID=' . $srid . ';';
+	  $wkt .= $geometry->out('wkt');
+	  return $wkt;
+	}
+	else {
+	  return $geometry->out('wkt');
+	}
   }
 }

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');
     }
   }

require/libs/geoPHP/lib/adapters/GoogleGeocode.class.php

Indentation +90 added lines, -90 removed lines

@@ -30,55 +30,55 @@ 
    * @return Geometry|GeometryCollection
    */
   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();
-    }
-    if (gettype($bounds) == 'array') {
-      $bounds_string = '&bounds='.$bounds['miny'].','.$bounds['minx'].'|'.$bounds['maxy'].','.$bounds['maxx'];
-    }
-    else {
-      $bounds_string = '';
-    }
+	if (gettype($bounds) == 'object') {
+	  $bounds = $bounds->getBBox();
+	}
+	if (gettype($bounds) == 'array') {
+	  $bounds_string = '&bounds='.$bounds['miny'].','.$bounds['minx'].'|'.$bounds['maxy'].','.$bounds['maxx'];
+	}
+	else {
+	  $bounds_string = '';
+	}
     
-    $url = "http://maps.googleapis.com/maps/api/geocode/json";
-    $url .= '?address='. urlencode($address);
-    $url .= $bounds_string;
-    $url .= '&sensor=false';
-    $this->result = json_decode(@file_get_contents($url));
+	$url = "http://maps.googleapis.com/maps/api/geocode/json";
+	$url .= '?address='. urlencode($address);
+	$url .= $bounds_string;
+	$url .= '&sensor=false';
+	$this->result = json_decode(@file_get_contents($url));
     
-    if ($this->result->status == 'OK') {
-      if ($return_multiple == FALSE) {
-        if ($return_type == 'point') {
-          return $this->getPoint();
-        }
-        if ($return_type == 'bounds' || $return_type == 'polygon') {
-          return $this->getPolygon();
-        }
-      }
-      if ($return_multiple == TRUE) {
-        if ($return_type == 'point') {
-          $points = array();
-          foreach ($this->result->results as $delta => $item) {
-            $points[] = $this->getPoint($delta);
-          }
-          return new MultiPoint($points);
-        }
-        if ($return_type == 'bounds' || $return_type == 'polygon') {
-          $polygons = array();
-          foreach ($this->result->results as $delta => $item) {
-            $polygons[] = $this->getPolygon($delta);
-          }
-          return new MultiPolygon($polygons);
-        }
-      }
-    }
-    else {
-      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;
-    }
+	if ($this->result->status == 'OK') {
+	  if ($return_multiple == FALSE) {
+		if ($return_type == 'point') {
+		  return $this->getPoint();
+		}
+		if ($return_type == 'bounds' || $return_type == 'polygon') {
+		  return $this->getPolygon();
+		}
+	  }
+	  if ($return_multiple == TRUE) {
+		if ($return_type == 'point') {
+		  $points = array();
+		  foreach ($this->result->results as $delta => $item) {
+			$points[] = $this->getPoint($delta);
+		  }
+		  return new MultiPoint($points);
+		}
+		if ($return_type == 'bounds' || $return_type == 'polygon') {
+		  $polygons = array();
+		  foreach ($this->result->results as $delta => $item) {
+			$polygons[] = $this->getPolygon($delta);
+		  }
+		  return new MultiPolygon($polygons);
+		}
+	  }
+	}
+	else {
+	  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;
+	}
   }
 
   /**
@@ -90,69 +90,69 @@ 
    * @return string Does a reverse geocode of the geometry
    */
   public function write(Geometry $geometry, $return_type = 'string') {
-    $centroid = $geometry->getCentroid();
-    $lat = $centroid->getY();
-    $lon = $centroid->getX();
+	$centroid = $geometry->getCentroid();
+	$lat = $centroid->getY();
+	$lon = $centroid->getX();
     
-    $url = "http://maps.googleapis.com/maps/api/geocode/json";
-    $url .= '?latlng='.$lat.','.$lon;
-    $url .= '&sensor=false';
-    $this->result = json_decode(@file_get_contents($url));
+	$url = "http://maps.googleapis.com/maps/api/geocode/json";
+	$url .= '?latlng='.$lat.','.$lon;
+	$url .= '&sensor=false';
+	$this->result = json_decode(@file_get_contents($url));
     
-    if ($this->result->status == 'OK') {
-      if ($return_type == 'string') {
-        return $this->result->results[0]->formatted_address;
-      }
-      if ($return_type == 'array') {
-        return $this->result->results[0]->address_components;
-      }
-    }
-    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');
-      return FALSE;
-    }
+	if ($this->result->status == 'OK') {
+	  if ($return_type == 'string') {
+		return $this->result->results[0]->formatted_address;
+	  }
+	  if ($return_type == 'array') {
+		return $this->result->results[0]->address_components;
+	  }
+	}
+	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');
+	  return FALSE;
+	}
   }
   
   private function getPoint($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->location->lat;
-    $lon = $this->result->results[$delta]->geometry->location->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->location->lat;
+	$lon = $this->result->results[$delta]->geometry->location->lng;
+	return new Point($lon, $lat);
   }
 
   private function getPolygon($delta = 0) {
-    $points = array (
-      $this->getTopLeft($delta),
-      $this->getTopRight($delta),
-      $this->getBottomRight($delta),
-      $this->getBottomLeft($delta),
-      $this->getTopLeft($delta),
-    );
-    $outer_ring = new LineString($points);
-    return new Polygon(array($outer_ring));
+	$points = array (
+	  $this->getTopLeft($delta),
+	  $this->getTopRight($delta),
+	  $this->getBottomRight($delta),
+	  $this->getBottomLeft($delta),
+	  $this->getTopLeft($delta),
+	);
+	$outer_ring = new LineString($points);
+	return new Polygon(array($outer_ring));
   }
 
   private function getTopLeft($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
+	return new Point($lon, $lat);
   }
 
   private function getTopRight($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->northeast->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
+	return new Point($lon, $lat);
   }
   
   private function getBottomLeft($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
-     return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->southwest->lng;
+	 return new Point($lon, $lat);
   }
 
   private function getBottomRight($delta = 0) {
-    $lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
-    $lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
-    return new Point($lon, $lat);
+	$lat = $this->result->results[$delta]->geometry->bounds->southwest->lat;
+	$lon = $this->result->results[$delta]->geometry->bounds->northeast->lng;
+	return new Point($lon, $lat);
   }
 }

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
     }
     
     $url = "http://maps.googleapis.com/maps/api/geocode/json";
-    $url .= '?address='. urlencode($address);
+    $url .= '?address='.urlencode($address);
     $url .= $bounds_string;
     $url .= '&sensor=false';
     $this->result = json_decode(@file_get_contents($url));
@@ -121,7 +121,7 @@ 
   }
 
   private function getPolygon($delta = 0) {
-    $points = array (
+    $points = array(
       $this->getTopLeft($delta),
       $this->getTopRight($delta),
       $this->getBottomRight($delta),

Braces +16 added lines, -11 removed lines

@@ -30,15 +30,16 @@ 
    * @return Geometry|GeometryCollection
    */
   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();
     }
     if (gettype($bounds) == 'array') {
       $bounds_string = '&bounds='.$bounds['miny'].','.$bounds['minx'].'|'.$bounds['maxy'].','.$bounds['maxx'];
-    }
-    else {
+    } else {
       $bounds_string = '';
     }
     
@@ -73,10 +74,12 @@ 
           return new MultiPolygon($polygons);
         }
       }
-    }
-    else {
-      if ($this->result->status) throw new Exception('Error in Google Geocoder: '.$this->result->status);
-      else throw new Exception('Unknown error in Google Geocoder');
+    } else {
+      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;
     }
   }
@@ -106,10 +109,12 @@ 
       if ($return_type == 'array') {
         return $this->result->results[0]->address_components;
       }
-    }
-    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');
+    } 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');
+      }
       return FALSE;
     }
   }

require/libs/geoPHP/lib/adapters/EWKB.class.php

Indentation +62 added lines, -62 removed lines

@@ -13,33 +13,33 @@ 
    * @return Geometry
    */
   public function read($wkb, $is_hex_string = FALSE) {
-    if ($is_hex_string) {
-      $wkb = pack('H*',$wkb);
-    }
+	if ($is_hex_string) {
+	  $wkb = pack('H*',$wkb);
+	}
     
-    // Open the wkb up in memory so we can examine the SRID
-    $mem = fopen('php://memory', 'r+');
-    fwrite($mem, $wkb);
-    fseek($mem, 0);
-    $base_info = unpack("corder/ctype/cz/cm/cs", fread($mem, 5));
-    if ($base_info['s']) {
-      $srid = current(unpack("Lsrid", fread($mem, 4)));
-    }
-    else {
-      $srid = NULL;
-    }
-    fclose($mem);
+	// Open the wkb up in memory so we can examine the SRID
+	$mem = fopen('php://memory', 'r+');
+	fwrite($mem, $wkb);
+	fseek($mem, 0);
+	$base_info = unpack("corder/ctype/cz/cm/cs", fread($mem, 5));
+	if ($base_info['s']) {
+	  $srid = current(unpack("Lsrid", fread($mem, 4)));
+	}
+	else {
+	  $srid = NULL;
+	}
+	fclose($mem);
     
-    // Run the wkb through the normal WKB reader to get the geometry
-    $wkb_reader = new WKB();
-    $geom = $wkb_reader->read($wkb);
+	// Run the wkb through the normal WKB reader to get the geometry
+	$wkb_reader = new WKB();
+	$geom = $wkb_reader->read($wkb);
     
-    // If there is an SRID, add it to the geometry
-    if ($srid) {
-      $geom->setSRID($srid);
-    }
+	// If there is an SRID, add it to the geometry
+	if ($srid) {
+	  $geom->setSRID($srid);
+	}
     
-    return $geom;
+	return $geom;
   }
   
   /**
@@ -50,47 +50,47 @@ 
    * @return string The Extended-WKB binary string representation of the input geometries
    */
   public function write(Geometry $geometry, $write_as_hex = FALSE) {
-    // We always write into NDR (little endian)
-    $wkb = pack('c',1);
+	// We always write into NDR (little endian)
+	$wkb = pack('c',1);
     
-    switch ($geometry->getGeomType()) {
-      case 'Point';
-        $wkb .= pack('L',1);
-        $wkb .= $this->writePoint($geometry);
-        break;
-      case 'LineString';
-        $wkb .= pack('L',2);
-        $wkb .= $this->writeLineString($geometry);
-        break;
-      case 'Polygon';
-        $wkb .= pack('L',3);
-        $wkb .= $this->writePolygon($geometry);
-        break;
-      case 'MultiPoint';
-        $wkb .= pack('L',4);
-        $wkb .= $this->writeMulti($geometry);
-        break;
-      case 'MultiLineString';
-        $wkb .= pack('L',5);
-        $wkb .= $this->writeMulti($geometry);
-        break;
-      case 'MultiPolygon';
-        $wkb .= pack('L',6);
-        $wkb .= $this->writeMulti($geometry);
-        break;
-      case 'GeometryCollection';
-        $wkb .= pack('L',7);
-        $wkb .= $this->writeMulti($geometry);
-        break;
-    }
+	switch ($geometry->getGeomType()) {
+	  case 'Point';
+		$wkb .= pack('L',1);
+		$wkb .= $this->writePoint($geometry);
+		break;
+	  case 'LineString';
+		$wkb .= pack('L',2);
+		$wkb .= $this->writeLineString($geometry);
+		break;
+	  case 'Polygon';
+		$wkb .= pack('L',3);
+		$wkb .= $this->writePolygon($geometry);
+		break;
+	  case 'MultiPoint';
+		$wkb .= pack('L',4);
+		$wkb .= $this->writeMulti($geometry);
+		break;
+	  case 'MultiLineString';
+		$wkb .= pack('L',5);
+		$wkb .= $this->writeMulti($geometry);
+		break;
+	  case 'MultiPolygon';
+		$wkb .= pack('L',6);
+		$wkb .= $this->writeMulti($geometry);
+		break;
+	  case 'GeometryCollection';
+		$wkb .= pack('L',7);
+		$wkb .= $this->writeMulti($geometry);
+		break;
+	}
     
-    if ($write_as_hex) {
-      $unpacked = unpack('H*',$wkb);
-      return $unpacked[1];
-    }
-    else {
-      return $wkb;
-    }
+	if ($write_as_hex) {
+	  $unpacked = unpack('H*',$wkb);
+	  return $unpacked[1];
+	}
+	else {
+	  return $wkb;
+	}
   }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -14,7 +14,7 @@ 
    */
   public function read($wkb, $is_hex_string = FALSE) {
     if ($is_hex_string) {
-      $wkb = pack('H*',$wkb);
+      $wkb = pack('H*', $wkb);
     }
     
     // Open the wkb up in memory so we can examine the SRID
@@ -51,41 +51,41 @@ 
    */
   public function write(Geometry $geometry, $write_as_hex = FALSE) {
     // We always write into NDR (little endian)
-    $wkb = pack('c',1);
+    $wkb = pack('c', 1);
     
     switch ($geometry->getGeomType()) {
       case 'Point';
-        $wkb .= pack('L',1);
+        $wkb .= pack('L', 1);
         $wkb .= $this->writePoint($geometry);
         break;
       case 'LineString';
-        $wkb .= pack('L',2);
+        $wkb .= pack('L', 2);
         $wkb .= $this->writeLineString($geometry);
         break;
       case 'Polygon';
-        $wkb .= pack('L',3);
+        $wkb .= pack('L', 3);
         $wkb .= $this->writePolygon($geometry);
         break;
       case 'MultiPoint';
-        $wkb .= pack('L',4);
+        $wkb .= pack('L', 4);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'MultiLineString';
-        $wkb .= pack('L',5);
+        $wkb .= pack('L', 5);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'MultiPolygon';
-        $wkb .= pack('L',6);
+        $wkb .= pack('L', 6);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'GeometryCollection';
-        $wkb .= pack('L',7);
+        $wkb .= pack('L', 7);
         $wkb .= $this->writeMulti($geometry);
         break;
     }
     
     if ($write_as_hex) {
-      $unpacked = unpack('H*',$wkb);
+      $unpacked = unpack('H*', $wkb);
       return $unpacked[1];
     }
     else {

Braces +2 added lines, -4 removed lines

@@ -24,8 +24,7 @@ 
     $base_info = unpack("corder/ctype/cz/cm/cs", fread($mem, 5));
     if ($base_info['s']) {
       $srid = current(unpack("Lsrid", fread($mem, 4)));
-    }
-    else {
+    } else {
       $srid = NULL;
     }
     fclose($mem);
@@ -87,8 +86,7 @@ 
     if ($write_as_hex) {
       $unpacked = unpack('H*',$wkb);
       return $unpacked[1];
-    }
-    else {
+    } else {
       return $wkb;
     }
   }

require/libs/geoPHP/lib/adapters/GeoHash.class.php

Indentation +118 added lines, -118 removed lines

@@ -16,21 +16,21 @@ 
    * @see GeoAdapter::read()
    */
   public function read($hash, $as_grid = FALSE) {
-    $ll = $this->decode($hash);
-    if (!$as_grid) {
-      return new Point($ll['medlon'], $ll['medlat']);
-    }
-    else {
-      return new Polygon(array(
-        new LineString(array(
-          new Point($ll['minlon'], $ll['maxlat']),
-          new Point($ll['maxlon'], $ll['maxlat']),
-          new Point($ll['maxlon'], $ll['minlat']),
-          new Point($ll['minlon'], $ll['minlat']),
-          new Point($ll['minlon'], $ll['maxlat']),
-        ))
-      ));
-    }
+	$ll = $this->decode($hash);
+	if (!$as_grid) {
+	  return new Point($ll['medlon'], $ll['medlat']);
+	}
+	else {
+	  return new Polygon(array(
+		new LineString(array(
+		  new Point($ll['minlon'], $ll['maxlat']),
+		  new Point($ll['maxlon'], $ll['maxlat']),
+		  new Point($ll['maxlon'], $ll['minlat']),
+		  new Point($ll['minlon'], $ll['minlat']),
+		  new Point($ll['minlon'], $ll['maxlat']),
+		))
+	  ));
+	}
   }
 
   /**
@@ -40,32 +40,32 @@ 
    * @see GeoAdapter::write()
    */
   public function write(Geometry $geometry, $precision = NULL){
-    if ($geometry->isEmpty()) return '';
+	if ($geometry->isEmpty()) return '';
 
-    if($geometry->geometryType() === 'Point'){
-      return $this->encodePoint($geometry, $precision);
-    }
-    else {
-      // The geohash is the hash grid ID that fits the envelope
-      $envelope = $geometry->envelope();
-      $geohashes = array();
-      $geohash = '';
-      foreach ($envelope->getPoints() as $point) {
-        $geohashes[] = $this->encodePoint($point, 0.0000001);
-      }
-      $i = 0;
-      while ($i < strlen($geohashes[0])) {
-        $char = $geohashes[0][$i];
-        foreach ($geohashes as $hash) {
-          if ($hash[$i] != $char) {
-            return $geohash;
-          }
-        }
-        $geohash .= $char;
-        $i++;
-      }
-      return $geohash;
-    }
+	if($geometry->geometryType() === 'Point'){
+	  return $this->encodePoint($geometry, $precision);
+	}
+	else {
+	  // The geohash is the hash grid ID that fits the envelope
+	  $envelope = $geometry->envelope();
+	  $geohashes = array();
+	  $geohash = '';
+	  foreach ($envelope->getPoints() as $point) {
+		$geohashes[] = $this->encodePoint($point, 0.0000001);
+	  }
+	  $i = 0;
+	  while ($i < strlen($geohashes[0])) {
+		$char = $geohashes[0][$i];
+		foreach ($geohashes as $hash) {
+		  if ($hash[$i] != $char) {
+			return $geohash;
+		  }
+		}
+		$geohash .= $char;
+		$i++;
+	  }
+	  return $geohash;
+	}
   }
 
   /**
@@ -75,51 +75,51 @@ 
    * @see https://github.com/asonge/php-geohash/issues/1
    */
   private function encodePoint($point, $precision = NULL){
-    if ($precision === NULL) {
-      $lap = strlen($point->y())-strpos($point->y(),".");
-      $lop = strlen($point->x())-strpos($point->x(),".");
-      $precision = pow(10,-max($lap-1,$lop-1,0))/2;
-    }
+	if ($precision === NULL) {
+	  $lap = strlen($point->y())-strpos($point->y(),".");
+	  $lop = strlen($point->x())-strpos($point->x(),".");
+	  $precision = pow(10,-max($lap-1,$lop-1,0))/2;
+	}
 
-    $minlat =  -90;
-    $maxlat =   90;
-    $minlon = -180;
-    $maxlon =  180;
-    $latE   =   90;
-    $lonE   =  180;
-    $i = 0;
-    $error = 180;
-    $hash='';
-    while($error>=$precision) {
-      $chr = 0;
-      for($b=4;$b>=0;--$b) {
-        if((1&$b) == (1&$i)) {
-          // even char, even bit OR odd char, odd bit...a lon
-          $next = ($minlon+$maxlon)/2;
-          if($point->x()>$next) {
-            $chr |= pow(2,$b);
-            $minlon = $next;
-          } else {
-            $maxlon = $next;
-          }
-          $lonE /= 2;
-        } else {
-          // odd char, even bit OR even char, odd bit...a lat
-          $next = ($minlat+$maxlat)/2;
-          if($point->y()>$next) {
-            $chr |= pow(2,$b);
-            $minlat = $next;
-          } else {
-            $maxlat = $next;
-          }
-          $latE /= 2;
-        }
-      }
-      $hash .= $this->table[$chr];
-      $i++;
-      $error = min($latE,$lonE);
-    }
-    return $hash;
+	$minlat =  -90;
+	$maxlat =   90;
+	$minlon = -180;
+	$maxlon =  180;
+	$latE   =   90;
+	$lonE   =  180;
+	$i = 0;
+	$error = 180;
+	$hash='';
+	while($error>=$precision) {
+	  $chr = 0;
+	  for($b=4;$b>=0;--$b) {
+		if((1&$b) == (1&$i)) {
+		  // even char, even bit OR odd char, odd bit...a lon
+		  $next = ($minlon+$maxlon)/2;
+		  if($point->x()>$next) {
+			$chr |= pow(2,$b);
+			$minlon = $next;
+		  } else {
+			$maxlon = $next;
+		  }
+		  $lonE /= 2;
+		} else {
+		  // odd char, even bit OR even char, odd bit...a lat
+		  $next = ($minlat+$maxlat)/2;
+		  if($point->y()>$next) {
+			$chr |= pow(2,$b);
+			$minlat = $next;
+		  } else {
+			$maxlat = $next;
+		  }
+		  $latE /= 2;
+		}
+	  }
+	  $hash .= $this->table[$chr];
+	  $i++;
+	  $error = min($latE,$lonE);
+	}
+	return $hash;
   }
 
   /**
@@ -128,39 +128,39 @@ 
    * @see https://github.com/asonge/php-geohash/issues/1
    */
   private function decode($hash){
-    $ll = array();
-    $minlat =  -90;
-    $maxlat =   90;
-    $minlon = -180;
-    $maxlon =  180;
-    $latE   =   90;
-    $lonE   =  180;
-    for($i=0,$c=strlen($hash);$i<$c;$i++) {
-      $v = strpos($this->table,$hash[$i]);
-      if(1&$i) {
-        if(16&$v)$minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(8&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(4&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(2&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(1&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        $latE /= 8;
-        $lonE /= 4;
-      } else {
-        if(16&$v)$minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(8&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(4&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(2&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(1&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        $latE /= 4;
-        $lonE /= 8;
-      }
-    }
-    $ll['minlat'] = $minlat;
-    $ll['minlon'] = $minlon;
-    $ll['maxlat'] = $maxlat;
-    $ll['maxlon'] = $maxlon;
-    $ll['medlat'] = round(($minlat+$maxlat)/2, max(1, -round(log10($latE)))-1);
-    $ll['medlon'] = round(($minlon+$maxlon)/2, max(1, -round(log10($lonE)))-1);
-    return $ll;
+	$ll = array();
+	$minlat =  -90;
+	$maxlat =   90;
+	$minlon = -180;
+	$maxlon =  180;
+	$latE   =   90;
+	$lonE   =  180;
+	for($i=0,$c=strlen($hash);$i<$c;$i++) {
+	  $v = strpos($this->table,$hash[$i]);
+	  if(1&$i) {
+		if(16&$v)$minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+		if(8&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+		if(4&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+		if(2&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+		if(1&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+		$latE /= 8;
+		$lonE /= 4;
+	  } else {
+		if(16&$v)$minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+		if(8&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+		if(4&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+		if(2&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+		if(1&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+		$latE /= 4;
+		$lonE /= 8;
+	  }
+	}
+	$ll['minlat'] = $minlat;
+	$ll['minlon'] = $minlon;
+	$ll['maxlat'] = $maxlat;
+	$ll['maxlon'] = $maxlon;
+	$ll['medlat'] = round(($minlat+$maxlat)/2, max(1, -round(log10($latE)))-1);
+	$ll['medlon'] = round(($minlon+$maxlon)/2, max(1, -round(log10($lonE)))-1);
+	return $ll;
   }
 }

Spacing +44 added lines, -44 removed lines

@@ -6,7 +6,7 @@ 
  * @see http://en.wikipedia.org/wiki/Geohash
  *
  */
-class GeoHash extends GeoAdapter{
+class GeoHash extends GeoAdapter {
   private $table = "0123456789bcdefghjkmnpqrstuvwxyz";
 
   /**
@@ -39,10 +39,10 @@ 
    * @param Point $geometry
    * @see GeoAdapter::write()
    */
-  public function write(Geometry $geometry, $precision = NULL){
+  public function write(Geometry $geometry, $precision = NULL) {
     if ($geometry->isEmpty()) return '';
 
-    if($geometry->geometryType() === 'Point'){
+    if ($geometry->geometryType() === 'Point') {
       return $this->encodePoint($geometry, $precision);
     }
     else {
@@ -74,30 +74,30 @@ 
    * @author algorithm based on code by Alexander Songe <a@songe.me>
    * @see https://github.com/asonge/php-geohash/issues/1
    */
-  private function encodePoint($point, $precision = NULL){
+  private function encodePoint($point, $precision = NULL) {
     if ($precision === NULL) {
-      $lap = strlen($point->y())-strpos($point->y(),".");
-      $lop = strlen($point->x())-strpos($point->x(),".");
-      $precision = pow(10,-max($lap-1,$lop-1,0))/2;
+      $lap = strlen($point->y()) - strpos($point->y(), ".");
+      $lop = strlen($point->x()) - strpos($point->x(), ".");
+      $precision = pow(10, -max($lap - 1, $lop - 1, 0))/2;
     }
 
-    $minlat =  -90;
-    $maxlat =   90;
+    $minlat = -90;
+    $maxlat = 90;
     $minlon = -180;
-    $maxlon =  180;
-    $latE   =   90;
-    $lonE   =  180;
+    $maxlon = 180;
+    $latE   = 90;
+    $lonE   = 180;
     $i = 0;
     $error = 180;
-    $hash='';
-    while($error>=$precision) {
+    $hash = '';
+    while ($error >= $precision) {
       $chr = 0;
-      for($b=4;$b>=0;--$b) {
-        if((1&$b) == (1&$i)) {
+      for ($b = 4; $b >= 0; --$b) {
+        if ((1&$b) == (1&$i)) {
           // even char, even bit OR odd char, odd bit...a lon
-          $next = ($minlon+$maxlon)/2;
-          if($point->x()>$next) {
-            $chr |= pow(2,$b);
+          $next = ($minlon + $maxlon)/2;
+          if ($point->x() > $next) {
+            $chr |= pow(2, $b);
             $minlon = $next;
           } else {
             $maxlon = $next;
@@ -105,9 +105,9 @@ 
           $lonE /= 2;
         } else {
           // odd char, even bit OR even char, odd bit...a lat
-          $next = ($minlat+$maxlat)/2;
-          if($point->y()>$next) {
-            $chr |= pow(2,$b);
+          $next = ($minlat + $maxlat)/2;
+          if ($point->y() > $next) {
+            $chr |= pow(2, $b);
             $minlat = $next;
           } else {
             $maxlat = $next;
@@ -117,7 +117,7 @@ 
       }
       $hash .= $this->table[$chr];
       $i++;
-      $error = min($latE,$lonE);
+      $error = min($latE, $lonE);
     }
     return $hash;
   }
@@ -127,30 +127,30 @@ 
    * @author algorithm based on code by Alexander Songe <a@songe.me>
    * @see https://github.com/asonge/php-geohash/issues/1
    */
-  private function decode($hash){
+  private function decode($hash) {
     $ll = array();
-    $minlat =  -90;
-    $maxlat =   90;
+    $minlat = -90;
+    $maxlat = 90;
     $minlon = -180;
-    $maxlon =  180;
-    $latE   =   90;
-    $lonE   =  180;
-    for($i=0,$c=strlen($hash);$i<$c;$i++) {
-      $v = strpos($this->table,$hash[$i]);
-      if(1&$i) {
-        if(16&$v)$minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(8&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(4&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(2&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(1&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+    $maxlon = 180;
+    $latE   = 90;
+    $lonE   = 180;
+    for ($i = 0, $c = strlen($hash); $i < $c; $i++) {
+      $v = strpos($this->table, $hash[$i]);
+      if (1&$i) {
+        if (16&$v)$minlat = ($minlat + $maxlat)/2; else $maxlat = ($minlat + $maxlat)/2;
+        if (8&$v) $minlon = ($minlon + $maxlon)/2; else $maxlon = ($minlon + $maxlon)/2;
+        if (4&$v) $minlat = ($minlat + $maxlat)/2; else $maxlat = ($minlat + $maxlat)/2;
+        if (2&$v) $minlon = ($minlon + $maxlon)/2; else $maxlon = ($minlon + $maxlon)/2;
+        if (1&$v) $minlat = ($minlat + $maxlat)/2; else $maxlat = ($minlat + $maxlat)/2;
         $latE /= 8;
         $lonE /= 4;
       } else {
-        if(16&$v)$minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(8&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(4&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(2&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(1&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+        if (16&$v)$minlon = ($minlon + $maxlon)/2; else $maxlon = ($minlon + $maxlon)/2;
+        if (8&$v) $minlat = ($minlat + $maxlat)/2; else $maxlat = ($minlat + $maxlat)/2;
+        if (4&$v) $minlon = ($minlon + $maxlon)/2; else $maxlon = ($minlon + $maxlon)/2;
+        if (2&$v) $minlat = ($minlat + $maxlat)/2; else $maxlat = ($minlat + $maxlat)/2;
+        if (1&$v) $minlon = ($minlon + $maxlon)/2; else $maxlon = ($minlon + $maxlon)/2;
         $latE /= 4;
         $lonE /= 8;
       }
@@ -159,8 +159,8 @@ 
     $ll['minlon'] = $minlon;
     $ll['maxlat'] = $maxlat;
     $ll['maxlon'] = $maxlon;
-    $ll['medlat'] = round(($minlat+$maxlat)/2, max(1, -round(log10($latE)))-1);
-    $ll['medlon'] = round(($minlon+$maxlon)/2, max(1, -round(log10($lonE)))-1);
+    $ll['medlat'] = round(($minlat + $maxlat)/2, max(1, -round(log10($latE))) - 1);
+    $ll['medlon'] = round(($minlon + $maxlon)/2, max(1, -round(log10($lonE))) - 1);
     return $ll;
   }
 }

Braces +55 added lines, -15 removed lines

@@ -19,8 +19,7 @@ 
     $ll = $this->decode($hash);
     if (!$as_grid) {
       return new Point($ll['medlon'], $ll['medlat']);
-    }
-    else {
+    } else {
       return new Polygon(array(
         new LineString(array(
           new Point($ll['minlon'], $ll['maxlat']),
@@ -40,12 +39,13 @@ 
    * @see GeoAdapter::write()
    */
   public function write(Geometry $geometry, $precision = NULL){
-    if ($geometry->isEmpty()) return '';
+    if ($geometry->isEmpty()) {
+    	return '';
+    }
 
     if($geometry->geometryType() === 'Point'){
       return $this->encodePoint($geometry, $precision);
-    }
-    else {
+    } else {
       // The geohash is the hash grid ID that fits the envelope
       $envelope = $geometry->envelope();
       $geohashes = array();
@@ -138,19 +138,59 @@ 
     for($i=0,$c=strlen($hash);$i<$c;$i++) {
       $v = strpos($this->table,$hash[$i]);
       if(1&$i) {
-        if(16&$v)$minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(8&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(4&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(2&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(1&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+        if(16&$v) {
+        	$minlat = ($minlat+$maxlat)/2;
+        } else {
+        	$maxlat = ($minlat+$maxlat)/2;
+        }
+        if(8&$v) {
+        	$minlon = ($minlon+$maxlon)/2;
+        } else {
+        	$maxlon = ($minlon+$maxlon)/2;
+        }
+        if(4&$v) {
+        	$minlat = ($minlat+$maxlat)/2;
+        } else {
+        	$maxlat = ($minlat+$maxlat)/2;
+        }
+        if(2&$v) {
+        	$minlon = ($minlon+$maxlon)/2;
+        } else {
+        	$maxlon = ($minlon+$maxlon)/2;
+        }
+        if(1&$v) {
+        	$minlat = ($minlat+$maxlat)/2;
+        } else {
+        	$maxlat = ($minlat+$maxlat)/2;
+        }
         $latE /= 8;
         $lonE /= 4;
       } else {
-        if(16&$v)$minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(8&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(4&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(2&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(1&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+        if(16&$v) {
+        	$minlon = ($minlon+$maxlon)/2;
+        } else {
+        	$maxlon = ($minlon+$maxlon)/2;
+        }
+        if(8&$v) {
+        	$minlat = ($minlat+$maxlat)/2;
+        } else {
+        	$maxlat = ($minlat+$maxlat)/2;
+        }
+        if(4&$v) {
+        	$minlon = ($minlon+$maxlon)/2;
+        } else {
+        	$maxlon = ($minlon+$maxlon)/2;
+        }
+        if(2&$v) {
+        	$minlat = ($minlat+$maxlat)/2;
+        } else {
+        	$maxlat = ($minlat+$maxlat)/2;
+        }
+        if(1&$v) {
+        	$minlon = ($minlon+$maxlon)/2;
+        } else {
+        	$maxlon = ($minlon+$maxlon)/2;
+        }
         $latE /= 4;
         $lonE /= 8;
       }

require/libs/geoPHP/lib/geometry/GeometryCollection.class.php

Indentation +8 added lines, -8 removed lines

@@ -12,14 +12,14 @@
   // MultiPoint or a LineString, since they share the same structure (collection
   // of points). So we need to call out the type explicitly. 
   public function asArray() {
-    $array = array();
-    foreach ($this->components as $component) {
-      $array[] = array(
-        'type' => $component->geometryType(),
-        'components' => $component->asArray(),
-      );
-    }
-    return $array;
+	$array = array();
+	foreach ($this->components as $component) {
+	  $array[] = array(
+		'type' => $component->geometryType(),
+		'components' => $component->asArray(),
+	  );
+	}
+	return $array;
   }
   
   // Not valid for this geomettry

require/libs/geoPHP/lib/geometry/Point.class.php

Indentation +50 added lines, -50 removed lines

@@ -18,31 +18,31 @@ 
    * @param numeric $z The z coordinate (or altitude) - optional
    */
   public function __construct($x, $y, $z = NULL) {
-    // Basic validation on x and y
-    if (!is_numeric($x) || !is_numeric($y)) {
-      throw new Exception("Cannot construct Point. x and y should be numeric");
-    }
-
-    // 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");
-      }
-      $this->dimention = 3;
-    }
-
-    // Convert to floatval in case they are passed in as a string or integer etc.
-    $x = floatval($x);
-    $y = floatval($y);
-    $z = floatval($z);
-
-    // Add poitional elements
-    if ($this->dimention == 2) {
-      $this->coords = array($x, $y);
-    }
-    if ($this->dimention == 3) {
-      $this->coords = array($x, $y, $z);
-    }
+	// Basic validation on x and y
+	if (!is_numeric($x) || !is_numeric($y)) {
+	  throw new Exception("Cannot construct Point. x and y should be numeric");
+	}
+
+	// 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");
+	  }
+	  $this->dimention = 3;
+	}
+
+	// Convert to floatval in case they are passed in as a string or integer etc.
+	$x = floatval($x);
+	$y = floatval($y);
+	$z = floatval($z);
+
+	// Add poitional elements
+	if ($this->dimention == 2) {
+	  $this->coords = array($x, $y);
+	}
+	if ($this->dimention == 3) {
+	  $this->coords = array($x, $y, $z);
+	}
   }
 
   /**
@@ -51,7 +51,7 @@ 
    * @return float The X coordinate
    */
   public function x() {
-    return $this->coords[0];
+	return $this->coords[0];
   }
 
   /**
@@ -60,7 +60,7 @@ 
    * @return float The Y coordinate
    */
   public function y() {
-    return $this->coords[1];
+	return $this->coords[1];
   }
 
   /**
@@ -69,73 +69,73 @@ 
    * @return float The Z coordinate or NULL is not a 3D point
    */
   public function z() {
-    if ($this->dimention == 3) {
-      return $this->coords[2];
-    }
-    else return NULL;
+	if ($this->dimention == 3) {
+	  return $this->coords[2];
+	}
+	else return NULL;
   }
 
   // A point's centroid is itself
   public function centroid() {
-    return $this;
+	return $this;
   }
 
   public function getBBox() {
-    return array(
-      'maxy' => $this->getY(),
-      'miny' => $this->getY(),
-      'maxx' => $this->getX(),
-      'minx' => $this->getX(),
-    );
+	return array(
+	  'maxy' => $this->getY(),
+	  'miny' => $this->getY(),
+	  'maxx' => $this->getX(),
+	  'minx' => $this->getX(),
+	);
   }
 
   public function asArray($assoc = FALSE) {
-    return $this->coords;
+	return $this->coords;
   }
 
   public function area() {
-    return 0;
+	return 0;
   }
 
   public function length() {
-    return 0;
+	return 0;
   }
 
   public function greatCircleLength() {
-    return 0;
+	return 0;
   }
 
   public function haversineLength() {
-    return 0;
+	return 0;
   }
 
   // The boundary of a point is itself
   public function boundary() {
-    return $this;
+	return $this;
   }
 
   public function dimension() {
-    return 0;
+	return 0;
   }
 
   public function isEmpty() {
-    return FALSE;
+	return FALSE;
   }
 
   public function numPoints() {
-    return 1;
+	return 1;
   }
 
   public function getPoints() {
-    return array($this);
+	return array($this);
   }
 
   public function equals($geometry) {
-    return ($this->x() == $geometry->x() && $this->y() == $geometry->y());
+	return ($this->x() == $geometry->x() && $this->y() == $geometry->y());
   }
 
   public function isSimple() {
-    return TRUE;
+	return TRUE;
   }
 
   // Not valid for this geometry type

Spacing +11 added lines, -11 removed lines

@@ -139,17 +139,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 +2 added lines, -1 removed lines

@@ -71,8 +71,9 @@
   public function z() {
     if ($this->dimention == 3) {
       return $this->coords[2];
+    } else {
+    	return NULL;
     }
-    else return NULL;
   }
 
   // A point's centroid is itself

require/libs/geoPHP/lib/geometry/MultiPoint.class.php

Indentation +2 added lines, -2 removed lines

@@ -7,11 +7,11 @@
   protected $geom_type = 'MultiPoint';
   
   public function numPoints() {
-    return $this->numGeometries();
+	return $this->numGeometries();
   }
   
   public function isSimple() {
-    return TRUE;
+	return TRUE;
   }
   
   // Not valid for this geometry type

require/libs/geoPHP/lib/geometry/MultiLineString.class.php

Indentation +6 added lines, -6 removed lines

@@ -8,12 +8,12 @@
 
   // MultiLineString is closed if all it's components are closed
   public function isClosed() {
-    foreach ($this->components as $line) {
-      if (!$line->isClosed()) {
-        return FALSE;
-      }
-    }
-    return TRUE;
+	foreach ($this->components as $line) {
+	  if (!$line->isClosed()) {
+		return FALSE;
+	  }
+	}
+	return TRUE;
   }
 
 }