Ysurac / FlightAirMap

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

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

Indentation +188 added lines, -188 removed lines

@@ -18,17 +18,17 @@ 
    * @param array $components array of geometries
    */
   public function __construct($components = array()) {
-    if (!is_array($components)) {
-      throw new Exception("Component geometries must be passed as an array");
-    }
-    foreach ($components as $component) {
-      if ($component instanceof Geometry) {
-        $this->components[] = $component;
-      }
-      else {
-        throw new Exception("Cannot create a collection with non-geometries");
-      }
-    }
+	if (!is_array($components)) {
+	  throw new Exception("Component geometries must be passed as an array");
+	}
+	foreach ($components as $component) {
+	  if ($component instanceof Geometry) {
+		$this->components[] = $component;
+	  }
+	  else {
+		throw new Exception("Cannot create a collection with non-geometries");
+	  }
+	}
   }
 
   /**
@@ -37,244 +37,244 @@ 
    * @return array
    */
   public function getComponents() {
-    return $this->components;
+	return $this->components;
   }
 
   public function centroid() {
-    if ($this->isEmpty()) return NULL;
+	if ($this->isEmpty()) return NULL;
 
-    if ($this->geos()) {
-      $geos_centroid = $this->geos()->centroid();
-      if ($geos_centroid->typeName() == 'Point') {
-        return geoPHP::geosToGeometry($this->geos()->centroid());
-      }
-    }
+	if ($this->geos()) {
+	  $geos_centroid = $this->geos()->centroid();
+	  if ($geos_centroid->typeName() == 'Point') {
+		return geoPHP::geosToGeometry($this->geos()->centroid());
+	  }
+	}
 
-    // As a rough estimate, we say that the centroid of a colletion is the centroid of it's envelope
-    // @@TODO: Make this the centroid of the convexHull
-    // Note: Outside of polygons, geometryCollections and the trivial case of points, there is no standard on what a "centroid" is
-    $centroid = $this->envelope()->centroid();
+	// As a rough estimate, we say that the centroid of a colletion is the centroid of it's envelope
+	// @@TODO: Make this the centroid of the convexHull
+	// Note: Outside of polygons, geometryCollections and the trivial case of points, there is no standard on what a "centroid" is
+	$centroid = $this->envelope()->centroid();
 
-    return $centroid;
+	return $centroid;
   }
 
   public function getBBox() {
-    if ($this->isEmpty()) return NULL;
-
-    if ($this->geos()) {
-      $envelope = $this->geos()->envelope();
-      if ($envelope->typeName() == 'Point') {
-        return geoPHP::geosToGeometry($envelope)->getBBOX();
-      }
-
-      $geos_ring = $envelope->exteriorRing();
-      return array(
-        'maxy' => $geos_ring->pointN(3)->getY(),
-        'miny' => $geos_ring->pointN(1)->getY(),
-        'maxx' => $geos_ring->pointN(1)->getX(),
-        'minx' => $geos_ring->pointN(3)->getX(),
-      );
-    }
-
-    // Go through each component and get the max and min x and y
-    $i = 0;
-    foreach ($this->components as $component) {
-      $component_bbox = $component->getBBox();
-
-      // On the first run through, set the bbox to the component bbox
-      if ($i == 0) {
-        $maxx = $component_bbox['maxx'];
-        $maxy = $component_bbox['maxy'];
-        $minx = $component_bbox['minx'];
-        $miny = $component_bbox['miny'];
-      }
-
-      // Do a check and replace on each boundary, slowly growing the bbox
-      $maxx = $component_bbox['maxx'] > $maxx ? $component_bbox['maxx'] : $maxx;
-      $maxy = $component_bbox['maxy'] > $maxy ? $component_bbox['maxy'] : $maxy;
-      $minx = $component_bbox['minx'] < $minx ? $component_bbox['minx'] : $minx;
-      $miny = $component_bbox['miny'] < $miny ? $component_bbox['miny'] : $miny;
-      $i++;
-    }
-
-    return array(
-      'maxy' => $maxy,
-      'miny' => $miny,
-      'maxx' => $maxx,
-      'minx' => $minx,
-    );
+	if ($this->isEmpty()) return NULL;
+
+	if ($this->geos()) {
+	  $envelope = $this->geos()->envelope();
+	  if ($envelope->typeName() == 'Point') {
+		return geoPHP::geosToGeometry($envelope)->getBBOX();
+	  }
+
+	  $geos_ring = $envelope->exteriorRing();
+	  return array(
+		'maxy' => $geos_ring->pointN(3)->getY(),
+		'miny' => $geos_ring->pointN(1)->getY(),
+		'maxx' => $geos_ring->pointN(1)->getX(),
+		'minx' => $geos_ring->pointN(3)->getX(),
+	  );
+	}
+
+	// Go through each component and get the max and min x and y
+	$i = 0;
+	foreach ($this->components as $component) {
+	  $component_bbox = $component->getBBox();
+
+	  // On the first run through, set the bbox to the component bbox
+	  if ($i == 0) {
+		$maxx = $component_bbox['maxx'];
+		$maxy = $component_bbox['maxy'];
+		$minx = $component_bbox['minx'];
+		$miny = $component_bbox['miny'];
+	  }
+
+	  // Do a check and replace on each boundary, slowly growing the bbox
+	  $maxx = $component_bbox['maxx'] > $maxx ? $component_bbox['maxx'] : $maxx;
+	  $maxy = $component_bbox['maxy'] > $maxy ? $component_bbox['maxy'] : $maxy;
+	  $minx = $component_bbox['minx'] < $minx ? $component_bbox['minx'] : $minx;
+	  $miny = $component_bbox['miny'] < $miny ? $component_bbox['miny'] : $miny;
+	  $i++;
+	}
+
+	return array(
+	  'maxy' => $maxy,
+	  'miny' => $miny,
+	  'maxx' => $maxx,
+	  'minx' => $minx,
+	);
   }
 
   public function asArray() {
-    $array = array();
-    foreach ($this->components as $component) {
-      $array[] = $component->asArray();
-    }
-    return $array;
+	$array = array();
+	foreach ($this->components as $component) {
+	  $array[] = $component->asArray();
+	}
+	return $array;
   }
 
   public function area() {
-    if ($this->geos()) {
-      return $this->geos()->area();
-    }
-
-    $area = 0;
-    foreach ($this->components as $component) {
-      $area += $component->area();
-    }
-    return $area;
+	if ($this->geos()) {
+	  return $this->geos()->area();
+	}
+
+	$area = 0;
+	foreach ($this->components as $component) {
+	  $area += $component->area();
+	}
+	return $area;
   }
 
   // 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();
-    }
+	if ($this->geos()) {
+	  return $this->geos()->boundary();
+	}
 
