Ysurac / FlightAirMap

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;

   }

 

 }

scripts/cron.php

Indentation +6 added lines, -6 removed lines

@@ -11,12 +11,12 @@
 //checks to see if FlightAware import is set
 if ($globalFlightAware == TRUE)
 {
-    $SpotterLive = new SpotterLive();
-    $Spotter = new Spotter();
-    //deletes the spotter LIVE data
-    $SpotterLive->deleteLiveSpotterData();
+	$SpotterLive = new SpotterLive();
+	$Spotter = new Spotter();
+	//deletes the spotter LIVE data
+	$SpotterLive->deleteLiveSpotterData();
     
-    //imports the new data from FlightAware
-    $Spotter->importFromFlightAware();
+	//imports the new data from FlightAware
+	$Spotter->importFromFlightAware();
 }
 ?>
\ No newline at end of file

scripts/check_data.php

Indentation +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 */
 require_once(dirname(__FILE__).'/../require/settings.php');
 if ($globalInstalled) {
-    echo '$globalInstalled must be set to FALSE in require/settings.php';
-    exit;
+	echo '$globalInstalled must be set to FALSE in require/settings.php';
+	exit;
 }
 
 require_once('../require/class.Connection.php');

scripts/daemon-acars.php

Indentation +20 added lines, -20 removed lines

@@ -11,8 +11,8 @@ 
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 $schema = new Connection();
 if ($schema->latest() === false) {
-    echo "You MUST update to latest schema. Run install/index.php";
-    exit();
+	echo "You MUST update to latest schema. Run install/index.php";
+	exit();
 }
 
 $debug = true;
@@ -21,11 +21,11 @@ 
 date_default_timezone_set('UTC');
 // signal handler - playing nice with sockets and dump1090
 pcntl_signal(SIGINT,  function($signo) {
-    global $sock;
-    echo "\n\nctrl-c or kill signal received. Tidying up ... ";
-    socket_shutdown($sock, 0);
-    socket_close($sock);
-    die("Bye!\n");
+	global $sock;
+	echo "\n\nctrl-c or kill signal received. Tidying up ... ";
+	socket_shutdown($sock, 0);
+	socket_close($sock);
+	die("Bye!\n");
 });
 pcntl_signal_dispatch();
 
@@ -38,24 +38,24 @@ 
 // Bind the source address
 if( !socket_bind($sock, $globalACARSHost , $globalACARSPort) )
 {
-    $errorcode = socket_last_error();
-    $errormsg = socket_strerror($errorcode);
+	$errorcode = socket_last_error();
+	$errormsg = socket_strerror($errorcode);
      
-    die("Could not bind socket : [$errorcode] $errormsg \n");
+	die("Could not bind socket : [$errorcode] $errormsg \n");
 }
 
 echo "LISTEN UDP MODE \n\n";
 while(1) {
-    $r = socket_recvfrom($sock, $buffer, 512, 0, $remote_ip, $remote_port);
-
-    // lets play nice and handle signals such as ctrl-c/kill properly
-    pcntl_signal_dispatch();
-    $dataFound = false;
-    //  (null) 2 23/02/2015 14:46:06 0 -16 X .D-AIPW ! 1L 7 M82A LH077P 010952342854:VP-MIBI+W+0)-V+(),GB1
-    echo $buffer."\n";
-    $ACARS->add(trim($buffer));
-    socket_sendto($sock, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
-    $ACARS->deleteLiveAcarsData();
+	$r = socket_recvfrom($sock, $buffer, 512, 0, $remote_ip, $remote_port);
+
+	// lets play nice and handle signals such as ctrl-c/kill properly
+	pcntl_signal_dispatch();
+	$dataFound = false;
+	//  (null) 2 23/02/2015 14:46:06 0 -16 X .D-AIPW ! 1L 7 M82A LH077P 010952342854:VP-MIBI+W+0)-V+(),GB1
+	echo $buffer."\n";
+	$ACARS->add(trim($buffer));
+	socket_sendto($sock, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+	$ACARS->deleteLiveAcarsData();
 }
 pcntl_exec($_,$argv);
 ?>

ident-statistics-registration.php

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['ident'])) {
-        header('Location: '.$globalURL.'/ident');
-        die();
+		header('Location: '.$globalURL.'/ident');
+		die();
 }
 $Spotter = new Spotter();
 $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);

sitemap.php

Indentation +107 added lines, -107 removed lines