-    $components_boundaries = array();
-    foreach ($this->components as $component) {
-      $components_boundaries[] = $component->boundary();
-    }
-    return geoPHP::geometryReduce($components_boundaries);
+	$components_boundaries = array();
+	foreach ($this->components as $component) {
+	  $components_boundaries[] = $component->boundary();
+	}
+	return geoPHP::geometryReduce($components_boundaries);
   }
 
   public function numGeometries() {
-    return count($this->components);
+	return count($this->components);
   }
 
   // Note that the standard is 1 based indexing
   public function geometryN($n) {
-    $n = intval($n);
-    if (array_key_exists($n-1, $this->components)) {
-      return $this->components[$n-1];
-    }
-    else {
-      return NULL;
-    }
+	$n = intval($n);
+	if (array_key_exists($n-1, $this->components)) {
+	  return $this->components[$n-1];
+	}
+	else {
+	  return NULL;
+	}
   }
 
   public function length() {
-    $length = 0;
-    foreach ($this->components as $delta => $component) {
-      $length += $component->length();
-    }
-    return $length;
+	$length = 0;
+	foreach ($this->components as $delta => $component) {
+	  $length += $component->length();
+	}
+	return $length;
   }
 
   public function greatCircleLength($radius = 6378137) {
-    $length = 0;
-    foreach ($this->components as $component) {
-      $length += $component->greatCircleLength($radius);
-    }
-    return $length;
+	$length = 0;
+	foreach ($this->components as $component) {
+	  $length += $component->greatCircleLength($radius);
+	}
+	return $length;
   }
 
   public function haversineLength() {
-    $length = 0;
-    foreach ($this->components as $component) {
-      $length += $component->haversineLength();
-    }
-    return $length;
+	$length = 0;
+	foreach ($this->components as $component) {
+	  $length += $component->haversineLength();
+	}
+	return $length;
   }
 
   public function dimension() {
-    $dimension = 0;
-    foreach ($this->components as $component) {
-      if ($component->dimension() > $dimension) {
-        $dimension = $component->dimension();
-      }
-    }
-    return $dimension;
+	$dimension = 0;
+	foreach ($this->components as $component) {
+	  if ($component->dimension() > $dimension) {
+		$dimension = $component->dimension();
+	  }
+	}
+	return $dimension;
   }
 
   // A collection is empty if it has no components OR all it's components are empty
   public function isEmpty() {
-    if (!count($this->components)) {
-      return TRUE;
-    }
-    else {
-      foreach ($this->components as $component) {
-        if (!$component->isEmpty()) return FALSE;
-      }
-      return TRUE;
-    }
+	if (!count($this->components)) {
+	  return TRUE;
+	}
+	else {
+	  foreach ($this->components as $component) {
+		if (!$component->isEmpty()) return FALSE;
+	  }
+	  return TRUE;
+	}
   }
 
   public function numPoints() {
-    $num = 0;
-    foreach ($this->components as $component) {
-      $num += $component->numPoints();
-    }
-    return $num;
+	$num = 0;
+	foreach ($this->components as $component) {
+	  $num += $component->numPoints();
+	}
+	return $num;
   }
 
   public function getPoints() {
-    $points = array();
-    foreach ($this->components as $component) {
-      $points = array_merge($points, $component->getPoints());
-    }
-    return $points;
+	$points = array();
+	foreach ($this->components as $component) {
+	  $points = array_merge($points, $component->getPoints());
+	}
+	return $points;
   }
 
   public function equals($geometry) {
-    if ($this->geos()) {
-      return $this->geos()->equals($geometry->geos());
-    }
-
-    // To test for equality we check to make sure that there is a matching point
-    // in the other geometry for every point in this geometry.
-    // This is slightly more strict than the standard, which
-    // uses Within(A,B) = true and Within(B,A) = true
-    // @@TODO: Eventually we could fix this by using some sort of simplification
-    // method that strips redundant vertices (that are all in a row)
-
-    $this_points = $this->getPoints();
-    $other_points = $geometry->getPoints();
-
-    // First do a check to make sure they have the same number of vertices
-    if (count($this_points) != count($other_points)) {
-      return FALSE;
-    }
-
-    foreach ($this_points as $point) {
-      $found_match = FALSE;
-      foreach ($other_points as $key => $test_point) {
-        if ($point->equals($test_point)) {
-          $found_match = TRUE;
-          unset($other_points[$key]);
-          break;
-        }
-      }
-      if (!$found_match) {
-        return FALSE;
-      }
-    }
-
-    // All points match, return TRUE
-    return TRUE;
+	if ($this->geos()) {
+	  return $this->geos()->equals($geometry->geos());
+	}
+
+	// To test for equality we check to make sure that there is a matching point
+	// in the other geometry for every point in this geometry.
+	// This is slightly more strict than the standard, which
+	// uses Within(A,B) = true and Within(B,A) = true
+	// @@TODO: Eventually we could fix this by using some sort of simplification
+	// method that strips redundant vertices (that are all in a row)
+
+	$this_points = $this->getPoints();
+	$other_points = $geometry->getPoints();
+
+	// First do a check to make sure they have the same number of vertices
+	if (count($this_points) != count($other_points)) {
+	  return FALSE;
+	}
+
+	foreach ($this_points as $point) {
+	  $found_match = FALSE;
+	  foreach ($other_points as $key => $test_point) {
+		if ($point->equals($test_point)) {
+		  $found_match = TRUE;
+		  unset($other_points[$key]);
+		  break;
+		}
+	  }
+	  if (!$found_match) {
+		return FALSE;
+	  }
+	}
+
+	// All points match, return TRUE
+	return TRUE;
   }
 
   public function isSimple() {
-    if ($this->geos()) {
-      return $this->geos()->isSimple();
-    }
+	if ($this->geos()) {
+	  return $this->geos()->isSimple();
+	}
 
-    // A collection is simple if all it's components are simple
-    foreach ($this->components as $component) {
-      if (!$component->isSimple()) return FALSE;
-    }
+	// A collection is simple if all it's components are simple
+	foreach ($this->components as $component) {
+	  if (!$component->isSimple()) return FALSE;
+	}
 
-    return TRUE;
+	return TRUE;
   }
 
   public function explode() {
-    $parts = array();
-    foreach ($this->components as $component) {
-      $parts = array_merge($parts, $component->explode());
-    }
-    return $parts;
+	$parts = array();
+	foreach ($this->components as $component) {
+	  $parts = array_merge($parts, $component->explode());
+	}
+	return $parts;
   }
 
   // Not valid for this geometry type

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

Indentation +116 added lines, -116 removed lines

@@ -19,173 +19,173 @@
       throw new Exception("Cannot construct a LineString with a single point");
     }
 */
-    // Call the Collection constructor to build the LineString
-    parent::__construct($points);
+	// Call the Collection constructor to build the LineString
+	parent::__construct($points);
   }
 
   // The boundary of a linestring is itself
   public function boundary() {
-    return $this;
+	return $this;
   }
 
   public function startPoint() {
-    return $this->pointN(1);
+	return $this->pointN(1);
   }
 
   public function endPoint() {
-    $last_n = $this->numPoints();
-    return $this->pointN($last_n);
+	$last_n = $this->numPoints();
+	return $this->pointN($last_n);
   }
 
   public function isClosed() {
-    return ($this->startPoint()->equals($this->endPoint()));
+	return ($this->startPoint()->equals($this->endPoint()));
   }
 
   public function isRing() {
-    return ($this->isClosed() && $this->isSimple());
+	return ($this->isClosed() && $this->isSimple());
   }
 
   public function numPoints() {
-    return $this->numGeometries();
+	return $this->numGeometries();
   }
 
   public function pointN($n) {
-    return $this->geometryN($n);
+	return $this->geometryN($n);
   }
 
   public function dimension() {
-    if ($this->isEmpty()) return 0;
-    return 1;
+	if ($this->isEmpty()) return 0;
+	return 1;
   }
 
   public function area() {
-    return 0;
+	return 0;
   }
 
   public function length() {
-    if ($this->geos()) {
-      return $this->geos()->length();
-    }
-    $length = 0;
-    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));
-      }
-    }
-    return $length;
+	if ($this->geos()) {
+	  return $this->geos()->length();
+	}
+	$length = 0;
+	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));
+	  }
+	}
+	return $length;
   }
 
   public function greatCircleLength($radius = 6378137) {
-    $length = 0;
-    $points = $this->getPoints();
-    for($i=0; $i<$this->numPoints()-1; $i++) {
-      $point = $points[$i];
-      $next_point = $points[$i+1];
-      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;
-      $length +=
-        $radius *
-          atan2(
-            sqrt(
-              pow(cos($lat2) * sin($dlon), 2) +
-                pow(cos($lat1) * sin($lat2) - sin($lat1) * cos($lat2) * cos($dlon), 2)
-            )
-            ,
-            sin($lat1) * sin($lat2) +
-              cos($lat1) * cos($lat2) * cos($dlon)
-          );
-    }
-    // Returns length in meters.
-    return $length;
+	$length = 0;
+	$points = $this->getPoints();
+	for($i=0; $i<$this->numPoints()-1; $i++) {
+	  $point = $points[$i];
+	  $next_point = $points[$i+1];
+	  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;
+	  $length +=
+		$radius *
+		  atan2(
+			sqrt(
+			  pow(cos($lat2) * sin($dlon), 2) +
+				pow(cos($lat1) * sin($lat2) - sin($lat1) * cos($lat2) * cos($dlon), 2)
+			)
+			,
+			sin($lat1) * sin($lat2) +
+			  cos($lat1) * cos($lat2) * cos($dlon)
+		  );
+	}
+	// Returns length in meters.
+	return $length;
   }
 
   public function haversineLength() {
-    $degrees = 0;
-    $points = $this->getPoints();
-    for($i=0; $i<$this->numPoints()-1; $i++) {
-      $point = $points[$i];
-      $next_point = $points[$i+1];
-      if (!is_object($next_point)) {continue;}
-      $degree = rad2deg(
-        acos(
-          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())))
-        )
-      );
-      $degrees += $degree;
-    }
-    // Returns degrees
-    return $degrees;
+	$degrees = 0;
+	$points = $this->getPoints();
+	for($i=0; $i<$this->numPoints()-1; $i++) {
+	  $point = $points[$i];
+	  $next_point = $points[$i+1];
+	  if (!is_object($next_point)) {continue;}
+	  $degree = rad2deg(
+		acos(
+		  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())))
+		)
+	  );
+	  $degrees += $degree;
+	}
+	// Returns degrees
+	return $degrees;
   }
 
   public function explode() {
-    $parts = array();
-    $points = $this->getPoints();
+	$parts = array();
+	$points = $this->getPoints();
 
-    foreach ($points as $i => $point) {
-      if (isset($points[$i+1])) {
-        $parts[] = new LineString(array($point, $points[$i+1]));
-      }
-    }
-    return $parts;
+	foreach ($points as $i => $point) {
+	  if (isset($points[$i+1])) {
+		$parts[] = new LineString(array($point, $points[$i+1]));
+	  }
+	}
+	return $parts;
   }
 
   public function isSimple() {
-    if ($this->geos()) {
-      return $this->geos()->isSimple();
-    }
+	if ($this->geos()) {
+	  return $this->geos()->isSimple();
+	}
 
-    $segments = $this->explode();
+	$segments = $this->explode();
 
-    foreach ($segments as $i => $segment) {
-      foreach ($segments as $j => $check_segment) {
-        if ($i != $j) {
-          if ($segment->lineSegmentIntersect($check_segment)) {
-            return FALSE;
-          }
-        }
-      }
-    }
-    return TRUE;
+	foreach ($segments as $i => $segment) {
+	  foreach ($segments as $j => $check_segment) {
+		if ($i != $j) {
+		  if ($segment->lineSegmentIntersect($check_segment)) {
+			return FALSE;
+		  }
+		}
+	  }
+	}
+	return TRUE;
   }
 
   // Utility function to check if any line sigments intersect
   // Derived from http://stackoverflow.com/questions/563198/how-do-you-detect-where-two-line-segments-intersect
   public function lineSegmentIntersect($segment) {
-    $p0_x = $this->startPoint()->x();
-    $p0_y = $this->startPoint()->y();
-    $p1_x = $this->endPoint()->x();
-    $p1_y = $this->endPoint()->y();
-    $p2_x = $segment->startPoint()->x();
-    $p2_y = $segment->startPoint()->y();
-    $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;
-
-    $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;
-
-    if ($s > 0 && $s < 1 && $t > 0 && $t < 1) {
-      // Collision detected
-      return TRUE;
-    }
-    return FALSE;
+	$p0_x = $this->startPoint()->x();
+	$p0_y = $this->startPoint()->y();
+	$p1_x = $this->endPoint()->x();
+	$p1_y = $this->endPoint()->y();
+	$p2_x = $segment->startPoint()->x();
+	$p2_y = $segment->startPoint()->y();
+	$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;
+
+	$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;
+
+	if ($s > 0 && $s < 1 && $t > 0 && $t < 1) {
+	  // Collision detected
+	  return TRUE;
+	}
+	return FALSE;
   }
 }
 

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

Indentation +146 added lines, -146 removed lines

@@ -46,38 +46,38 @@ 
   // Public: Standard -- Common to all geometries
   // --------------------------------------------
   public function SRID() {
-    return $this->srid;
+	return $this->srid;
   }
 
   public function setSRID($srid) {
-    if ($this->geos()) {
-      $this->geos()->setSRID($srid);
-    }
-    $this->srid = $srid;
+	if ($this->geos()) {
+	  $this->geos()->setSRID($srid);
+	}
+	$this->srid = $srid;
   }
 
   public function envelope() {
-    if ($this->isEmpty()) return new Polygon();
+	if ($this->isEmpty()) return new Polygon();
 
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->envelope());
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->envelope());
+	}
 
-    $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']),
-    );
+	$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']),
+	);
 
-    $outer_boundary = new LineString($points);
-    return new Polygon(array($outer_boundary));
+	$outer_boundary = new LineString($points);
+	return new Polygon(array($outer_boundary));
   }
 
   public function geometryType() {
-    return $this->geom_type;
+	return $this->geom_type;
   }
 
   // Public: Non-Standard -- Common to all geometries