@@ -15,9 +15,9 @@ 
 		foreach($spotter_array as $spotter_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>weekly</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>weekly</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -32,9 +32,9 @@ 
 		foreach($aircraft_types as $aircraft_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.$aircraft_item['aircraft_icao'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.$aircraft_item['aircraft_icao'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -49,9 +49,9 @@ 
 		foreach($aircraft_registrations as $aircraft_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.$aircraft_item['registration'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.$aircraft_item['registration'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -65,9 +65,9 @@ 
 		foreach($airline_names as $airline_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.$airline_item['airline_icao'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.$airline_item['airline_icao'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -81,9 +81,9 @@ 
 		foreach($airport_names as $airport_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -97,9 +97,9 @@ 
 		foreach($manufacturer_names as $manufacturer_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer'])).'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer'])).'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -113,9 +113,9 @@ 
 		foreach($country_names as $country_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.strtolower(str_replace(" ", "-", $country_item['country'])).'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.strtolower(str_replace(" ", "-", $country_item['country'])).'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -130,9 +130,9 @@ 
 		{
 			if (ctype_alnum($ident_item['ident'])) {
 				$output .= '<url>';
-				    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/ident/'.$ident_item['ident'].'</loc>';
-				    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-				    $output .= '<changefreq>daily</changefreq>';
+					$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/ident/'.$ident_item['ident'].'</loc>';
+					$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+					$output .= '<changefreq>daily</changefreq>';
 				$output .= '</url>';
 			}
 		}
@@ -147,9 +147,9 @@ 
 		foreach($date_names as $date_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -163,9 +163,9 @@ 
 		foreach($route_names as $route_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -177,117 +177,117 @@ 
 		
 		/* STATIC PAGES */
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/latest</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/latest</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/highlights</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/highlights</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/search</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/search</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/about</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>weekly</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/about</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>weekly</changefreq>';
 		$output .= '</url>';
 		
 		
 		/* STATISTIC PAGES */
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/aircraft</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/aircraft</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/registration</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/registration</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/manufacturer</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/manufacturer</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline-country</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline-country</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure-country</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure-country</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival-country</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival-country</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-airport</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-airport</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-waypoint</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-waypoint</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/callsign</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/callsign</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/date</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/date</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/time</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/time</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 	$output .= '</urlset>';
 	
@@ -297,37 +297,37 @@ 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/static</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/static</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/flight</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/flight</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/aircraft</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/aircraft</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/registration</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/registration</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airline</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airline</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airport</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airport</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/manufacturer</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/manufacturer</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/country</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/country</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/ident</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/ident</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/date</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/date</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/route</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/route</loc>';
 		$output .= '</sitemap>';
 	$output .= '</sitemapindex>';
 	

require/libs/Predict/Predict.php

Indentation +791 added lines, -791 removed lines

@@ -52,824 +52,824 @@
  */
 class Predict
 {
-    const de2ra    =  1.74532925E-2;   /* Degrees to Radians */
-    const pi       =  3.1415926535898; /* Pi */
-    const pio2     =  1.5707963267949; /* Pi/2 */
-    const x3pio2   =  4.71238898;      /* 3*Pi/2 */
-    const twopi    =  6.2831853071796; /* 2*Pi  */
-    const e6a      =  1.0E-6;
-    const tothrd   =  6.6666667E-1;    /* 2/3 */
-    const xj2      =  1.0826158E-3;    /* J2 Harmonic */
-    const xj3      = -2.53881E-6;      /* J3 Harmonic */
-    const xj4      = -1.65597E-6;      /* J4 Harmonic */
-    const xke      =  7.43669161E-2;
-    const xkmper   =  6.378135E3;      /* Earth radius km */
-    const xmnpda   =  1.44E3;          /* Minutes per day */
-    const km2mi    =  0.621371;        /* Kilometers per Mile */
-    const ae       =  1.0;
-    const ck2      =  5.413079E-4;
-    const ck4      =  6.209887E-7;
-    const __f      =  3.352779E-3;
-    const ge       =  3.986008E5;
-    const __s__    =  1.012229;
-    const qoms2t   =  1.880279E-09;
-    const secday   =  8.6400E4;        /* Seconds per day */
-    const omega_E  =  1.0027379;
-    const omega_ER =  6.3003879;
-    const zns      =  1.19459E-5;
-    const c1ss     =  2.9864797E-6;
-    const zes      =  1.675E-2;
-    const znl      =  1.5835218E-4;
-    const c1l      =  4.7968065E-7;
-    const zel      =  5.490E-2;
-    const zcosis   =  9.1744867E-1;
-    const zsinis   =  3.9785416E-1;
-    const zsings   = -9.8088458E-1;
-    const zcosgs   =  1.945905E-1;
-    const zcoshs   =  1;
-    const zsinhs   =  0;
-    const q22      =  1.7891679E-6;
-    const q31      =  2.1460748E-6;
-    const q33      =  2.2123015E-7;
-    const g22      =  5.7686396;
-    const g32      =  9.5240898E-1;
-    const g44      =  1.8014998;
-    const g52      =  1.0508330;
-    const g54      =  4.4108898;
-    const root22   =  1.7891679E-6;
-    const root32   =  3.7393792E-7;
-    const root44   =  7.3636953E-9;
-    const root52   =  1.1428639E-7;
-    const root54   =  2.1765803E-9;
-    const thdt     =  4.3752691E-3;
-    const rho      =  1.5696615E-1;
-    const mfactor  =  7.292115E-5;
-    const __sr__   =  6.96000E5;      /*Solar radius - kilometers (IAU 76)*/
-    const AU       =  1.49597870E8;   /*Astronomical unit - kilometers (IAU 76)*/
-
-    /* visibility constants */
-    const SAT_VIS_NONE     = 0;
-    const SAT_VIS_VISIBLE  = 1;
-    const SAT_VIS_DAYLIGHT = 2;
-    const SAT_VIS_ECLIPSED = 3;
-
-    /* preferences */
-    public $minEle     = 10; // Minimum elevation
-    public $timeRes    = 10; // Pass details: time resolution
-    public $numEntries = 20; // Pass details: number of entries
-    public $threshold  = -6; // Twilight threshold
-
-    /**
-     *  Predict the next pass.
-     *
-     * This function simply wraps the get_pass function using the current time
-     * as parameter.
-     *
-     * Note: the data in sat will be corrupt (future) and must be refreshed
-     *       by the caller, if the caller will need it later on (eg. if the caller
-     *       is GtkSatList).
-     *
-     * @param Predict_Sat $sat   The satellite data.
-     * @param Predict_QTH $qth   The observer data.
-     * @param int         $maxdt The maximum number of days to look ahead.
-     *
-     * @return Predict_Pass Pointer instance or NULL if no pass can be
-     *         found.
-     */
-    public function get_next_pass(Predict_Sat $sat, Predict_QTH $qth, $maxdt)
-    {
-        /* get the current time and call the get_pass function */
-        $now = Predict_Time::get_current_daynum();
-
-        return $this->get_pass($sat, $qth, $now, $maxdt);
-    }
-
-    /** Predict first pass after a certain time.
-     *
-     *  @param Predict_Sat $sat   The satellite data.
-     *  @param Predict_QTH $qth   The observer's location data.
-     *  @param float       $start Starting time.
-     *  @param int         $maxdt The maximum number of days to look ahead (0 for no limit).
-     *
-     *  @return Predict_Pass or NULL if there was an error.
-     *
-     * This function will find the first upcoming pass with AOS no earlier than
-     * t = start and no later than t = (start+maxdt).
-     *
-     *  note For no time limit use maxdt = 0.0
-     *
-     *  note the data in sat will be corrupt (future) and must be refreshed
-     *       by the caller, if the caller will need it later on
-     */
-    public function get_pass(Predict_Sat $sat_in, Predict_QTH $qth, $start, $maxdt)
-    {
-        $aos = 0.0;    /* time of AOS */
-        $tca = 0.0;    /* time of TCA */
-        $los = 0.0;    /* time of LOS */
-        $dt = 0.0;     /* time diff */
-        $step = 0.0;   /* time step */
-        $t0 = $start;
-        $tres = 0.0;   /* required time resolution */
-        $max_el = 0.0; /* maximum elevation */
-        $pass = null;
-        $detail = null;
-        $done = false;
-        $iter = 0;      /* number of iterations */
-        /* FIXME: watchdog */
-
-        /*copy sat_in to a working structure*/
-        $sat         = clone $sat_in;
-        $sat_working = clone $sat_in;
-
-        /* get time resolution; sat-cfg stores it in seconds */
-        $tres = $this->timeRes / 86400.0;
-
-        /* loop until we find a pass with elevation > SAT_CFG_INT_PRED_MIN_EL
+	const de2ra    =  1.74532925E-2;   /* Degrees to Radians */
+	const pi       =  3.1415926535898; /* Pi */
+	const pio2     =  1.5707963267949; /* Pi/2 */
+	const x3pio2   =  4.71238898;      /* 3*Pi/2 */
+	const twopi    =  6.2831853071796; /* 2*Pi  */
+	const e6a      =  1.0E-6;
+	const tothrd   =  6.6666667E-1;    /* 2/3 */
+	const xj2      =  1.0826158E-3;    /* J2 Harmonic */
+	const xj3      = -2.53881E-6;      /* J3 Harmonic */
+	const xj4      = -1.65597E-6;      /* J4 Harmonic */
+	const xke      =  7.43669161E-2;
+	const xkmper   =  6.378135E3;      /* Earth radius km */
+	const xmnpda   =  1.44E3;          /* Minutes per day */
+	const km2mi    =  0.621371;        /* Kilometers per Mile */
+	const ae       =  1.0;
+	const ck2      =  5.413079E-4;
+	const ck4      =  6.209887E-7;
+	const __f      =  3.352779E-3;
+	const ge       =  3.986008E5;
+	const __s__    =  1.012229;
+	const qoms2t   =  1.880279E-09;
+	const secday   =  8.6400E4;        /* Seconds per day */
+	const omega_E  =  1.0027379;
+	const omega_ER =  6.3003879;
+	const zns      =  1.19459E-5;
+	const c1ss     =  2.9864797E-6;
+	const zes      =  1.675E-2;
+	const znl      =  1.5835218E-4;
+	const c1l      =  4.7968065E-7;
+	const zel      =  5.490E-2;
+	const zcosis   =  9.1744867E-1;
+	const zsinis   =  3.9785416E-1;
+	const zsings   = -9.8088458E-1;
+	const zcosgs   =  1.945905E-1;
+	const zcoshs   =  1;
+	const zsinhs   =  0;
+	const q22      =  1.7891679E-6;
+	const q31      =  2.1460748E-6;
+	const q33      =  2.2123015E-7;
+	const g22      =  5.7686396;
+	const g32      =  9.5240898E-1;
+	const g44      =  1.8014998;
+	const g52      =  1.0508330;
+	const g54      =  4.4108898;
+	const root22   =  1.7891679E-6;
+	const root32   =  3.7393792E-7;
+	const root44   =  7.3636953E-9;
+	const root52   =  1.1428639E-7;
+	const root54   =  2.1765803E-9;
+	const thdt     =  4.3752691E-3;
+	const rho      =  1.5696615E-1;
+	const mfactor  =  7.292115E-5;
+	const __sr__   =  6.96000E5;      /*Solar radius - kilometers (IAU 76)*/
+	const AU       =  1.49597870E8;   /*Astronomical unit - kilometers (IAU 76)*/
+
+	/* visibility constants */
+	const SAT_VIS_NONE     = 0;
+	const SAT_VIS_VISIBLE  = 1;
+	const SAT_VIS_DAYLIGHT = 2;
+	const SAT_VIS_ECLIPSED = 3;
+
+	/* preferences */
+	public $minEle     = 10; // Minimum elevation
+	public $timeRes    = 10; // Pass details: time resolution
+	public $numEntries = 20; // Pass details: number of entries
+	public $threshold  = -6; // Twilight threshold
+
+	/**
+	 *  Predict the next pass.
+	 *
+	 * This function simply wraps the get_pass function using the current time
+	 * as parameter.
+	 *
+	 * Note: the data in sat will be corrupt (future) and must be refreshed
+	 *       by the caller, if the caller will need it later on (eg. if the caller
+	 *       is GtkSatList).
+	 *
+	 * @param Predict_Sat $sat   The satellite data.
+	 * @param Predict_QTH $qth   The observer data.
+	 * @param int         $maxdt The maximum number of days to look ahead.
+	 *
+	 * @return Predict_Pass Pointer instance or NULL if no pass can be
+	 *         found.
+	 */
+	public function get_next_pass(Predict_Sat $sat, Predict_QTH $qth, $maxdt)
+	{
+		/* get the current time and call the get_pass function */
+		$now = Predict_Time::get_current_daynum();
+
+		return $this->get_pass($sat, $qth, $now, $maxdt);
+	}
+
+	/** Predict first pass after a certain time.
+	 *
+	 *  @param Predict_Sat $sat   The satellite data.
+	 *  @param Predict_QTH $qth   The observer's location data.
+	 *  @param float       $start Starting time.
+	 *  @param int         $maxdt The maximum number of days to look ahead (0 for no limit).
+	 *
+	 *  @return Predict_Pass or NULL if there was an error.
+	 *
+	 * This function will find the first upcoming pass with AOS no earlier than
+	 * t = start and no later than t = (start+maxdt).
+	 *
+	 *  note For no time limit use maxdt = 0.0
+	 *
+	 *  note the data in sat will be corrupt (future) and must be refreshed
+	 *       by the caller, if the caller will need it later on
+	 */
+	public function get_pass(Predict_Sat $sat_in, Predict_QTH $qth, $start, $maxdt)
+	{
+		$aos = 0.0;    /* time of AOS */
+		$tca = 0.0;    /* time of TCA */
+		$los = 0.0;    /* time of LOS */
+		$dt = 0.0;     /* time diff */
+		$step = 0.0;   /* time step */
+		$t0 = $start;
+		$tres = 0.0;   /* required time resolution */
+		$max_el = 0.0; /* maximum elevation */
+		$pass = null;
+		$detail = null;
+		$done = false;
+		$iter = 0;      /* number of iterations */
+		/* FIXME: watchdog */
+
+		/*copy sat_in to a working structure*/
+		$sat         = clone $sat_in;
+		$sat_working = clone $sat_in;
+
+		/* get time resolution; sat-cfg stores it in seconds */
+		$tres = $this->timeRes / 86400.0;
+
+		/* loop until we find a pass with elevation > SAT_CFG_INT_PRED_MIN_EL
             or we run out of time
             FIXME: we should have a safety break
         */
-        while (!$done) {
-            /* Find los of next pass or of current pass */
-            $los = $this->find_los($sat, $qth, $t0, $maxdt); // See if a pass is ongoing
-            $aos = $this->find_aos($sat, $qth, $t0, $maxdt);
-            /* sat_log_log(SAT_LOG_LEVEL_MSG, "%s:%s:%d: found aos %f and los %f for t0=%f", */
-            /*          __FILE__,  */
-            /*          __FUNCTION__, */
-            /*          __LINE__, */
-            /*          aos, */
-            /*          los,  */
-            /*          t0); */
-            if ($aos > $los) {
-                // los is from an currently happening pass, find previous aos
-                $aos = $this->find_prev_aos($sat, $qth, $t0);
-            }
-
-            /* aos = 0.0 means no aos */
-            if ($aos == 0.0) {
-                $done = true;
-            } else if (($maxdt > 0.0) && ($aos > ($start + $maxdt)) ) {
-                /* check whether we are within time limits;
+		while (!$done) {
+			/* Find los of next pass or of current pass */
+			$los = $this->find_los($sat, $qth, $t0, $maxdt); // See if a pass is ongoing
+			$aos = $this->find_aos($sat, $qth, $t0, $maxdt);
+			/* sat_log_log(SAT_LOG_LEVEL_MSG, "%s:%s:%d: found aos %f and los %f for t0=%f", */
+			/*          __FILE__,  */
+			/*          __FUNCTION__, */
+			/*          __LINE__, */
+			/*          aos, */
+			/*          los,  */
+			/*          t0); */
+			if ($aos > $los) {
+				// los is from an currently happening pass, find previous aos
+				$aos = $this->find_prev_aos($sat, $qth, $t0);
+			}
+
+			/* aos = 0.0 means no aos */
+			if ($aos == 0.0) {
+				$done = true;
+			} else if (($maxdt > 0.0) && ($aos > ($start + $maxdt)) ) {
+				/* check whether we are within time limits;
                     maxdt = 0 mean no time limit.
                 */
-                $done = true;
-            } else {
-                //los = find_los (sat, qth, aos + 0.001, maxdt); // +1.5 min later
-                $dt = $los - $aos;
+				$done = true;
+			} else {
+				//los = find_los (sat, qth, aos + 0.001, maxdt); // +1.5 min later
+				$dt = $los - $aos;
 
-                /* get time step, which will give us the max number of entries */
-                $step = $dt / $this->numEntries;
+				/* get time step, which will give us the max number of entries */
+				$step = $dt / $this->numEntries;
 
-                /* but if this is smaller than the required resolution
+				/* but if this is smaller than the required resolution
                     we go with the resolution
                 */
-                if ($step < $tres) {
-                    $step = $tres;
-                }
-
-                /* create a pass_t entry; FIXME: g_try_new in 2.8 */
-                $pass = new Predict_Pass();
-
-                $pass->aos      = $aos;
-                $pass->los      = $los;
-                $pass->max_el   = 0.0;
-                $pass->aos_az   = 0.0;
-                $pass->los_az   = 0.0;
-                $pass->maxel_az = 0.0;
-                $pass->vis      = '---';
-                $pass->satname  = $sat->nickname;
-                $pass->details  = array();
-
-                /* iterate over each time step */
-                for ($t = $pass->aos; $t <= $pass->los; $t += $step) {
-
-                    /* calculate satellite data */
-                    $this->predict_calc($sat, $qth, $t);
-
-                    /* in the first iter we want to store
+				if ($step < $tres) {
+					$step = $tres;
+				}
+
+				/* create a pass_t entry; FIXME: g_try_new in 2.8 */
+				$pass = new Predict_Pass();
+
+				$pass->aos      = $aos;
+				$pass->los      = $los;
+				$pass->max_el   = 0.0;
+				$pass->aos_az   = 0.0;
+				$pass->los_az   = 0.0;
+				$pass->maxel_az = 0.0;
+				$pass->vis      = '---';
+				$pass->satname  = $sat->nickname;
+				$pass->details  = array();
+
+				/* iterate over each time step */
+				for ($t = $pass->aos; $t <= $pass->los; $t += $step) {
+
+					/* calculate satellite data */
+					$this->predict_calc($sat, $qth, $t);
+
+					/* in the first iter we want to store
                         pass->aos_az
                     */
-                    if ($t == $pass->aos) {
-                        $pass->aos_az = $sat->az;
-                        $pass->orbit  = $sat->orbit;
-                    }
-
-                    /* append details to sat->details */
-                    $detail             = new Predict_PassDetail();
-                    $detail->time       = $t;
-                    $detail->pos->x     = $sat->pos->x;
-                    $detail->pos->y     = $sat->pos->y;
-                    $detail->pos->z     = $sat->pos->z;
-                    $detail->pos->w     = $sat->pos->w;
-                    $detail->vel->x     = $sat->vel->x;
-                    $detail->vel->y     = $sat->vel->y;
-                    $detail->vel->z     = $sat->vel->z;
-                    $detail->vel->w     = $sat->vel->w;
-                    $detail->velo       = $sat->velo;
-                    $detail->az         = $sat->az;
-                    $detail->el         = $sat->el;
-                    $detail->range      = $sat->range;
-                    $detail->range_rate = $sat->range_rate;
-                    $detail->lat        = $sat->ssplat;
-                    $detail->lon        = $sat->ssplon;
-                    $detail->alt        = $sat->alt;
-                    $detail->ma         = $sat->ma;
-                    $detail->phase      = $sat->phase;
-                    $detail->footprint  = $sat->footprint;
-                    $detail->orbit      = $sat->orbit;
-                    $detail->vis        = $this->get_sat_vis($sat, $qth, $t);
-
-                    /* also store visibility "bit" */
-                    switch ($detail->vis) {
-                        case self::SAT_VIS_VISIBLE:
-                            $pass->vis[0] = 'V';
-                            break;
-                        case self::SAT_VIS_DAYLIGHT:
-                            $pass->vis[1] = 'D';
-                            break;
-                        case self::SAT_VIS_ECLIPSED:
-                            $pass->vis[2] = 'E';
-                            break;
-                        default:
-                            break;
-                    }
-
-                    // Using an array, no need to prepend and reverse the list
-                    // as gpredict does
-                    $pass->details[] = $detail;
-
-                    // Look up apparent magnitude if this is a visible pass
-                    if ($detail->vis === self::SAT_VIS_VISIBLE) {
-                        $apmag = $sat->calculateApparentMagnitude($t, $qth);
-                        if ($pass->max_apparent_magnitude === null || $apmag < $pass->max_apparent_magnitude) {
-                            $pass->max_apparent_magnitude = $apmag;
-                        }
-                    }
-
-                    /* store elevation if greater than the
+					if ($t == $pass->aos) {
+						$pass->aos_az = $sat->az;
+						$pass->orbit  = $sat->orbit;
+					}
+
+					/* append details to sat->details */
+					$detail             = new Predict_PassDetail();
+					$detail->time       = $t;
+					$detail->pos->x     = $sat->pos->x;
+					$detail->pos->y     = $sat->pos->y;
+					$detail->pos->z     = $sat->pos->z;
+					$detail->pos->w     = $sat->pos->w;
+					$detail->vel->x     = $sat->vel->x;
+					$detail->vel->y     = $sat->vel->y;
+					$detail->vel->z     = $sat->vel->z;
+					$detail->vel->w     = $sat->vel->w;
+					$detail->velo       = $sat->velo;
+					$detail->az         = $sat->az;
+					$detail->el         = $sat->el;
+					$detail->range      = $sat->range;
+					$detail->range_rate = $sat->range_rate;
+					$detail->lat        = $sat->ssplat;
+					$detail->lon        = $sat->ssplon;
+					$detail->alt        = $sat->alt;
+					$detail->ma         = $sat->ma;
+					$detail->phase      = $sat->phase;
+					$detail->footprint  = $sat->footprint;
+					$detail->orbit      = $sat->orbit;
+					$detail->vis        = $this->get_sat_vis($sat, $qth, $t);
+
+					/* also store visibility "bit" */
+					switch ($detail->vis) {
+						case self::SAT_VIS_VISIBLE:
+							$pass->vis[0] = 'V';
+							break;
+						case self::SAT_VIS_DAYLIGHT:
+							$pass->vis[1] = 'D';
+							break;
+						case self::SAT_VIS_ECLIPSED:
+							$pass->vis[2] = 'E';
+							break;
+						default:
+							break;
+					}
+
+					// Using an array, no need to prepend and reverse the list
+					// as gpredict does
+					$pass->details[] = $detail;
+
+					// Look up apparent magnitude if this is a visible pass
+					if ($detail->vis === self::SAT_VIS_VISIBLE) {
+						$apmag = $sat->calculateApparentMagnitude($t, $qth);
+						if ($pass->max_apparent_magnitude === null || $apmag < $pass->max_apparent_magnitude) {
+							$pass->max_apparent_magnitude = $apmag;
+						}
+					}
+
+					/* store elevation if greater than the
                         previously stored one
                     */
-                    if ($sat->el > $max_el) {
-                        $max_el         = $sat->el;
-                        $tca            = $t;
-                        $pass->maxel_az = $sat->az;
-                    }
-
-                    /*     g_print ("TIME: %f\tAZ: %f\tEL: %f (MAX: %f)\n", */
-                    /*           t, sat->az, sat->el, max_el); */
-                }
-
-                /* calculate satellite data */
-                $this->predict_calc($sat, $qth, $pass->los);
-                /* store los_az, max_el and tca */
-                $pass->los_az = $sat->az;
-                $pass->max_el = $max_el;
-                $pass->tca    = $tca;
-
-                /* check whether this pass is good */
-                if ($max_el >= $this->minEle) {
-                    $done = true;
-                } else {
-                    $done = false;
-                    $t0 = $los + 0.014; // +20 min
-                    $pass = null;
-                }
-
-                $iter++;
-            }
-        }
-
-        return $pass;
-    }
-
-    /**
-     * Calculate satellite visibility.
-     *
-     * @param Predict_Sat $sat     The satellite structure.
-     * @param Predict_QTH $qth     The QTH
-     * @param float       $jul_utc The time at which the visibility should be calculated.
-     *
-     * @return int The visiblity constant, 0, 1, 2, or 3 (see above)
-     */
-    public function get_sat_vis(Predict_Sat $sat, Predict_QTH $qth, $jul_utc)
-    {
-        /* gboolean sat_sun_status;
+					if ($sat->el > $max_el) {
+						$max_el         = $sat->el;
+						$tca            = $t;
+						$pass->maxel_az = $sat->az;
+					}
+
+					/*     g_print ("TIME: %f\tAZ: %f\tEL: %f (MAX: %f)\n", */
+					/*           t, sat->az, sat->el, max_el); */
+				}
+
+				/* calculate satellite data */
+				$this->predict_calc($sat, $qth, $pass->los);
+				/* store los_az, max_el and tca */
+				$pass->los_az = $sat->az;
+				$pass->max_el = $max_el;
+				$pass->tca    = $tca;
+
+				/* check whether this pass is good */
+				if ($max_el >= $this->minEle) {
+					$done = true;
+				} else {
+					$done = false;
+					$t0 = $los + 0.014; // +20 min
+					$pass = null;
+				}
+
+				$iter++;
+			}
+		}
+
+		return $pass;
+	}
+
+	/**
+	 * Calculate satellite visibility.
+	 *
+	 * @param Predict_Sat $sat     The satellite structure.
+	 * @param Predict_QTH $qth     The QTH
+	 * @param float       $jul_utc The time at which the visibility should be calculated.
+	 *
+	 * @return int The visiblity constant, 0, 1, 2, or 3 (see above)
+	 */
+	public function get_sat_vis(Predict_Sat $sat, Predict_QTH $qth, $jul_utc)
+	{
+		/* gboolean sat_sun_status;
         gdouble  sun_el;
         gdouble  threshold;
         gdouble  eclipse_depth;
         sat_vis_t vis = SAT_VIS_NONE; */
 
-        $eclipse_depth  = 0.0;
-        $zero_vector    = new Predict_Vector();
-        $obs_geodetic   = new Predict_Geodetic();
-
-        /* Solar ECI position vector  */
-        $solar_vector = new Predict_Vector();
-
-        /* Solar observed az and el vector  */
-        $solar_set = new Predict_ObsSet();
-
-        /* FIXME: could be passed as parameter */
-        $obs_geodetic->lon   = $qth->lon * self::de2ra;
-        $obs_geodetic->lat   = $qth->lat * self::de2ra;
-        $obs_geodetic->alt   = $qth->alt / 1000.0;
-        $obs_geodetic->theta = 0;
-
-        Predict_Solar::Calculate_Solar_Position($jul_utc, $solar_vector);
-        Predict_SGPObs::Calculate_Obs($jul_utc, $solar_vector, $zero_vector, $obs_geodetic, $solar_set);
-
-        if (Predict_Solar::Sat_Eclipsed($sat->pos, $solar_vector, $eclipse_depth)) {
-            /* satellite is eclipsed */
-            $sat_sun_status = false;
-        } else {
-            /* satellite in sunlight => may be visible */
-            $sat_sun_status = true;
-        }
-
-        if ($sat_sun_status) {
-            $sun_el = Predict_Math::Degrees($solar_set->el);
-
-            if ($sun_el <= $this->threshold && $sat->el >= 0.0) {
-                $vis = self::SAT_VIS_VISIBLE;
-            } else {
-                $vis = self::SAT_VIS_DAYLIGHT;
-            }
-        } else {
-            $vis = self::SAT_VIS_ECLIPSED;
-        }
-
-        return $vis;
-    }
-
-    /** Find the AOS time of the next pass.
-     *  @author Alexandru Csete, OZ9AEC
-     *  @author John A. Magliacane, KD2BD
-     *  @param Predict_Sat $sat   The satellite data.
-     *  @param Predict_QTH $qth   The observer's location (QTH) data.
-     *  @param float       $start The julian date where calculation should start.
-     *  @param int         $maxdt The upper time limit in days (0.0 = no limit)
-     *  @return The julain date of the next AOS or 0.0 if the satellite has no AOS.
-     *
-     * This function finds the time of AOS for the first coming pass taking place
-     * no earlier that start.
-     * If the satellite is currently within range, the function first calls
-     * find_los to get the next LOS time. Then the calculations are done using
-     * the new start time.
-     *
-     */
-    public function find_aos(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt)
-    {
-        $t = $start;
-        $aostime = 0.0;
-
-
-        /* make sure current sat values are
+		$eclipse_depth  = 0.0;
+		$zero_vector    = new Predict_Vector();
+		$obs_geodetic   = new Predict_Geodetic();
+
+		/* Solar ECI position vector  */
+		$solar_vector = new Predict_Vector();
+
+		/* Solar observed az and el vector  */
+		$solar_set = new Predict_ObsSet();
+
+		/* FIXME: could be passed as parameter */
+		$obs_geodetic->lon   = $qth->lon * self::de2ra;
+		$obs_geodetic->lat   = $qth->lat * self::de2ra;
+		$obs_geodetic->alt   = $qth->alt / 1000.0;
+		$obs_geodetic->theta = 0;
+
+		Predict_Solar::Calculate_Solar_Position($jul_utc, $solar_vector);
+		Predict_SGPObs::Calculate_Obs($jul_utc, $solar_vector, $zero_vector, $obs_geodetic, $solar_set);
+
+		if (Predict_Solar::Sat_Eclipsed($sat->pos, $solar_vector, $eclipse_depth)) {
+			/* satellite is eclipsed */
+			$sat_sun_status = false;
+		} else {
+			/* satellite in sunlight => may be visible */
+			$sat_sun_status = true;
+		}
+
+		if ($sat_sun_status) {
+			$sun_el = Predict_Math::Degrees($solar_set->el);
+
+			if ($sun_el <= $this->threshold && $sat->el >= 0.0) {
+				$vis = self::SAT_VIS_VISIBLE;
+			} else {
+				$vis = self::SAT_VIS_DAYLIGHT;
+			}
+		} else {
+			$vis = self::SAT_VIS_ECLIPSED;
+		}
+
+		return $vis;
+	}
+
+	/** Find the AOS time of the next pass.
+	 *  @author Alexandru Csete, OZ9AEC
+	 *  @author John A. Magliacane, KD2BD
+	 *  @param Predict_Sat $sat   The satellite data.
+	 *  @param Predict_QTH $qth   The observer's location (QTH) data.
+	 *  @param float       $start The julian date where calculation should start.
+	 *  @param int         $maxdt The upper time limit in days (0.0 = no limit)
+	 *  @return The julain date of the next AOS or 0.0 if the satellite has no AOS.
+	 *
+	 * This function finds the time of AOS for the first coming pass taking place
+	 * no earlier that start.
+	 * If the satellite is currently within range, the function first calls
+	 * find_los to get the next LOS time. Then the calculations are done using
+	 * the new start time.
+	 *
+	 */
+	public function find_aos(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt)
+	{
+		$t = $start;
+		$aostime = 0.0;
+
+
+		/* make sure current sat values are
             in sync with the time
         */
-        $this->predict_calc($sat, $qth, $start);
-
-        /* check whether satellite has aos */
-        if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
-            ($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
-            !$this->has_aos($sat, $qth)) {
-
-            return 0.0;
-        }
-
-        if ($sat->el > 0.0) {
-            $t = $this->find_los($sat, $qth, $start, $maxdt) + 0.014; // +20 min
-        }
-
-        /* invalid time (potentially returned by find_los) */
-        if ($t < 0.1) {
-            return 0.0;
-        }
-
-        /* update satellite data */
-        $this->predict_calc($sat, $qth, $t);
-
-        /* use upper time limit */
-        if ($maxdt > 0.0) {
-
-            /* coarse time steps */
-            while (($sat->el < -1.0) && ($t <= ($start + $maxdt))) {
-                $t -= 0.00035 * ($sat->el * (($sat->alt / 8400.0) + 0.46) - 2.0);
-                $this->predict_calc($sat, $qth, $t);
-            }
-
-            /* fine steps */
-            while (($aostime == 0.0) && ($t <= ($start + $maxdt))) {
-
-                if (abs($sat->el) < 0.005) {
-                    $aostime = $t;
-                } else {
-                    $t -= $sat->el * sqrt($sat->alt) / 530000.0;
-                    $this->predict_calc($sat, $qth, $t);
-                }
-            }
-        } else {
-            /* don't use upper time limit */
-
-            /* coarse time steps */
-            while ($sat->el < -1.0) {
-
-                $t -= 0.00035 * ($sat->el * (($sat->alt / 8400.0) + 0.46) - 2.0);
-                $this->predict_calc($sat, $qth, $t);
-            }
-
-            /* fine steps */
-            while ($aostime == 0.0) {
-
-                if (abs($sat->el) < 0.005) {
-                    $aostime = $t;
-                } else {
-                    $t -= $sat->el * sqrt($sat->alt) / 530000.0;
-                    $this->predict_calc($sat, $qth, $t);
-                }
-
-            }
-        }
-
-        return $aostime;
-    }
-
-    /** SGP4SDP4 driver for doing AOS/LOS calculations.
-     *  @param Predict_Sat $sat The satellite data.
-     *  @param Predict_QTH $qth The QTH observer location data.
-     *  @param float       $t   The time for calculation (Julian Date)
-     *
-     */
-    public function predict_calc(Predict_Sat $sat, Predict_QTH $qth, $t)
-    {
-        $obs_set      = new Predict_ObsSet();
-        $sat_geodetic = new Predict_Geodetic();
-        $obs_geodetic = new Predict_Geodetic();
-
-        $obs_geodetic->lon   = $qth->lon * self::de2ra;
-        $obs_geodetic->lat   = $qth->lat * self::de2ra;
-        $obs_geodetic->alt   = $qth->alt / 1000.0;
-        $obs_geodetic->theta = 0;
-
-        $sat->jul_utc = $t;
-        $sat->tsince = ($sat->jul_utc - $sat->jul_epoch) * self::xmnpda;
-
-        /* call the norad routines according to the deep-space flag */
-        $sgpsdp = Predict_SGPSDP::getInstance($sat);
-        if ($sat->flags & Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
-            $sgpsdp->SDP4($sat, $sat->tsince);
-        } else {
-            $sgpsdp->SGP4($sat, $sat->tsince);
-        }
-
-        Predict_Math::Convert_Sat_State($sat->pos, $sat->vel);
-
-        /* get the velocity of the satellite */
-        $sat->vel->w = sqrt($sat->vel->x * $sat->vel->x + $sat->vel->y * $sat->vel->y + $sat->vel->z * $sat->vel->z);
-        $sat->velo = $sat->vel->w;
-        Predict_SGPObs::Calculate_Obs($sat->jul_utc, $sat->pos, $sat->vel, $obs_geodetic, $obs_set);
-        Predict_SGPObs::Calculate_LatLonAlt($sat->jul_utc, $sat->pos, $sat_geodetic);
-
-        while ($sat_geodetic->lon < -self::pi) {
-            $sat_geodetic->lon += self::twopi;
-        }
-
-        while ($sat_geodetic->lon > (self::pi)) {
-            $sat_geodetic->lon -= self::twopi;
-        }
-
-        $sat->az = Predict_Math::Degrees($obs_set->az);
-        $sat->el = Predict_Math::Degrees($obs_set->el);
-        $sat->range = $obs_set->range;
-        $sat->range_rate = $obs_set->range_rate;
-        $sat->ssplat = Predict_Math::Degrees($sat_geodetic->lat);
-        $sat->ssplon = Predict_Math::Degrees($sat_geodetic->lon);
-        $sat->alt = $sat_geodetic->alt;
-        $sat->ma = Predict_Math::Degrees($sat->phase);
-        $sat->ma *= 256.0 / 360.0;
-        $sat->phase = Predict_Math::Degrees($sat->phase);
-
-        /* same formulas, but the one from predict is nicer */
-        //sat->footprint = 2.0 * xkmper * acos (xkmper/sat->pos.w);
-        $sat->footprint = 12756.33 * acos(self::xkmper / (self::xkmper + $sat->alt));
-        $age = $sat->jul_utc - $sat->jul_epoch;
-        $sat->orbit = floor(($sat->tle->xno * self::xmnpda / self::twopi +
-                        $age * $sat->tle->bstar * self::ae) * $age +
-                        $sat->tle->xmo / self::twopi) + $sat->tle->revnum - 1;
-    }
-
-    /** Find the LOS time of the next pass.
-     *  @author Alexandru Csete, OZ9AEC
-     *  @author John A. Magliacane, KD2BD
-     *  @param Predict_Sat $sat The satellite data.
-     *  @param Predict_QTH $qth The QTH observer location data.
-     *  @param float       $start The time where calculation should start. (Julian Date)
-     *  @param int         $maxdt The upper time limit in days (0.0 = no limit)
-     *  @return The time (julian date) of the next LOS or 0.0 if the satellite has no LOS.
-     *
-     * This function finds the time of LOS for the first coming pass taking place
-     * no earlier that start.
-     * If the satellite is currently out of range, the function first calls
-     * find_aos to get the next AOS time. Then the calculations are done using
-     * the new start time.
-     * The function has a built-in watchdog to ensure that we don't end up in
-     * lengthy loops.
-     *
-     */
-    public function find_los(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt)
-    {
-        $t = $start;
-        $lostime = 0.0;
-
-
-        $this->predict_calc($sat, $qth, $start);
-
-        /* check whether satellite has aos */
-        if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
-            ($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
-            !$this->has_aos ($sat, $qth)) {
-
-            return 0.0;
-        }
-
-        if ($sat->el < 0.0) {
-            $t = $this->find_aos($sat, $qth, $start, $maxdt) + 0.001; // +1.5 min
-        }
-
-        /* invalid time (potentially returned by find_aos) */
-        if ($t < 0.01) {
-            return 0.0;
-        }
-
-        /* update satellite data */
-        $this->predict_calc($sat, $qth, $t);
-
-        /* use upper time limit */
-        if ($maxdt > 0.0) {
-
-            /* coarse steps */
-            while (($sat->el >= 1.0) && ($t <= ($start + $maxdt))) {
-                $t += cos(($sat->el - 1.0) * self::de2ra) * sqrt($sat->alt) / 25000.0;
-                $this->predict_calc($sat, $qth, $t);
-            }
-
-            /* fine steps */
-            while (($lostime == 0.0) && ($t <= ($start + $maxdt)))  {
-
-                $t += $sat->el * sqrt($sat->alt) / 502500.0;
-                $this->predict_calc($sat, $qth, $t);
-
-                if (abs($sat->el) < 0.005) {
-                    $lostime = $t;
-                }
-            }
-        } else {
-        /* don't use upper limit */
-
-            /* coarse steps */
-            while ($sat->el >= 1.0) {
-                $t += cos(($sat->el - 1.0) * self::de2ra) * sqrt($sat->alt) / 25000.0;
-                $this->predict_calc($sat, $qth, $t);
-            }
-
-            /* fine steps */
-            while ($lostime == 0.0) {
-
-                $t += $sat->el * sqrt($sat->alt) / 502500.0;
-                $this->predict_calc($sat, $qth, $t);
-
-                if (abs($sat->el) < 0.005)
-                    $lostime = $t;
-            }
-        }
-
-        return $lostime;
-    }
-
-    /** Find AOS time of current pass.
-     *  @param Predict_Sat $sat   The satellite to find AOS for.
-     *  @param Predict_QTH $qth   The ground station.
-     *  @param float       $start Start time, prefereably now.
-     *  @return The time of the previous AOS or 0.0 if the satellite has no AOS.
-     *
-     * This function can be used to find the AOS time in the past of the
-     * current pass.
-     */
-    public function find_prev_aos(Predict_Sat $sat, Predict_QTH $qth, $start)
-    {
-        $aostime = $start;
-
-        /* make sure current sat values are
+		$this->predict_calc($sat, $qth, $start);
+
+		/* check whether satellite has aos */
+		if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
+			($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
+			!$this->has_aos($sat, $qth)) {
+
+			return 0.0;
+		}
+
+		if ($sat->el > 0.0) {
+			$t = $this->find_los($sat, $qth, $start, $maxdt) + 0.014; // +20 min
+		}
+
+		/* invalid time (potentially returned by find_los) */
+		if ($t < 0.1) {
+			return 0.0;
+		}
+
+		/* update satellite data */
+		$this->predict_calc($sat, $qth, $t);
+
+		/* use upper time limit */
+		if ($maxdt > 0.0) {
+
+			/* coarse time steps */
+			while (($sat->el < -1.0) && ($t <= ($start + $maxdt))) {
+				$t -= 0.00035 * ($sat->el * (($sat->alt / 8400.0) + 0.46) - 2.0);
+				$this->predict_calc($sat, $qth, $t);
+			}
+
+			/* fine steps */
+			while (($aostime == 0.0) && ($t <= ($start + $maxdt))) {
+
+				if (abs($sat->el) < 0.005) {
+					$aostime = $t;
+				} else {
+					$t -= $sat->el * sqrt($sat->alt) / 530000.0;
+					$this->predict_calc($sat, $qth, $t);
+				}
+			}
+		} else {
+			/* don't use upper time limit */
+
+			/* coarse time steps */
+			while ($sat->el < -1.0) {
+
+				$t -= 0.00035 * ($sat->el * (($sat->alt / 8400.0) + 0.46) - 2.0);
+				$this->predict_calc($sat, $qth, $t);
+			}
+
+			/* fine steps */
+			while ($aostime == 0.0) {
+
+				if (abs($sat->el) < 0.005) {
+					$aostime = $t;
+				} else {
+					$t -= $sat->el * sqrt($sat->alt) / 530000.0;
+					$this->predict_calc($sat, $qth, $t);
+				}
+
+			}
+		}
+
+		return $aostime;
+	}
+
+	/** SGP4SDP4 driver for doing AOS/LOS calculations.
+	 *  @param Predict_Sat $sat The satellite data.
+	 *  @param Predict_QTH $qth The QTH observer location data.
+	 *  @param float       $t   The time for calculation (Julian Date)
+	 *
+	 */
+	public function predict_calc(Predict_Sat $sat, Predict_QTH $qth, $t)
+	{
+		$obs_set      = new Predict_ObsSet();
+		$sat_geodetic = new Predict_Geodetic();
+		$obs_geodetic = new Predict_Geodetic();
+
+		$obs_geodetic->lon   = $qth->lon * self::de2ra;
+		$obs_geodetic->lat   = $qth->lat * self::de2ra;
+		$obs_geodetic->alt   = $qth->alt / 1000.0;
+		$obs_geodetic->theta = 0;
+
+		$sat->jul_utc = $t;
+		$sat->tsince = ($sat->jul_utc - $sat->jul_epoch) * self::xmnpda;
+
+		/* call the norad routines according to the deep-space flag */
+		$sgpsdp = Predict_SGPSDP::getInstance($sat);
+		if ($sat->flags & Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
+			$sgpsdp->SDP4($sat, $sat->tsince);
+		} else {
+			$sgpsdp->SGP4($sat, $sat->tsince);
+		}
+
+		Predict_Math::Convert_Sat_State($sat->pos, $sat->vel);
+
+		/* get the velocity of the satellite */
+		$sat->vel->w = sqrt($sat->vel->x * $sat->vel->x + $sat->vel->y * $sat->vel->y + $sat->vel->z * $sat->vel->z);
+		$sat->velo = $sat->vel->w;
+		Predict_SGPObs::Calculate_Obs($sat->jul_utc, $sat->pos, $sat->vel, $obs_geodetic, $obs_set);
+		Predict_SGPObs::Calculate_LatLonAlt($sat->jul_utc, $sat->pos, $sat_geodetic);
+
+		while ($sat_geodetic->lon < -self::pi) {
+			$sat_geodetic->lon += self::twopi;
+		}
+
+		while ($sat_geodetic->lon > (self::pi)) {
+			$sat_geodetic->lon -= self::twopi;
+		}
+
+		$sat->az = Predict_Math::Degrees($obs_set->az);
+		$sat->el = Predict_Math::Degrees($obs_set->el);
+		$sat->range = $obs_set->range;
+		$sat->range_rate = $obs_set->range_rate;
+		$sat->ssplat = Predict_Math::Degrees($sat_geodetic->lat);
+		$sat->ssplon = Predict_Math::Degrees($sat_geodetic->lon);
+		$sat->alt = $sat_geodetic->alt;
+		$sat->ma = Predict_Math::Degrees($sat->phase);
+		$sat->ma *= 256.0 / 360.0;
+		$sat->phase = Predict_Math::Degrees($sat->phase);
+
+		/* same formulas, but the one from predict is nicer */
+		//sat->footprint = 2.0 * xkmper * acos (xkmper/sat->pos.w);
+		$sat->footprint = 12756.33 * acos(self::xkmper / (self::xkmper + $sat->alt));
+		$age = $sat->jul_utc - $sat->jul_epoch;
+		$sat->orbit = floor(($sat->tle->xno * self::xmnpda / self::twopi +
+						$age * $sat->tle->bstar * self::ae) * $age +
+						$sat->tle->xmo / self::twopi) + $sat->tle->revnum - 1;
+	}
+
+	/** Find the LOS time of the next pass.
+	 *  @author Alexandru Csete, OZ9AEC
+	 *  @author John A. Magliacane, KD2BD
+	 *  @param Predict_Sat $sat The satellite data.
+	 *  @param Predict_QTH $qth The QTH observer location data.
+	 *  @param float       $start The time where calculation should start. (Julian Date)
+	 *  @param int         $maxdt The upper time limit in days (0.0 = no limit)
+	 *  @return The time (julian date) of the next LOS or 0.0 if the satellite has no LOS.
+	 *
+	 * This function finds the time of LOS for the first coming pass taking place
+	 * no earlier that start.
+	 * If the satellite is currently out of range, the function first calls
+	 * find_aos to get the next AOS time. Then the calculations are done using
+	 * the new start time.
+	 * The function has a built-in watchdog to ensure that we don't end up in
+	 * lengthy loops.
+	 *
+	 */
+	public function find_los(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt)
+	{
+		$t = $start;
+		$lostime = 0.0;
+
+
+		$this->predict_calc($sat, $qth, $start);
+
+		/* check whether satellite has aos */
+		if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
+			($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
+			!$this->has_aos ($sat, $qth)) {
+
+			return 0.0;
+		}
+
+		if ($sat->el < 0.0) {
+			$t = $this->find_aos($sat, $qth, $start, $maxdt) + 0.001; // +1.5 min
+		}
+
+		/* invalid time (potentially returned by find_aos) */
+		if ($t < 0.01) {
+			return 0.0;
+		}
+
+		/* update satellite data */
+		$this->predict_calc($sat, $qth, $t);
+
+		/* use upper time limit */
+		if ($maxdt > 0.0) {
+
+			/* coarse steps */
+			while (($sat->el >= 1.0) && ($t <= ($start + $maxdt))) {
+				$t += cos(($sat->el - 1.0) * self::de2ra) * sqrt($sat->alt) / 25000.0;
+				$this->predict_calc($sat, $qth, $t);
+			}
+
+			/* fine steps */
+			while (($lostime == 0.0) && ($t <= ($start + $maxdt)))  {
+
+				$t += $sat->el * sqrt($sat->alt) / 502500.0;
+				$this->predict_calc($sat, $qth, $t);
+
+				if (abs($sat->el) < 0.005) {
+					$lostime = $t;
+				}
+			}
+		} else {
+		/* don't use upper limit */
+
+			/* coarse steps */
+			while ($sat->el >= 1.0) {
+				$t += cos(($sat->el - 1.0) * self::de2ra) * sqrt($sat->alt) / 25000.0;
+				$this->predict_calc($sat, $qth, $t);
+			}
+
+			/* fine steps */
+			while ($lostime == 0.0) {
+
+				$t += $sat->el * sqrt($sat->alt) / 502500.0;
+				$this->predict_calc($sat, $qth, $t);
+
+				if (abs($sat->el) < 0.005)
+					$lostime = $t;
+			}
+		}
+
+		return $lostime;
+	}
+
+	/** Find AOS time of current pass.
+	 *  @param Predict_Sat $sat   The satellite to find AOS for.
+	 *  @param Predict_QTH $qth   The ground station.
+	 *  @param float       $start Start time, prefereably now.
+	 *  @return The time of the previous AOS or 0.0 if the satellite has no AOS.
+	 *
+	 * This function can be used to find the AOS time in the past of the
+	 * current pass.
+	 */
+	public function find_prev_aos(Predict_Sat $sat, Predict_QTH $qth, $start)
+	{
+		$aostime = $start;
+
+		/* make sure current sat values are
             in sync with the time
         */
-        $this->predict_calc($sat, $qth, $start);
-
-        /* check whether satellite has aos */
-        if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
-            ($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
-            !$this->has_aos($sat, $qth)) {
-
-            return 0.0;
-        }
-
-        while ($sat->el >= 0.0) {
-            $aostime -= 0.0005; // 0.75 min
-            $this->predict_calc($sat, $qth, $aostime);
-        }
-
-        return $aostime;
-    }
-
-    /** Determine whether satellite ever reaches AOS.
-     *  @author John A. Magliacane, KD2BD
-     *  @author Alexandru Csete, OZ9AEC
-     *  @param Predict_Sat $sat The satellite data.
-     *  @param Predict_QTH $qth The observer's location data
-     *  @return bool true if the satellite will reach AOS, false otherwise.
-     *
-     */
-    public function has_aos(Predict_Sat $sat, Predict_QTH $qth)
-    {
-         $retcode = false;
-
-         /* FIXME */
-         if ($sat->meanmo == 0.0) {
-              $retcode = false;
-         } else {
-
-            /* xincl is already in RAD by select_ephemeris */
-            $lin = $sat->tle->xincl;
-            if ($lin >= self::pio2) {
-                $lin = self::pi - $lin;
-            }
-
-            $sma = 331.25 * exp(log(1440.0 / $sat->meanmo) * (2.0 / 3.0));
-            $apogee = $sma * (1.0 + $sat->tle->eo) - self::xkmper;
-
-            if ((acos(self::xkmper / ($apogee + self::xkmper)) + ($lin)) > abs($qth->lat * self::de2ra)) {
-                $retcode = true;
-            } else {
-                $retcode = false;
-            }
-        }
-
-        return $retcode;
-    }
-
-    /** Predict passes after a certain time.
-     *
-     *
-     * This function calculates num upcoming passes with AOS no earlier
-     * than t = start and not later that t = (start+maxdt). The function will
-     *  repeatedly call get_pass until
-     * the number of predicted passes is equal to num, the time has reached
-     * limit or the get_pass function returns NULL.
-     *
-     * note For no time limit use maxdt = 0.0
-     *
-     * note the data in sat will be corrupt (future) and must be refreshed
-     *      by the caller, if the caller will need it later on (eg. if the caller
-     *      is GtkSatList).
-     *
-     * note Prepending to a singly linked list is much faster than appending.
-     *      Therefore, the elements are prepended whereafter the GSList is
-     *      reversed
-     *
-     *
-     * @param Predict_Sat  $sat The satellite data
-     * @param Predict_QTH  $qth The observer's location data
-     * @param float $start The start julian date
-     * @param int   $maxdt The max # of days to look
-     * @param int   $num   The max # of passes to get
-     * @return array of Predict_Pass instances if found, empty array otherwise
-     */
-    public function get_passes(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt, $num = 0)
-    {
-        $passes = array();
-
-        /* if no number has been specified
+		$this->predict_calc($sat, $qth, $start);
+
+		/* check whether satellite has aos */
+		if (($sat->otype == Predict_SGPSDP::ORBIT_TYPE_GEO) ||
+			($sat->otype == Predict_SGPSDP::ORBIT_TYPE_DECAYED) ||
+			!$this->has_aos($sat, $qth)) {
+
+			return 0.0;
+		}
+
+		while ($sat->el >= 0.0) {
+			$aostime -= 0.0005; // 0.75 min
+			$this->predict_calc($sat, $qth, $aostime);
+		}
+
+		return $aostime;
+	}
+
+	/** Determine whether satellite ever reaches AOS.
+	 *  @author John A. Magliacane, KD2BD
+	 *  @author Alexandru Csete, OZ9AEC
+	 *  @param Predict_Sat $sat The satellite data.
+	 *  @param Predict_QTH $qth The observer's location data
+	 *  @return bool true if the satellite will reach AOS, false otherwise.
+	 *
+	 */
+	public function has_aos(Predict_Sat $sat, Predict_QTH $qth)
+	{
+		 $retcode = false;
+
+		 /* FIXME */
+		 if ($sat->meanmo == 0.0) {
+			  $retcode = false;
+		 } else {
+
+			/* xincl is already in RAD by select_ephemeris */
+			$lin = $sat->tle->xincl;
+			if ($lin >= self::pio2) {
+				$lin = self::pi - $lin;
+			}
+
+			$sma = 331.25 * exp(log(1440.0 / $sat->meanmo) * (2.0 / 3.0));
+			$apogee = $sma * (1.0 + $sat->tle->eo) - self::xkmper;
+
+			if ((acos(self::xkmper / ($apogee + self::xkmper)) + ($lin)) > abs($qth->lat * self::de2ra)) {
+				$retcode = true;
+			} else {
+				$retcode = false;
+			}
+		}
+
+		return $retcode;
+	}
+
+	/** Predict passes after a certain time.
+	 *
+	 *
+	 * This function calculates num upcoming passes with AOS no earlier
+	 * than t = start and not later that t = (start+maxdt). The function will
+	 *  repeatedly call get_pass until
+	 * the number of predicted passes is equal to num, the time has reached
+	 * limit or the get_pass function returns NULL.
+	 *
+	 * note For no time limit use maxdt = 0.0
+	 *
+	 * note the data in sat will be corrupt (future) and must be refreshed
+	 *      by the caller, if the caller will need it later on (eg. if the caller
+	 *      is GtkSatList).
+	 *
+	 * note Prepending to a singly linked list is much faster than appending.
+	 *      Therefore, the elements are prepended whereafter the GSList is
+	 *      reversed
+	 *
+	 *
+	 * @param Predict_Sat  $sat The satellite data
+	 * @param Predict_QTH  $qth The observer's location data
+	 * @param float $start The start julian date
+	 * @param int   $maxdt The max # of days to look
+	 * @param int   $num   The max # of passes to get
+	 * @return array of Predict_Pass instances if found, empty array otherwise
+	 */
+	public function get_passes(Predict_Sat $sat, Predict_QTH $qth, $start, $maxdt, $num = 0)
+	{
+		$passes = array();
+
+		/* if no number has been specified
             set it to something big */
-        if ($num == 0) {
-            $num = 100;
-        }
+		if ($num == 0) {
+			$num = 100;
+		}
 
-        $t = $start;
+		$t = $start;
 
-        for ($i = 0; $i < $num; $i++) {
-            $pass = $this->get_pass($sat, $qth, $t, $maxdt);
+		for ($i = 0; $i < $num; $i++) {
+			$pass = $this->get_pass($sat, $qth, $t, $maxdt);
 
-            if ($pass != null) {
-                $passes[] = $pass;
-                $t = $pass->los + 0.014; // +20 min
+			if ($pass != null) {
+				$passes[] = $pass;
+				$t = $pass->los + 0.014; // +20 min
 
-                /* if maxdt > 0.0 check whether we have reached t = start+maxdt
+				/* if maxdt > 0.0 check whether we have reached t = start+maxdt
                     if yes finish predictions
                 */
-                if (($maxdt > 0.0) && ($t >= ($start + $maxdt))) {
-                    $i = $num;
-                }
-            } else {
-                /* we can't get any more passes */
-                $i = $num;
-            }
-        }
-
-        return $passes;
-    }
-
-    /**
-     * Filters out visible passes and adds the visible aos, tca, los, and
-     * corresponding az and ele for each.
-     *
-     * @param array $passes The passes returned from get_passes()
-     *
-     * @author Bill Shupp
-     * @return array
-     */
-    public function filterVisiblePasses(array $passes)
-    {
-        $filtered = array();
-
-        foreach ($passes as $result) {
-            // Dummy check
-            if ($result->vis[0] != 'V') {
-                continue;
-            }
-
-            $aos    = false;
-            $aos_az = false;
-            $aos    = false;
-            $tca    = false;
-            $los_az = false;
-            $max_el = 0;
-
-            foreach ($result->details as $detail) {
-                if ($detail->vis != Predict::SAT_VIS_VISIBLE) {
-                    continue;
-                }
-                if ($detail->el < $this->minEle) {
-                    continue;
-                }
-
-                if ($aos == false) {
-                    $aos       = $detail->time;
-                    $aos_az    = $detail->az;
-                    $aos_el    = $detail->el;
-                    $tca       = $detail->time;
-                    $los       = $detail->time;
-                    $los_az    = $detail->az;
-                    $los_el    = $detail->el;
-                    $max_el    = $detail->el;
-                    $max_el_az = $detail->el;
-                    continue;
-                }
-                $los    = $detail->time;
-                $los_az = $detail->az;
-                $los_el = $detail->el;
-
-                if ($detail->el > $max_el) {
-                    $tca       = $detail->time;
-                    $max_el    = $detail->el;
-                    $max_el_az = $detail->az;
-                }
-            }
-
-            if ($aos === false) {
-                // Does not reach minimum elevation, skip
-                continue;
-            }
-
-            $result->visible_aos       = $aos;
-            $result->visible_aos_az    = $aos_az;
-            $result->visible_aos_el    = $aos_el;
-            $result->visible_tca       = $tca;
-            $result->visible_max_el    = $max_el;
-            $result->visible_max_el_az = $max_el_az;
-            $result->visible_los       = $los;
-            $result->visible_los_az    = $los_az;
-            $result->visible_los_el    = $los_el;
-
-            $filtered[] = $result;
-        }
-
-        return $filtered;
-    }
-
-    /**
-     * Translates aziumuth degrees to compass direction:
-     *
-     * N (0°), NNE (22.5°), NE (45°), ENE (67.5°), E (90°), ESE (112.5°),
-     * SE (135°), SSE (157.5°), S (180°), SSW (202.5°), SW (225°),
-     * WSW (247.5°), W (270°), WNW (292.5°), NW (315°), NNW (337.5°)
-     *
-     * @param int $az The azimuth in degrees, defaults to 0
-     *
-     * @return string
-     */
-    public function azDegreesToDirection($az = 0)
-    {
-        $i = floor($az / 22.5);
-        $m = (22.5 * (2 * $i + 1)) / 2;
-        $i = ($az >= $m) ? $i + 1 : $i;
-
-        return trim(substr('N  NNENE ENEE  ESESE SSES  SSWSW WSWW  WNWNW NNWN  ', $i * 3, 3));
-    }
+				if (($maxdt > 0.0) && ($t >= ($start + $maxdt))) {
+					$i = $num;
+				}
+			} else {
+				/* we can't get any more passes */
+				$i = $num;
+			}
+		}
+
+		return $passes;
+	}
+
+	/**
+	 * Filters out visible passes and adds the visible aos, tca, los, and
+	 * corresponding az and ele for each.
+	 *
+	 * @param array $passes The passes returned from get_passes()
+	 *
+	 * @author Bill Shupp
+	 * @return array
+	 */
+	public function filterVisiblePasses(array $passes)
+	{
+		$filtered = array();
+
+		foreach ($passes as $result) {
+			// Dummy check
+			if ($result->vis[0] != 'V') {
+				continue;
+			}
+
+			$aos    = false;
+			$aos_az = false;
+			$aos    = false;
+			$tca    = false;
+			$los_az = false;
+			$max_el = 0;
+
+			foreach ($result->details as $detail) {
+				if ($detail->vis != Predict::SAT_VIS_VISIBLE) {
+					continue;
+				}
+				if ($detail->el < $this->minEle) {
+					continue;
+				}
+
+				if ($aos == false) {
+					$aos       = $detail->time;
+					$aos_az    = $detail->az;
+					$aos_el    = $detail->el;
+					$tca       = $detail->time;
+					$los       = $detail->time;
+					$los_az    = $detail->az;
+					$los_el    = $detail->el;
+					$max_el    = $detail->el;
+					$max_el_az = $detail->el;
+					continue;
+				}
+				$los    = $detail->time;
+				$los_az = $detail->az;
+				$los_el = $detail->el;
+
+				if ($detail->el > $max_el) {
+					$tca       = $detail->time;
+					$max_el    = $detail->el;
+					$max_el_az = $detail->az;
+				}
+			}
+
+			if ($aos === false) {
+				// Does not reach minimum elevation, skip
+				continue;
+			}
+
+			$result->visible_aos       = $aos;
+			$result->visible_aos_az    = $aos_az;
+			$result->visible_aos_el    = $aos_el;
+			$result->visible_tca       = $tca;
+			$result->visible_max_el    = $max_el;
+			$result->visible_max_el_az = $max_el_az;
+			$result->visible_los       = $los;
+			$result->visible_los_az    = $los_az;
+			$result->visible_los_el    = $los_el;
+
+			$filtered[] = $result;
+		}
+
+		return $filtered;
+	}
+
+	/**
+	 * Translates aziumuth degrees to compass direction:
+	 *
+	 * N (0°), NNE (22.5°), NE (45°), ENE (67.5°), E (90°), ESE (112.5°),
+	 * SE (135°), SSE (157.5°), S (180°), SSW (202.5°), SW (225°),
+	 * WSW (247.5°), W (270°), WNW (292.5°), NW (315°), NNW (337.5°)
+	 *
+	 * @param int $az The azimuth in degrees, defaults to 0
+	 *
+	 * @return string
+	 */
+	public function azDegreesToDirection($az = 0)
+	{
+		$i = floor($az / 22.5);
+		$m = (22.5 * (2 * $i + 1)) / 2;
+		$i = ($az >= $m) ? $i + 1 : $i;
+
+		return trim(substr('N  NNENE ENEE  ESESE SSES  SSWSW WSWW  WNWNW NNWN  ', $i * 3, 3));
+	}
 }