@@ -85,263 +85,263 @@ 
 
   // $this->out($format, $other_args);
   public function out() {
-    $args = func_get_args();
+	$args = func_get_args();
 
-    $format = array_shift($args);
-    $type_map = geoPHP::getAdapterMap();
-    $processor_type = $type_map[$format];
-    $processor = new $processor_type();
+	$format = array_shift($args);
+	$type_map = geoPHP::getAdapterMap();
+	$processor_type = $type_map[$format];
+	$processor = new $processor_type();
 
-    array_unshift($args, $this);
-    $result = call_user_func_array(array($processor, 'write'), $args);
+	array_unshift($args, $this);
+	$result = call_user_func_array(array($processor, 'write'), $args);
 
-    return $result;
+	return $result;
   }
 
 
   // Public: Aliases
   // ---------------
   public function getCentroid() {
-    return $this->centroid();
+	return $this->centroid();
   }
 
   public function getArea() {
-    return $this->area();
+	return $this->area();
   }
 
   public function getX() {
-    return $this->x();
+	return $this->x();
   }
 
   public function getY() {
-    return $this->y();
+	return $this->y();
   }
 
   public function getGeos() {
-    return $this->geos();
+	return $this->geos();
   }
 
   public function getGeomType() {
-    return $this->geometryType();
+	return $this->geometryType();
   }
 
   public function getSRID() {
-    return $this->SRID();
+	return $this->SRID();
   }
 
   public function asText() {
-    return $this->out('wkt');
+	return $this->out('wkt');
   }
 
   public function asBinary() {
-    return $this->out('wkb');
+	return $this->out('wkb');
   }
 
   // Public: GEOS Only Functions
   // ---------------------------
   public function geos() {
-    // If it's already been set, just return it
-    if ($this->geos && geoPHP::geosInstalled()) {
-      return $this->geos;
-    }
-    // It hasn't been set yet, generate it
-    if (geoPHP::geosInstalled()) {
-      $reader = new GEOSWKBReader();
-      $this->geos = $reader->readHEX($this->out('wkb',TRUE));
-    }
-    else {
-      $this->geos = FALSE;
-    }
-    return $this->geos;
+	// If it's already been set, just return it
+	if ($this->geos && geoPHP::geosInstalled()) {
+	  return $this->geos;
+	}
+	// It hasn't been set yet, generate it
+	if (geoPHP::geosInstalled()) {
+	  $reader = new GEOSWKBReader();
+	  $this->geos = $reader->readHEX($this->out('wkb',TRUE));
+	}
+	else {
+	  $this->geos = FALSE;
+	}
+	return $this->geos;
   }
 
   public function setGeos($geos) {
-    $this->geos = $geos;
+	$this->geos = $geos;
   }
 
   public function pointOnSurface() {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->pointOnSurface());
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->pointOnSurface());
+	}
   }
 
   public function equalsExact(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->equalsExact($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->equalsExact($geometry->geos());
+	}
   }
 
   public function relate(Geometry $geometry, $pattern = NULL) {
-    if ($this->geos()) {
-      if ($pattern) {
-        return $this->geos()->relate($geometry->geos(), $pattern);
-      }
-      else {
-        return $this->geos()->relate($geometry->geos());
-      }
-    }
+	if ($this->geos()) {
+	  if ($pattern) {
+		return $this->geos()->relate($geometry->geos(), $pattern);
+	  }
+	  else {
+		return $this->geos()->relate($geometry->geos());
+	  }
+	}
   }
 
   public function checkValidity() {
-    if ($this->geos()) {
-      return $this->geos()->checkValidity();
-    }
+	if ($this->geos()) {
+	  return $this->geos()->checkValidity();
+	}
   }
 
   public function buffer($distance) {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->buffer($distance));
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->buffer($distance));
+	}
   }
 
   public function intersection(Geometry $geometry) {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->intersection($geometry->geos()));
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->intersection($geometry->geos()));
+	}
   }
 
   public function convexHull() {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->convexHull());
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->convexHull());
+	}
   }
 
   public function difference(Geometry $geometry) {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->difference($geometry->geos()));
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->difference($geometry->geos()));
+	}
   }
 
   public function symDifference(Geometry $geometry) {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->symDifference($geometry->geos()));
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->symDifference($geometry->geos()));
+	}
   }
 
   // Can pass in a geometry or an array of geometries
   public function union(Geometry $geometry) {
-    if ($this->geos()) {
-      if (is_array($geometry)) {
-        $geom = $this->geos();
-        foreach ($geometry as $item) {
-          $geom = $geom->union($item->geos());
-        }
-        return geoPHP::geosToGeometry($geom);
-      }
-      else {
-        return geoPHP::geosToGeometry($this->geos()->union($geometry->geos()));
-      }
-    }
+	if ($this->geos()) {
+	  if (is_array($geometry)) {
+		$geom = $this->geos();
+		foreach ($geometry as $item) {
+		  $geom = $geom->union($item->geos());
+		}
+		return geoPHP::geosToGeometry($geom);
+	  }
+	  else {
+		return geoPHP::geosToGeometry($this->geos()->union($geometry->geos()));
+	  }
+	}
   }
 
   public function simplify($tolerance, $preserveTopology = FALSE) {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->simplify($tolerance, $preserveTopology));
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->simplify($tolerance, $preserveTopology));
+	}
   }
 
   public function disjoint(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->disjoint($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->disjoint($geometry->geos());
+	}
   }
 
   public function touches(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->touches($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->touches($geometry->geos());
+	}
   }
 
   public function intersects(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->intersects($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->intersects($geometry->geos());
+	}
   }
 
   public function crosses(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->crosses($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->crosses($geometry->geos());
+	}
   }
 
   public function within(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->within($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->within($geometry->geos());
+	}
   }
 
   public function contains(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->contains($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->contains($geometry->geos());
+	}
   }
 
   public function overlaps(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->overlaps($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->overlaps($geometry->geos());
+	}
   }
 
   public function covers(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->covers($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->covers($geometry->geos());
+	}
   }
 
   public function coveredBy(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->coveredBy($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->coveredBy($geometry->geos());
+	}
   }
 
   public function distance(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->distance($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->distance($geometry->geos());
+	}
   }
 
   public function hausdorffDistance(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->hausdorffDistance($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->hausdorffDistance($geometry->geos());
+	}
   }
 
   public function project(Geometry $point, $normalized = NULL) {
-    if ($this->geos()) {
-      return $this->geos()->project($point->geos(), $normalized);
-    }
+	if ($this->geos()) {
+	  return $this->geos()->project($point->geos(), $normalized);
+	}
   }
 
   // Public - Placeholders
   // ---------------------
   public function hasZ() {
-    // geoPHP does not support Z values at the moment
-    return FALSE;
+	// geoPHP does not support Z values at the moment
+	return FALSE;
   }
 
   public function is3D() {
-    // geoPHP does not support 3D geometries at the moment
-    return FALSE;
+	// geoPHP does not support 3D geometries at the moment
+	return FALSE;
   }
 
   public function isMeasured() {
-    // geoPHP does not yet support M values
-    return FALSE;
+	// geoPHP does not yet support M values
+	return FALSE;
   }
 
   public function coordinateDimension() {
-    // geoPHP only supports 2-dimentional space
-    return 2;
+	// geoPHP only supports 2-dimentional space
+	return 2;
   }
 
   public function z() {
-    // geoPHP only supports 2-dimentional space
-    return NULL;
+	// geoPHP only supports 2-dimentional space
+	return NULL;
   }
 
   public function m() {
-    // geoPHP only supports 2-dimentional space
-    return NULL;
+	// geoPHP only supports 2-dimentional space
+	return NULL;
   }
 
 }

require/libs/geoPHP/geoPHP.inc

Indentation +225 added lines, -225 removed lines

@@ -35,110 +35,110 @@ 
 {

 

   static function version() {

-    return '1.1';

+	return '1.1';

   }

 

   // geoPHP::load($data, $type, $other_args);

   // if $data is an array, all passed in values will be combined into a single geometry

   static function load() {

-    $args = func_get_args();

+	$args = func_get_args();

 

-    $data = array_shift($args);

-    $type = array_shift($args);

+	$data = array_shift($args);

+	$type = array_shift($args);

 

-    $type_map = geoPHP::getAdapterMap();

+	$type_map = geoPHP::getAdapterMap();

 

-    // Auto-detect type if needed

-    if (!$type) {

-      // If the user is trying to load a Geometry from a Geometry... Just pass it back

-      if (is_object($data)) {

-        if ($data instanceOf Geometry) return $data;

-      }

+	// Auto-detect type if needed

+	if (!$type) {

+	  // If the user is trying to load a Geometry from a Geometry... Just pass it back

+	  if (is_object($data)) {

+		if ($data instanceOf Geometry) return $data;

+	  }

       

-      $detected = geoPHP::detectFormat($data);

-      if (!$detected) {

-        return FALSE;

-      }

+	  $detected = geoPHP::detectFormat($data);

+	  if (!$detected) {

+		return FALSE;

+	  }

       

-      $format = explode(':', $detected);

-      $type = array_shift($format);

-      $args = $format;

-    }

-

-    $processor_type = $type_map[$type];

-

-    if (!$processor_type) {

-      throw new exception('geoPHP could not find an adapter of type '.htmlentities($type));

-      exit;

-    }

-

-    $processor = new $processor_type();

-

-    // Data is not an array, just pass it normally

-    if (!is_array($data)) {

-      $result = call_user_func_array(array($processor, "read"), array_merge(array($data), $args));

-    }

-    // Data is an array, combine all passed in items into a single geomtetry

-    else {

-      $geoms = array();

-      foreach ($data as $item) {

-        $geoms[] = call_user_func_array(array($processor, "read"), array_merge(array($item), $args));

-      }

-      $result = geoPHP::geometryReduce($geoms);

-    }

-

-    return $result;

+	  $format = explode(':', $detected);

+	  $type = array_shift($format);

+	  $args = $format;

+	}

+

+	$processor_type = $type_map[$type];

+

+	if (!$processor_type) {

+	  throw new exception('geoPHP could not find an adapter of type '.htmlentities($type));

+	  exit;

+	}

+

+	$processor = new $processor_type();

+

+	// Data is not an array, just pass it normally

+	if (!is_array($data)) {

+	  $result = call_user_func_array(array($processor, "read"), array_merge(array($data), $args));

+	}

+	// Data is an array, combine all passed in items into a single geomtetry

+	else {

+	  $geoms = array();

+	  foreach ($data as $item) {

+		$geoms[] = call_user_func_array(array($processor, "read"), array_merge(array($item), $args));

+	  }

+	  $result = geoPHP::geometryReduce($geoms);

+	}

+

+	return $result;

   }

 

   static function getAdapterMap() {

-    return array (

-      'wkt' =>  'WKT',

-      'ewkt' => 'EWKT',

-      'wkb' =>  'WKB',

-      'ewkb' => 'EWKB',

-      'json' => 'GeoJSON',

-      'geojson' => 'GeoJSON',

-      'kml' =>  'KML',

-      'gpx' =>  'GPX',

-      'georss' => 'GeoRSS',

-      'google_geocode' => 'GoogleGeocode',

-      'geohash' => 'GeoHash',

-    );

+	return array (

+	  'wkt' =>  'WKT',

+	  'ewkt' => 'EWKT',

+	  'wkb' =>  'WKB',

+	  'ewkb' => 'EWKB',

+	  'json' => 'GeoJSON',

+	  'geojson' => 'GeoJSON',

+	  'kml' =>  'KML',

+	  'gpx' =>  'GPX',

+	  'georss' => 'GeoRSS',

+	  'google_geocode' => 'GoogleGeocode',

+	  'geohash' => 'GeoHash',

+	);

   }

 

   static function geometryList() {

-    return array(

-      'point' => 'Point',

-      'linestring' => 'LineString',

-      'polygon' => 'Polygon',

-      'multipoint' => 'MultiPoint',

-      'multilinestring' => 'MultiLineString',

-      'multipolygon' => 'MultiPolygon',

-      'geometrycollection' => 'GeometryCollection',

-    );

+	return array(

+	  'point' => 'Point',

+	  'linestring' => 'LineString',

+	  'polygon' => 'Polygon',

+	  'multipoint' => 'MultiPoint',

+	  'multilinestring' => 'MultiLineString',

+	  'multipolygon' => 'MultiPolygon',

+	  'geometrycollection' => 'GeometryCollection',

+	);

   }

 

   static function geosInstalled($force = NULL) {

-    static $geos_installed = NULL;

-    if ($force !== NULL) $geos_installed = $force;

-    if ($geos_installed !== NULL) {

-      return $geos_installed;

-    }

-    $geos_installed = class_exists('GEOSGeometry');

-    return $geos_installed;

+	static $geos_installed = NULL;

+	if ($force !== NULL) $geos_installed = $force;

+	if ($geos_installed !== NULL) {

+	  return $geos_installed;

+	}

+	$geos_installed = class_exists('GEOSGeometry');

+	return $geos_installed;

   }

 

   static function geosToGeometry($geos) {

-    if (!geoPHP::geosInstalled()) {

-      return NULL;

-    }

-    $wkb_writer = new GEOSWKBWriter();

-    $wkb = $wkb_writer->writeHEX($geos);

-    $geometry = geoPHP::load($wkb, 'wkb', TRUE);

-    if ($geometry) {

-      $geometry->setGeos($geos);

-      return $geometry;

-    }

+	if (!geoPHP::geosInstalled()) {

+	  return NULL;

+	}

+	$wkb_writer = new GEOSWKBWriter();

+	$wkb = $wkb_writer->writeHEX($geos);

+	$geometry = geoPHP::load($wkb, 'wkb', TRUE);

+	if ($geometry) {

+	  $geometry->setGeos($geos);

+	  return $geometry;

+	}

   }

 

   // Reduce a geometry, or an array of geometries, into their 'lowest' available common geometry.

@@ -146,155 +146,155 @@ 
   // A multi-point containing a single point will return a point.

   // An array of geometries can be passed and they will be compiled into a single geometry

   static function geometryReduce($geometry) {

-    // If it's an array of one, then just parse the one

-    if (is_array($geometry)) {

-      if (empty($geometry)) return FALSE;

-      if (count($geometry) == 1) return geoPHP::geometryReduce(array_shift($geometry));

-    }

-

-    // If the geometry cannot even theoretically be reduced more, then pass it back

-    if (gettype($geometry) == 'object') {

-      $passbacks = array('Point','LineString','Polygon');

-      if (in_array($geometry->geometryType(),$passbacks)) {

-        return $geometry;

-      }

-    }

-

-    // If it is a mutlti-geometry, check to see if it just has one member

-    // If it does, then pass the member, if not, then just pass back the geometry

-    if (gettype($geometry) == 'object') {

-      $simple_collections = array('MultiPoint','MultiLineString','MultiPolygon');

-      if (in_array(get_class($geometry),$passbacks)) {

-        $components = $geometry->getComponents();

-        if (count($components) == 1) {

-          return $components[0];

-        }

-        else {

-          return $geometry;

-        }

-      }

-    }

-

-    // So now we either have an array of geometries, a GeometryCollection, or an array of GeometryCollections

-    if (!is_array($geometry)) {

-      $geometry = array($geometry);

-    }

-

-    $geometries = array();

-    $geom_types = array();

-

-    $collections = array('MultiPoint','MultiLineString','MultiPolygon','GeometryCollection');

-

-    foreach ($geometry as $item) {

-      if ($item) {

-        if (in_array(get_class($item), $collections)) {

-          foreach ($item->getComponents() as $component) {

-            $geometries[] = $component;

-            $geom_types[] = $component->geometryType();

-          }

-        }

-        else {

-          $geometries[] = $item;

-          $geom_types[] = $item->geometryType();

-        }

-      }

-    }

-

-    $geom_types = array_unique($geom_types);

+	// If it's an array of one, then just parse the one

+	if (is_array($geometry)) {

+	  if (empty($geometry)) return FALSE;

+	  if (count($geometry) == 1) return geoPHP::geometryReduce(array_shift($geometry));

+	}

+

+	// If the geometry cannot even theoretically be reduced more, then pass it back

+	if (gettype($geometry) == 'object') {

+	  $passbacks = array('Point','LineString','Polygon');

+	  if (in_array($geometry->geometryType(),$passbacks)) {

+		return $geometry;

+	  }

+	}

+

+	// If it is a mutlti-geometry, check to see if it just has one member

+	// If it does, then pass the member, if not, then just pass back the geometry

+	if (gettype($geometry) == 'object') {

+	  $simple_collections = array('MultiPoint','MultiLineString','MultiPolygon');

+	  if (in_array(get_class($geometry),$passbacks)) {

+		$components = $geometry->getComponents();

+		if (count($components) == 1) {

+		  return $components[0];

+		}

+		else {

+		  return $geometry;

+		}

+	  }

+	}

+

+	// So now we either have an array of geometries, a GeometryCollection, or an array of GeometryCollections

+	if (!is_array($geometry)) {

+	  $geometry = array($geometry);

+	}

+

+	$geometries = array();

+	$geom_types = array();

+

+	$collections = array('MultiPoint','MultiLineString','MultiPolygon','GeometryCollection');

+

+	foreach ($geometry as $item) {

+	  if ($item) {

+		if (in_array(get_class($item), $collections)) {

+		  foreach ($item->getComponents() as $component) {

+			$geometries[] = $component;

+			$geom_types[] = $component->geometryType();

+		  }

+		}

+		else {

+		  $geometries[] = $item;

+		  $geom_types[] = $item->geometryType();

+		}

+	  }

+	}

+

+	$geom_types = array_unique($geom_types);

     

-    if (empty($geom_types)) {

-      return FALSE;

-    }

-

-    if (count($geom_types) == 1) {

-      if (count($geometries) == 1) {

-        return $geometries[0];

-      }

-      else {

-        $class = 'Multi'.$geom_types[0];

-        return new $class($geometries);

-      }

-    }

-    else {

-      return new GeometryCollection($geometries);

-    }

+	if (empty($geom_types)) {

+	  return FALSE;

+	}

+

+	if (count($geom_types) == 1) {

+	  if (count($geometries) == 1) {

+		return $geometries[0];

+	  }

+	  else {

+		$class = 'Multi'.$geom_types[0];

+		return new $class($geometries);

+	  }

+	}

+	else {

+	  return new GeometryCollection($geometries);

+	}

   }

 

   // Detect a format given a value. This function is meant to be SPEEDY.

   // It could make a mistake in XML detection if you are mixing or using namespaces in weird ways (ie, KML inside an RSS feed)

   static function detectFormat(&$input) {

-    $mem = fopen('php://memory', 'r+');

-    fwrite($mem, $input, 11); // Write 11 bytes - we can detect the vast majority of formats in the first 11 bytes

-    fseek($mem, 0);

-

-    $bytes = unpack("c*", fread($mem, 11));

-

-    // If bytes is empty, then we were passed empty input

-    if (empty($bytes)) return FALSE;

-

-    // First char is a tab, space or carriage-return. trim it and try again

-    if ($bytes[1] == 9 || $bytes[1] == 10 || $bytes[1] == 32) {

-      return geoPHP::detectFormat(ltrim($input));

-    }

-

-    // Detect WKB or EWKB -- first byte is 1 (little endian indicator)

-    if ($bytes[1] == 1) {

-      // If SRID byte is TRUE (1), it's EWKB

-      if ($bytes[5]) return 'ewkb';

-      else return 'wkb';

-    }

-

-    // Detect HEX encoded WKB or EWKB (PostGIS format) -- first byte is 48, second byte is 49 (hex '01' => first-byte = 1)

-    if ($bytes[1] == 48 && $bytes[2] == 49) {

-      // The shortest possible WKB string (LINESTRING EMPTY) is 18 hex-chars (9 encoded bytes) long

-      // This differentiates it from a geohash, which is always shorter than 18 characters.

-      if (strlen($input) >= 18) {

-        //@@TODO: Differentiate between EWKB and WKB -- check hex-char 10 or 11 (SRID bool indicator at encoded byte 5)

-        return 'ewkb:1';

-      }

-    }

-

-    // Detect GeoJSON - first char starts with {

-    if ($bytes[1] == 123) {

-      return 'json';

-    }

-

-    // Detect EWKT - first char is S

-    if ($bytes[1] == 83) {

-      return 'ewkt';

-    }

-

-    // Detect WKT - first char starts with P (80), L (76), M (77), or G (71)

-    $wkt_chars = array(80, 76, 77, 71);

-    if (in_array($bytes[1], $wkt_chars)) {

-      return 'wkt';

-    }

-

-    // Detect XML -- first char is <

-    if ($bytes[1] == 60) {

-      // grab the first 256 characters

-      $string = substr($input, 0, 256);

-      if (strpos($string, '<kml') !== FALSE)        return 'kml';

-      if (strpos($string, '<coordinate') !== FALSE) return 'kml';

-      if (strpos($string, '<gpx') !== FALSE)        return 'gpx';

-      if (strpos($string, '<georss') !== FALSE)     return 'georss';

-      if (strpos($string, '<rss') !== FALSE)        return 'georss';

-      if (strpos($string, '<feed') !== FALSE)       return 'georss';

-    }

-

-    // We need an 8 byte string for geohash and unpacked WKB / WKT

-    fseek($mem, 0);

-    $string = trim(fread($mem, 8));

-

-    // Detect geohash - geohash ONLY contains lowercase chars and numerics

-    preg_match('/[a-z0-9]+/', $string, $matches);

-    if ($matches[0] == $string) {

-      return 'geohash';

-    }

-

-    // What do you get when you cross an elephant with a rhino?

-    // http://youtu.be/RCBn5J83Poc

-    return FALSE;

+	$mem = fopen('php://memory', 'r+');

+	fwrite($mem, $input, 11); // Write 11 bytes - we can detect the vast majority of formats in the first 11 bytes

+	fseek($mem, 0);

+

+	$bytes = unpack("c*", fread($mem, 11));

+

+	// If bytes is empty, then we were passed empty input

+	if (empty($bytes)) return FALSE;

+

+	// First char is a tab, space or carriage-return. trim it and try again

+	if ($bytes[1] == 9 || $bytes[1] == 10 || $bytes[1] == 32) {

+	  return geoPHP::detectFormat(ltrim($input));

+	}

+

+	// Detect WKB or EWKB -- first byte is 1 (little endian indicator)

+	if ($bytes[1] == 1) {

+	  // If SRID byte is TRUE (1), it's EWKB

+	  if ($bytes[5]) return 'ewkb';

+	  else return 'wkb';

+	}

+

+	// Detect HEX encoded WKB or EWKB (PostGIS format) -- first byte is 48, second byte is 49 (hex '01' => first-byte = 1)

+	if ($bytes[1] == 48 && $bytes[2] == 49) {

+	  // The shortest possible WKB string (LINESTRING EMPTY) is 18 hex-chars (9 encoded bytes) long

+	  // This differentiates it from a geohash, which is always shorter than 18 characters.

+	  if (strlen($input) >= 18) {

+		//@@TODO: Differentiate between EWKB and WKB -- check hex-char 10 or 11 (SRID bool indicator at encoded byte 5)

+		return 'ewkb:1';

+	  }

+	}

+

+	// Detect GeoJSON - first char starts with {

+	if ($bytes[1] == 123) {

+	  return 'json';

+	}

+

+	// Detect EWKT - first char is S

+	if ($bytes[1] == 83) {

+	  return 'ewkt';

+	}

+

+	// Detect WKT - first char starts with P (80), L (76), M (77), or G (71)

+	$wkt_chars = array(80, 76, 77, 71);

+	if (in_array($bytes[1], $wkt_chars)) {

+	  return 'wkt';

+	}

+

+	// Detect XML -- first char is <

+	if ($bytes[1] == 60) {

+	  // grab the first 256 characters

+	  $string = substr($input, 0, 256);

+	  if (strpos($string, '<kml') !== FALSE)        return 'kml';

+	  if (strpos($string, '<coordinate') !== FALSE) return 'kml';

+	  if (strpos($string, '<gpx') !== FALSE)        return 'gpx';

+	  if (strpos($string, '<georss') !== FALSE)     return 'georss';

+	  if (strpos($string, '<rss') !== FALSE)        return 'georss';

+	  if (strpos($string, '<feed') !== FALSE)       return 'georss';

+	}

+

+	// We need an 8 byte string for geohash and unpacked WKB / WKT

+	fseek($mem, 0);

+	$string = trim(fread($mem, 8));

+

+	// Detect geohash - geohash ONLY contains lowercase chars and numerics

+	preg_match('/[a-z0-9]+/', $string, $matches);

+	if ($matches[0] == $string) {

+	  return 'geohash';

+	}

+

+	// What do you get when you cross an elephant with a rhino?

+	// http://youtu.be/RCBn5J83Poc

+	return FALSE;

   }

 

 }

require/class.SpotterServer.php

Indentation +63 added lines, -63 removed lines

@@ -7,121 +7,121 @@
 require_once(dirname(__FILE__).'/class.Translation.php');
 
 class SpotterServer {
-    public $dbs = null;
+	public $dbs = null;
     
-    function __construct($dbs = null) {
+	function __construct($dbs = null) {
 	if ($dbs === null) {
-	    $Connection = new Connection(null,'server');
-	    $this->dbs = $Connection->dbs;
-	    $query = "CREATE TABLE IF NOT EXISTS `spotter_temp` ( `id_data` INT NOT NULL AUTO_INCREMENT , `id_user` INT NOT NULL , `datetime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `hex` VARCHAR(20) NOT NULL , `ident` VARCHAR(20) NULL , `latitude` FLOAT NULL , `longitude` FLOAT NULL , `verticalrate` INT NULL , `speed` INT NULL , `squawk` INT NULL , `altitude` INT NULL , `heading` INT NULL , `registration` VARCHAR(10) NULL , `aircraft_icao` VARCHAR(10) NULL , `waypoints` VARCHAR(255) NULL , `noarchive` BOOLEAN NOT NULL DEFAULT FALSE, `id_source` INT NOT NULL DEFAULT '1', `format_source` VARCHAR(25) NULL, `source_name` VARCHAR(25) NULL, `over_country` VARCHAR(255) NULL, PRIMARY KEY (`id_data`) ) ENGINE = MEMORY;";
-	    try {
+		$Connection = new Connection(null,'server');
+		$this->dbs = $Connection->dbs;
+		$query = "CREATE TABLE IF NOT EXISTS `spotter_temp` ( `id_data` INT NOT NULL AUTO_INCREMENT , `id_user` INT NOT NULL , `datetime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `hex` VARCHAR(20) NOT NULL , `ident` VARCHAR(20) NULL , `latitude` FLOAT NULL , `longitude` FLOAT NULL , `verticalrate` INT NULL , `speed` INT NULL , `squawk` INT NULL , `altitude` INT NULL , `heading` INT NULL , `registration` VARCHAR(10) NULL , `aircraft_icao` VARCHAR(10) NULL , `waypoints` VARCHAR(255) NULL , `noarchive` BOOLEAN NOT NULL DEFAULT FALSE, `id_source` INT NOT NULL DEFAULT '1', `format_source` VARCHAR(25) NULL, `source_name` VARCHAR(25) NULL, `over_country` VARCHAR(255) NULL, PRIMARY KEY (`id_data`) ) ENGINE = MEMORY;";
+		try {
 		$sth = $this->dbs['server']->exec($query);
-	    } catch(PDOException $e) {
+		} catch(PDOException $e) {
 		return "error : ".$e->getMessage();
-	    }
+		}
+	}
 	}
-    }
     
-    function checkAll() {
-        return true;
-    }
+	function checkAll() {
+		return true;
+	}
     
-    function add($line) {
+	function add($line) {
 	global $globalDebug, $globalServerUserID;
 	date_default_timezone_set('UTC');
 	//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'aprs')) {
 	if (isset($line['format_source'])) {
-	    if(is_array($line) && isset($line['hex'])) {
+		if(is_array($line) && isset($line['hex'])) {
 		if ($line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6) {
-		    $data['hex'] = trim($line['hex']);
-		    if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
-		        $data['datetime'] = $line['datetime'];
-		    } else $data['datetime'] = date('Y-m-d H:i:s');
-		    if (!isset($line['aircraft_icao'])) {
-		        $Spotter = new Spotter();
-		        $aircraft_icao = $Spotter->getAllAircraftType($data['hex']);
-		        $Spotter->db = null;
+			$data['hex'] = trim($line['hex']);
+			if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
+				$data['datetime'] = $line['datetime'];
+			} else $data['datetime'] = date('Y-m-d H:i:s');
+			if (!isset($line['aircraft_icao'])) {
+				$Spotter = new Spotter();
+				$aircraft_icao = $Spotter->getAllAircraftType($data['hex']);
+				$Spotter->db = null;
 			if ($aircraft_icao == '' && isset($line['aircraft_type'])) {
-			    if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
-			    elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
-			    elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
-			    elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
+				if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
+				elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
+				elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
+				elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
 			}
 			$data['aircraft_icao'] = $aircraft_icao;
-		    } else $data['aircraft_icao'] = $line['aircraft_icao'];
-		    //if ($globalDebug) echo "*********** New aircraft hex : ".$data['hex']." ***********\n";
+			} else $data['aircraft_icao'] = $line['aircraft_icao'];
+			//if ($globalDebug) echo "*********** New aircraft hex : ".$data['hex']." ***********\n";
 		}
 		if (isset($line['registration']) && $line['registration'] != '') {
-		    $data['registration'] = $line['registration'];
+			$data['registration'] = $line['registration'];
 		} else $data['registration'] = null;
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
-		    $data['waypoints'] = $line['waypoints'];
+			$data['waypoints'] = $line['waypoints'];
 		} else $data['waypoints'] = null;
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
-		    $data['ident'] = trim($line['ident']);
+			$data['ident'] = trim($line['ident']);
 		} else $data['ident'] = null;
 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '') {
-		    if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '') {
+			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 			$data['latitude'] = $line['latitude'];
-		    } else $data['latitude'] = null;
-		    if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-		        if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+			} else $data['latitude'] = null;
+			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
 			$data['longitude'] = $line['longitude'];
-		    } else $data['longitude'] = null;
+			} else $data['longitude'] = null;
 		} else {
-		    $data['latitude'] = null;
-		    $data['longitude'] = null;
+			$data['latitude'] = null;
+			$data['longitude'] = null;
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
-		    $data['verticalrate'] = $line['verticalrate'];
+			$data['verticalrate'] = $line['verticalrate'];
 		} else $data['verticalrate'] = null;
 		if (isset($line['emergency']) && $line['emergency'] != '') {
-		    $data['emergency'] = $line['emergency'];
+			$data['emergency'] = $line['emergency'];
 		} else $data['emergency'] = null;
 		if (isset($line['ground']) && $line['ground'] != '') {
-		    $data['ground'] = $line['ground'];
+			$data['ground'] = $line['ground'];
 		} else $data['ground'] = null;
 		if (isset($line['speed']) && $line['speed'] != '') {
-		    $data['speed'] = round($line['speed']);
+			$data['speed'] = round($line['speed']);
 		} else $data['speed'] = null;
 		if (isset($line['squawk']) && $line['squawk'] != '') {
-		    $data['squawk'] = $line['squawk'];
+			$data['squawk'] = $line['squawk'];
 		} else $data['squawk'] = null;
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 			$data['altitude'] = round($line['altitude']);
   		} else $data['altitude'] = null;
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    $data['heading'] = round($line['heading']);
+			$data['heading'] = round($line['heading']);
   		} else $data['heading'] = null;
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $data['source_name'] = $line['source_name'];
+			$data['source_name'] = $line['source_name'];
   		} else $data['source_name'] = null;
 		if (isset($line['over_country']) && $line['over_country'] != '') {
-		    $data['over_country'] = $line['over_country'];
+			$data['over_country'] = $line['over_country'];
   		} else $data['over_country'] = null;
   		if (isset($line['noarchive']) && $line['noarchive']) {
-  		    $data['noarchive'] = true;
+  			$data['noarchive'] = true;
   		} else $data['noarchive'] = false;
   		$data['format_source'] = $line['format_source'];
   		if (isset($line['id_source'])) $id_source = $line['id_source'];
   		if (isset($data['hex'])) {
-  		    echo '.';
-  		    $id_user = $globalServerUserID;
-  		    if ($id_user == NULL) $id_user = 1;
-  		    if (!isset($id_source)) $id_source = 1;
-  		    $query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)';
-		    $query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']);
-		    try {
-                        $sth = $this->dbs['server']->prepare($query);
-                        $sth->execute($query_values);
-                    } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-            	    }
-        	}
-    	    }
+  			echo '.';
+  			$id_user = $globalServerUserID;
+  			if ($id_user == NULL) $id_user = 1;
+  			if (!isset($id_source)) $id_source = 1;
+  			$query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)';
+			$query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']);
+			try {
+						$sth = $this->dbs['server']->prepare($query);
+						$sth->execute($query_values);
+					} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+					}
+			}
+			}
+	}
 	}
-    }
 }
 ?>

manufacturer-statistics-time.php

Indentation +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['aircraft_manufacturer'])) {
-        header('Location: '.$globalURL.'/manufacturer');
-        die();
+		header('Location: '.$globalURL.'/manufacturer');
+		die();
 }
 $Spotter = new Spotter();
 $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
@@ -53,7 +53,7 @@ 
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Hour").'", "'._("# of Flights").'"], ';
-            	$hour_data = '';
+				$hour_data = '';
 	foreach($hour_array as $hour_item)
 	{
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';

search-json.php

Indentation +81 added lines, -81 removed lines

@@ -4,55 +4,55 @@ 
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
-                $sql_date = $end_date;
-        } else $sql_date = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
+				$sql_date = $end_date;
+		} else $sql_date = '';
 } else $sql_date = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);
@@ -89,52 +89,52 @@ 
        
 $output = '{';
   $output .= '"flightairmap": {';
-    $output .= '"title": "FlightAirMap JSON Feed",';
-    $output .= '"link": "http://www.flightairmap.fr",';
-    $output .= '"aircraft": [';
+	$output .= '"title": "FlightAirMap JSON Feed",';
+	$output .= '"link": "http://www.flightairmap.fr",';
+	$output .= '"aircraft": [';
     
-    if (!empty($spotter_array))
+	if (!empty($spotter_array))
 	  {
-	    foreach($spotter_array as $spotter_item)
-	    {
+		foreach($spotter_array as $spotter_item)
+		{
 				
 				$output .= '{';    	
-		            $output .= '"id": "'.$spotter_item['spotter_id'].'",';
-                    $output .= '"ident": "'.$spotter_item['ident'].'",';
-                    $output .= '"registration": "'.$spotter_item['registration'].'",';
-                    $output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
-                    $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
-                    $output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
-                    $output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
-                    $output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
-                    $output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
-                    $output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
-                    $output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
-                    $output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
-                    $output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
-                    $output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
-                    $output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
-                    $output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
-                    $output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
-                    $output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
-                    $output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
-                    $output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
-                    $output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
-                    $output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
-                    $output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
-                    $output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
-                    $output .= '"latitude": "'.$spotter_item['latitude'].'",';
-                    $output .= '"longitude": "'.$spotter_item['longitude'].'",';
-                    $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-                    $output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
-                    $output .= '"heading": "'.$spotter_item['heading'].'",';
-                    $output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
-                    $output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
-                    $output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
+					$output .= '"id": "'.$spotter_item['spotter_id'].'",';
+					$output .= '"ident": "'.$spotter_item['ident'].'",';
+					$output .= '"registration": "'.$spotter_item['registration'].'",';
+					$output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
+					$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
+					$output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
+					$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
+					$output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
+					$output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
+					$output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
+					$output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
+					$output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
+					$output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
+					$output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
+					$output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
+					$output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
+					$output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
+					$output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
+					$output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
+					$output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
+					$output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
+					$output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
+					$output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
+					$output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
+					$output .= '"latitude": "'.$spotter_item['latitude'].'",';
+					$output .= '"longitude": "'.$spotter_item['longitude'].'",';
+					$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+					$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
+					$output .= '"heading": "'.$spotter_item['heading'].'",';
+					$output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
+					$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
+					$output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
 				$output .= '},';
-	    }
+		}
 	   }
 	   $output  = substr($output, 0, -1);
 		 $output .= ']';