Ysurac / FlightAirMap

require/libs/Predict/Predict/Geodetic.php

Indentation +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@
  */
 class Predict_Geodetic
 {
-    public $lat; /*!< Lattitude [rad] */
-    public $lon; /*!< Longitude [rad] */
-    public $alt; /*!< Altitude [km] */
-    public $theta;
+	public $lat; /*!< Lattitude [rad] */
+	public $lon; /*!< Longitude [rad] */
+	public $alt; /*!< Altitude [km] */
+	public $theta;
 }

require/libs/Predict/Predict/SGSDPStatic.php

Indentation +28 added lines, -28 removed lines

@@ -8,32 +8,32 @@
  */
 class Predict_SGSDPStatic
 {
-    public $aodp;
-    public $aycof;
-    public $c1;
-    public $c4;
-    public $c5;
-    public $cosio;
-    public $d2;
-    public $d3;
-    public $d4;
-    public $delmo;
-    public $omgcof;
-    public $eta;
-    public $omgdot;
-    public $sinio;
-    public $xnodp;
-    public $sinmo;
-    public $t2cof;
-    public $t3cof;
-    public $t4cof;
-    public $t5cof;
-    public $x1mth2;
-    public $x3thm1;
-    public $x7thm1;
-    public $xmcof;
-    public $xmdot;
-    public $xnodcf;
-    public $xnodot;
-    public $xlcof;
+	public $aodp;
+	public $aycof;
+	public $c1;
+	public $c4;
+	public $c5;
+	public $cosio;
+	public $d2;
+	public $d3;
+	public $d4;
+	public $delmo;
+	public $omgcof;
+	public $eta;
+	public $omgdot;
+	public $sinio;
+	public $xnodp;
+	public $sinmo;
+	public $t2cof;
+	public $t3cof;
+	public $t4cof;
+	public $t5cof;
+	public $x1mth2;
+	public $x3thm1;
+	public $x7thm1;
+	public $xmcof;
+	public $xmdot;
+	public $xnodcf;
+	public $xnodot;
+	public $xlcof;
 }

require/libs/Predict/Predict/QTH.php

Indentation +9 added lines, -9 removed lines

@@ -7,14 +7,14 @@
  */
 class Predict_QTH
 {
-     public $name;   /*!< Name, eg. callsign. */
-     public $loc;    /*!< Location, eg City, Country. */
-     public $desc;   /*!< Short description. */
-     public $lat;    /*!< Latitude in dec. deg. North. */
-     public $lon;    /*!< Longitude in dec. deg. East. */
-     public $alt;    /*!< Altitude above sea level in meters. */
-     public $qra;    /*!< QRA locator */
-     public $wx;     /*!< Weather station code (4 chars). */
+	 public $name;   /*!< Name, eg. callsign. */
+	 public $loc;    /*!< Location, eg City, Country. */
+	 public $desc;   /*!< Short description. */
+	 public $lat;    /*!< Latitude in dec. deg. North. */
+	 public $lon;    /*!< Longitude in dec. deg. East. */
+	 public $alt;    /*!< Altitude above sea level in meters. */
+	 public $qra;    /*!< QRA locator */
+	 public $wx;     /*!< Weather station code (4 chars). */
 
-     public $data;   /*!< Raw data from cfg file. */
+	 public $data;   /*!< Raw data from cfg file. */
 }

require/libs/Predict/Predict/Sat.php

Indentation +296 added lines, -296 removed lines

@@ -22,304 +22,304 @@
  */
 class Predict_Sat
 {
-    // Fifth root of a hundred, used for magnitude calculation
-    const POGSONS_RATIO = 2.5118864315096;
-
-    public $name     = null;
-    public $nickname = null;
-    public $website  = null;
-
-    public $tle      = null;   /*!< Keplerian elements */
-    public $flags    = 0;      /*!< Flags for algo ctrl */
-    public $sgps     = null;
-    public $dps      = null;
-    public $deep_arg = null;
-    public $pos      = null;   /*!< Raw position and range */
-    public $vel      = null;   /*!< Raw velocity */
-
-    /*** FIXME: REMOVE */
-    public $bearing = null;   /*!< Az, El, range and vel */
-    public $astro   = null;   /*!< Ra and Decl */
-    /*** END */
-
-    /* time keeping fields */
-    public $jul_epoch = null;
-    public $jul_utc   = null;
-    public $tsince    = null;
-    public $aos       = null;    /*!< Next AOS. */
-    public $los       = null;    /*!< Next LOS */
-
-    public $az         = null;   /*!< Azimuth [deg] */
-    public $el         = null;   /*!< Elevation [deg] */
-    public $range      = null;   /*!< Range [km] */
-    public $range_rate = null;   /*!< Range Rate [km/sec] */
-    public $ra         = null;   /*!< Right Ascension [deg] */
-    public $dec        = null;   /*!< Declination [deg] */
-    public $ssplat     = null;   /*!< SSP latitude [deg] */
-    public $ssplon     = null;   /*!< SSP longitude [deg] */
-    public $alt        = null;   /*!< altitude [km] */
-    public $velo       = null;   /*!< velocity [km/s] */
-    public $ma         = null;   /*!< mean anomaly */
-    public $footprint  = null;   /*!< footprint */
-    public $phase      = null;   /*!< orbit phase */
-    public $meanmo     = null;   /*!< mean motion kept in rev/day */
-    public $orbit      = null;   /*!< orbit number */
-    public $otype      = null;   /*!< orbit type. */
-
-    public function __construct(Predict_TLE $tle)
-    {
-        $headerParts    = explode(' ', $tle->header);
-        $this->name     = $headerParts[0];
-        $this->nickname = $this->name;
-        $this->tle      = $tle;
-        $this->pos      = new Predict_Vector();
-        $this->vel      = new Predict_Vector();
-        $this->sgps     = new Predict_SGSDPStatic();
-        $this->deep_arg = new Predict_DeepArg();
-        $this->dps      = new Predict_DeepStatic();
-
-        $this->select_ephemeris();
-        $this->sat_data_init_sat($this);
-    }
-
-    /* Selects the apropriate ephemeris type to be used */
-    /* for predictions according to the data in the TLE */
-    /* It also processes values in the tle set so that  */
-    /* they are apropriate for the sgp4/sdp4 routines   */
-    public function select_ephemeris()
-    {
-        /* Preprocess tle set */
-        $this->tle->xnodeo *= Predict::de2ra;
-        $this->tle->omegao *= Predict::de2ra;
-        $this->tle->xmo    *= Predict::de2ra;
-        $this->tle->xincl  *= Predict::de2ra;
-        $temp = Predict::twopi / Predict::xmnpda / Predict::xmnpda;
-
-        /* store mean motion before conversion */
-        $this->meanmo       = $this->tle->xno;
-        $this->tle->xno     = $this->tle->xno * $temp * Predict::xmnpda;
-        $this->tle->xndt2o *= $temp;
-        $this->tle->xndd6o  = $this->tle->xndd6o * $temp / Predict::xmnpda;
-        $this->tle->bstar  /= Predict::ae;
-
-        /* Period > 225 minutes is deep space */
-        $dd1 = Predict::xke / $this->tle->xno;
-        $dd2 = Predict::tothrd;
-        $a1 = pow($dd1, $dd2);
-        $r1 = cos($this->tle->xincl);
-        $dd1 = 1.0 - $this->tle->eo * $this->tle->eo;
-        $temp = Predict::ck2 * 1.5 * ($r1 * $r1 * 3.0 - 1.0) / pow($dd1, 1.5);
-        $del1 = $temp / ($a1 * $a1);
-        $ao = $a1 * (1.0 - $del1 * (Predict::tothrd * 0.5 + $del1 *
-                                 ($del1 * 1.654320987654321 + 1.0)));
-        $delo = $temp / ($ao * $ao);
-        $xnodp = $this->tle->xno / ($delo + 1.0);
-
-        /* Select a deep-space/near-earth ephemeris */
-        if (Predict::twopi / $xnodp / Predict::xmnpda >= .15625) {
-            $this->flags |= Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
-        } else {
-            $this->flags &= ~Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
-        }
-    }
-
-    /** Initialise satellite data.
-     *  @param sat The satellite to initialise.
-     *  @param qth Optional QTH info, use (0,0) if NULL.
-     *
-     * This function calculates the satellite data at t = 0, ie. epoch time
-     * The function is called automatically by gtk_sat_data_read_sat.
-     */
-    public function sat_data_init_sat(Predict_Sat $sat, Predict_QTH $qth = null)
-    {
-        $obs_geodetic = new Predict_Geodetic();
-        $obs_set = new Predict_ObsSet();
-        $sat_geodetic = new Predict_Geodetic();
-        /* double jul_utc, age; */
-
-        $jul_utc = Predict_Time::Julian_Date_of_Epoch($sat->tle->epoch); // => tsince = 0.0
-        $sat->jul_epoch = $jul_utc;
-
-        /* initialise observer location */
-        if ($qth != null) {
-            $obs_geodetic->lon = $qth->lon * Predict::de2ra;
-            $obs_geodetic->lat = $qth->lat * Predict::de2ra;
-            $obs_geodetic->alt = $qth->alt / 1000.0;
-            $obs_geodetic->theta = 0;
-        }
-        else {
-            $obs_geodetic->lon = 0.0;
-            $obs_geodetic->lat = 0.0;
-            $obs_geodetic->alt = 0.0;
-            $obs_geodetic->theta = 0;
-        }
-
-        /* execute computations */
-        $sdpsgp = Predict_SGPSDP::getInstance($sat);
-        if ($sat->flags & Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
-            $sdpsgp->SDP4($sat, 0.0);
-        } else {
-            $sdpsgp->SGP4($sat, 0.0);
-        }
-
-        /* scale position and velocity to km and km/sec */
-        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($jul_utc, $sat->pos, $sat->vel, $obs_geodetic, $obs_set);
-        Predict_SGPObs::Calculate_LatLonAlt($jul_utc, $sat->pos, $sat_geodetic);
-
-        while ($sat_geodetic->lon < -Predict::pi) {
-            $sat_geodetic->lon += Predict::twopi;
-        }
-
-        while ($sat_geodetic->lon > Predict::pi) {
-            $sat_geodetic->lon -= Predict::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->footprint = 2.0 * Predict::xkmper * acos (Predict::xkmper/$sat->pos->w);
-        $age = 0.0;
-        $sat->orbit = floor(($sat->tle->xno * Predict::xmnpda / Predict::twopi +
-                                   $age * $sat->tle->bstar * Predict::ae) * $age +
-                                  $sat->tle->xmo / Predict::twopi) + $sat->tle->revnum - 1;
-
-        /* orbit type */
-        $sat->otype = $sat->get_orbit_type($sat);
-    }
-
-    public function get_orbit_type(Predict_Sat $sat)
-    {
-         $orbit = Predict_SGPSDP::ORBIT_TYPE_UNKNOWN;
-
-         if ($this->geostationary($sat)) {
-              $orbit = Predict_SGPSDP::ORBIT_TYPE_GEO;
-         } else if ($this->decayed($sat)) {
-              $orbit = Predict_SGPSDP::ORBIT_TYPE_DECAYED;
-         } else {
-              $orbit = Predict_SGPSDP::ORBIT_TYPE_UNKNOWN;
-         }
-
-         return $orbit;
-    }
-
-
-    /** Determinte whether satellite is in geostationary orbit.
-     *  @author John A. Magliacane, KD2BD
-     *  @param sat Pointer to satellite data.
-     *  @return TRUE if the satellite appears to be in geostationary orbit,
-     *          FALSE otherwise.
-     *
-     * A satellite is in geostationary orbit if
-     *
-     *     fabs (sat.meanmotion - 1.0027) < 0.0002
-     *
-     * Note: Appearantly, the mean motion can deviate much more from 1.0027 than 0.0002
-     */
-    public function geostationary(Predict_Sat $sat)
-    {
-         if (abs($sat->meanmo - 1.0027) < 0.0002) {
-              return true;
-         } else {
-              return false;
-        }
-    }
-
-
-    /** Determine whether satellite has decayed.
-     *  @author John A. Magliacane, KD2BD
-     *  @author Alexandru Csete, OZ9AEC
-     *  @param sat Pointer to satellite data.
-     *  @return TRUE if the satellite appears to have decayed, FALSE otherwise.
-     *  @bug Modified version of the predict code but it is not tested.
-     *
-     * A satellite is decayed if
-     *
-     *    satepoch + ((16.666666 - sat.meanmo) / (10.0*fabs(sat.drag))) < "now"
-     *
-     */
-    public function decayed(Predict_Sat $sat)
-    {
-        /* tle.xndt2o/(twopi/xmnpda/xmnpda) is the value before converted the
+	// Fifth root of a hundred, used for magnitude calculation
+	const POGSONS_RATIO = 2.5118864315096;
+
+	public $name     = null;
+	public $nickname = null;
+	public $website  = null;
+
+	public $tle      = null;   /*!< Keplerian elements */
+	public $flags    = 0;      /*!< Flags for algo ctrl */
+	public $sgps     = null;
+	public $dps      = null;
+	public $deep_arg = null;
+	public $pos      = null;   /*!< Raw position and range */
+	public $vel      = null;   /*!< Raw velocity */
+
+	/*** FIXME: REMOVE */
+	public $bearing = null;   /*!< Az, El, range and vel */
+	public $astro   = null;   /*!< Ra and Decl */
+	/*** END */
+
+	/* time keeping fields */
+	public $jul_epoch = null;
+	public $jul_utc   = null;
+	public $tsince    = null;
+	public $aos       = null;    /*!< Next AOS. */
+	public $los       = null;    /*!< Next LOS */
+
+	public $az         = null;   /*!< Azimuth [deg] */
+	public $el         = null;   /*!< Elevation [deg] */
+	public $range      = null;   /*!< Range [km] */
+	public $range_rate = null;   /*!< Range Rate [km/sec] */
+	public $ra         = null;   /*!< Right Ascension [deg] */
+	public $dec        = null;   /*!< Declination [deg] */
+	public $ssplat     = null;   /*!< SSP latitude [deg] */
+	public $ssplon     = null;   /*!< SSP longitude [deg] */
+	public $alt        = null;   /*!< altitude [km] */
+	public $velo       = null;   /*!< velocity [km/s] */
+	public $ma         = null;   /*!< mean anomaly */
+	public $footprint  = null;   /*!< footprint */
+	public $phase      = null;   /*!< orbit phase */
+	public $meanmo     = null;   /*!< mean motion kept in rev/day */
+	public $orbit      = null;   /*!< orbit number */
+	public $otype      = null;   /*!< orbit type. */
+
+	public function __construct(Predict_TLE $tle)
+	{
+		$headerParts    = explode(' ', $tle->header);
+		$this->name     = $headerParts[0];
+		$this->nickname = $this->name;
+		$this->tle      = $tle;
+		$this->pos      = new Predict_Vector();
+		$this->vel      = new Predict_Vector();
+		$this->sgps     = new Predict_SGSDPStatic();
+		$this->deep_arg = new Predict_DeepArg();
+		$this->dps      = new Predict_DeepStatic();
+
+		$this->select_ephemeris();
+		$this->sat_data_init_sat($this);
+	}
+
+	/* Selects the apropriate ephemeris type to be used */
+	/* for predictions according to the data in the TLE */
+	/* It also processes values in the tle set so that  */
+	/* they are apropriate for the sgp4/sdp4 routines   */
+	public function select_ephemeris()
+	{
+		/* Preprocess tle set */
+		$this->tle->xnodeo *= Predict::de2ra;
+		$this->tle->omegao *= Predict::de2ra;
+		$this->tle->xmo    *= Predict::de2ra;
+		$this->tle->xincl  *= Predict::de2ra;
+		$temp = Predict::twopi / Predict::xmnpda / Predict::xmnpda;
+
+		/* store mean motion before conversion */
+		$this->meanmo       = $this->tle->xno;
+		$this->tle->xno     = $this->tle->xno * $temp * Predict::xmnpda;
+		$this->tle->xndt2o *= $temp;
+		$this->tle->xndd6o  = $this->tle->xndd6o * $temp / Predict::xmnpda;
+		$this->tle->bstar  /= Predict::ae;
+
+		/* Period > 225 minutes is deep space */
+		$dd1 = Predict::xke / $this->tle->xno;
+		$dd2 = Predict::tothrd;
+		$a1 = pow($dd1, $dd2);
+		$r1 = cos($this->tle->xincl);
+		$dd1 = 1.0 - $this->tle->eo * $this->tle->eo;
+		$temp = Predict::ck2 * 1.5 * ($r1 * $r1 * 3.0 - 1.0) / pow($dd1, 1.5);
+		$del1 = $temp / ($a1 * $a1);
+		$ao = $a1 * (1.0 - $del1 * (Predict::tothrd * 0.5 + $del1 *
+								 ($del1 * 1.654320987654321 + 1.0)));
+		$delo = $temp / ($ao * $ao);
+		$xnodp = $this->tle->xno / ($delo + 1.0);
+
+		/* Select a deep-space/near-earth ephemeris */
+		if (Predict::twopi / $xnodp / Predict::xmnpda >= .15625) {
+			$this->flags |= Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
+		} else {
+			$this->flags &= ~Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
+		}
+	}
+
+	/** Initialise satellite data.
+	 *  @param sat The satellite to initialise.
+	 *  @param qth Optional QTH info, use (0,0) if NULL.
+	 *
+	 * This function calculates the satellite data at t = 0, ie. epoch time
+	 * The function is called automatically by gtk_sat_data_read_sat.
+	 */
+	public function sat_data_init_sat(Predict_Sat $sat, Predict_QTH $qth = null)
+	{
+		$obs_geodetic = new Predict_Geodetic();
+		$obs_set = new Predict_ObsSet();
+		$sat_geodetic = new Predict_Geodetic();
+		/* double jul_utc, age; */
+
+		$jul_utc = Predict_Time::Julian_Date_of_Epoch($sat->tle->epoch); // => tsince = 0.0
+		$sat->jul_epoch = $jul_utc;
+
+		/* initialise observer location */
+		if ($qth != null) {
+			$obs_geodetic->lon = $qth->lon * Predict::de2ra;
+			$obs_geodetic->lat = $qth->lat * Predict::de2ra;
+			$obs_geodetic->alt = $qth->alt / 1000.0;
+			$obs_geodetic->theta = 0;
+		}
+		else {
+			$obs_geodetic->lon = 0.0;
+			$obs_geodetic->lat = 0.0;
+			$obs_geodetic->alt = 0.0;
+			$obs_geodetic->theta = 0;
+		}
+
+		/* execute computations */
+		$sdpsgp = Predict_SGPSDP::getInstance($sat);
+		if ($sat->flags & Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
+			$sdpsgp->SDP4($sat, 0.0);
+		} else {
+			$sdpsgp->SGP4($sat, 0.0);
+		}
+
+		/* scale position and velocity to km and km/sec */
+		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($jul_utc, $sat->pos, $sat->vel, $obs_geodetic, $obs_set);
+		Predict_SGPObs::Calculate_LatLonAlt($jul_utc, $sat->pos, $sat_geodetic);
+
+		while ($sat_geodetic->lon < -Predict::pi) {
+			$sat_geodetic->lon += Predict::twopi;
+		}
+
+		while ($sat_geodetic->lon > Predict::pi) {
+			$sat_geodetic->lon -= Predict::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->footprint = 2.0 * Predict::xkmper * acos (Predict::xkmper/$sat->pos->w);
+		$age = 0.0;
+		$sat->orbit = floor(($sat->tle->xno * Predict::xmnpda / Predict::twopi +
+								   $age * $sat->tle->bstar * Predict::ae) * $age +
+								  $sat->tle->xmo / Predict::twopi) + $sat->tle->revnum - 1;
+
+		/* orbit type */
+		$sat->otype = $sat->get_orbit_type($sat);
+	}
+
+	public function get_orbit_type(Predict_Sat $sat)
+	{
+		 $orbit = Predict_SGPSDP::ORBIT_TYPE_UNKNOWN;
+
+		 if ($this->geostationary($sat)) {
+			  $orbit = Predict_SGPSDP::ORBIT_TYPE_GEO;
+		 } else if ($this->decayed($sat)) {
+			  $orbit = Predict_SGPSDP::ORBIT_TYPE_DECAYED;
+		 } else {
+			  $orbit = Predict_SGPSDP::ORBIT_TYPE_UNKNOWN;
+		 }
+
+		 return $orbit;
+	}
+
+
+	/** Determinte whether satellite is in geostationary orbit.
+	 *  @author John A. Magliacane, KD2BD
+	 *  @param sat Pointer to satellite data.
+	 *  @return TRUE if the satellite appears to be in geostationary orbit,
+	 *          FALSE otherwise.
+	 *
+	 * A satellite is in geostationary orbit if
+	 *
+	 *     fabs (sat.meanmotion - 1.0027) < 0.0002
+	 *
+	 * Note: Appearantly, the mean motion can deviate much more from 1.0027 than 0.0002
+	 */
+	public function geostationary(Predict_Sat $sat)
+	{
+		 if (abs($sat->meanmo - 1.0027) < 0.0002) {
+			  return true;
+		 } else {
+			  return false;
+		}
+	}
+
+
+	/** Determine whether satellite has decayed.
+	 *  @author John A. Magliacane, KD2BD
+	 *  @author Alexandru Csete, OZ9AEC
+	 *  @param sat Pointer to satellite data.
+	 *  @return TRUE if the satellite appears to have decayed, FALSE otherwise.
+	 *  @bug Modified version of the predict code but it is not tested.
+	 *
+	 * A satellite is decayed if
+	 *
+	 *    satepoch + ((16.666666 - sat.meanmo) / (10.0*fabs(sat.drag))) < "now"
+	 *
+	 */
+	public function decayed(Predict_Sat $sat)
+	{
+		/* tle.xndt2o/(twopi/xmnpda/xmnpda) is the value before converted the
            value matches up with the value in predict 2.2.3 */
-        /*** FIXME decayed is treated as a static quantity.
+		/*** FIXME decayed is treated as a static quantity.
              It is time dependent. Also sat->jul_utc is often zero
              when this function is called
         ***/
-        if ((10.0 * abs($sat->tle->xndt2o / (Predict::twopi / Predict::xmnpda / Predict::xmnpda))) == 0) {
-    		return true;
-    	} elseif ($sat->jul_epoch + ((16.666666 - $sat->meanmo) /
-                               (10.0 * abs($sat->tle->xndt2o / (Predict::twopi / Predict::xmnpda / Predict::xmnpda)))) < $sat->jul_utc) {
-              return true;
-        } else {
-              return false;
-        }
-    }
-
-    /**
-     * Experimental attempt at calculating apparent magnitude.  Known intrinsic
-     * magnitudes are listed inside the function for now.
-     *
-     * @param float       $time The daynum the satellite is calculated for
-     * @param Predict_QTH $qth  The observer location
-     *
-     * @return null on failure, float otherwise
-     */
-    public function calculateApparentMagnitude($time, Predict_QTH $qth)
-    {
-        // Recorded intrinsic magnitudes and their respective
-        // illumination and distance from heavens-above.com
-        static $intrinsicMagnitudes = array(
-            '25544' => array(
-                'mag'      => -1.3,
-                'illum'    => .5,
-                'distance' => 1000,
-            )
-        );
-
-        // Return null if we don't have a record of the intrinsic mag
-        if (!isset($intrinsicMagnitudes[$this->tle->catnr])) {
-            return null;
-        }
-        $imag = $intrinsicMagnitudes[$this->tle->catnr];
-
-        // Convert the observer's geodetic info to radians and km so
-        // we can compare vectors
-        $observerGeo      = new Predict_Geodetic();
-        $observerGeo->lat = Predict_Math::Radians($qth->lat);
-        $observerGeo->lon = Predict_Math::Radians($qth->lon);
-        $observerGeo->alt = $qth->alt * 1000;
-
-        // Now determine the sun and observer positions
-        $observerPos      = new Predict_Vector();
-        $observerVel      = new Predict_Vector();
-        $solarVector      = new Predict_Vector();
-        Predict_Solar::Calculate_Solar_Position($time, $solarVector);
-        Predict_SGPObs::Calculate_User_PosVel($time, $observerGeo, $observerPos, $observerVel);
-
-        // Determine the solar phase and and thus the percent illumination
-        $observerSatPos = new Predict_Vector();
-        Predict_Math::Vec_Sub($this->pos, $observerPos, $observerSatPos);
-        $phaseAngle = Predict_Math::Degrees(Predict_Math::Angle($solarVector, $observerSatPos));
-        $illum      = $phaseAngle / 180;
-
-        $illuminationChange            = $illum / $imag['illum'];
-        $inverseSquareOfDistanceChange = pow(($imag['distance'] / $this->range), 2);
-        $changeInMagnitude             = log(
-            $illuminationChange * $inverseSquareOfDistanceChange,
-            self::POGSONS_RATIO
-        );
-
-        return $imag['mag'] - $changeInMagnitude;
-    }
+		if ((10.0 * abs($sat->tle->xndt2o / (Predict::twopi / Predict::xmnpda / Predict::xmnpda))) == 0) {
+			return true;
+		} elseif ($sat->jul_epoch + ((16.666666 - $sat->meanmo) /
+							   (10.0 * abs($sat->tle->xndt2o / (Predict::twopi / Predict::xmnpda / Predict::xmnpda)))) < $sat->jul_utc) {
+			  return true;
+		} else {
+			  return false;
+		}
+	}
+
+	/**
+	 * Experimental attempt at calculating apparent magnitude.  Known intrinsic
+	 * magnitudes are listed inside the function for now.
+	 *
+	 * @param float       $time The daynum the satellite is calculated for
+	 * @param Predict_QTH $qth  The observer location
+	 *
+	 * @return null on failure, float otherwise
+	 */
+	public function calculateApparentMagnitude($time, Predict_QTH $qth)
+	{
+		// Recorded intrinsic magnitudes and their respective
+		// illumination and distance from heavens-above.com
+		static $intrinsicMagnitudes = array(
+			'25544' => array(
+				'mag'      => -1.3,
+				'illum'    => .5,
+				'distance' => 1000,
+			)
+		);
+
+		// Return null if we don't have a record of the intrinsic mag
+		if (!isset($intrinsicMagnitudes[$this->tle->catnr])) {
+			return null;
+		}
+		$imag = $intrinsicMagnitudes[$this->tle->catnr];
+
+		// Convert the observer's geodetic info to radians and km so
+		// we can compare vectors
+		$observerGeo      = new Predict_Geodetic();
+		$observerGeo->lat = Predict_Math::Radians($qth->lat);
+		$observerGeo->lon = Predict_Math::Radians($qth->lon);
+		$observerGeo->alt = $qth->alt * 1000;
+
+		// Now determine the sun and observer positions
+		$observerPos      = new Predict_Vector();
+		$observerVel      = new Predict_Vector();
+		$solarVector      = new Predict_Vector();
+		Predict_Solar::Calculate_Solar_Position($time, $solarVector);
+		Predict_SGPObs::Calculate_User_PosVel($time, $observerGeo, $observerPos, $observerVel);
+
+		// Determine the solar phase and and thus the percent illumination
+		$observerSatPos = new Predict_Vector();
+		Predict_Math::Vec_Sub($this->pos, $observerPos, $observerSatPos);
+		$phaseAngle = Predict_Math::Degrees(Predict_Math::Angle($solarVector, $observerSatPos));
+		$illum      = $phaseAngle / 180;
+
+		$illuminationChange            = $illum / $imag['illum'];
+		$inverseSquareOfDistanceChange = pow(($imag['distance'] / $this->range), 2);
+		$changeInMagnitude             = log(
+			$illuminationChange * $inverseSquareOfDistanceChange,
+			self::POGSONS_RATIO
+		);
+
+		return $imag['mag'] - $changeInMagnitude;
+	}
 }

require/libs/Predict/Predict/Vector.php

Indentation +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@
  */
 class Predict_Vector
 {
-    public $x = 0;
-    public $y = 0;
-    public $z = 0;
-    public $w = 0;
+	public $x = 0;
+	public $y = 0;
+	public $z = 0;
+	public $w = 0;
 }

require/libs/Predict/Predict/Time.php

Indentation +188 added lines, -188 removed lines

@@ -30,194 +30,194 @@
  */
 class Predict_Time
 {
-    /* The function Julian_Date_of_Epoch returns the Julian Date of     */
-    /* an epoch specified in the format used in the NORAD two-line      */
-    /* element sets. It has been modified to support dates beyond       */
-    /* the year 1999 assuming that two-digit years in the range 00-56   */
-    /* correspond to 2000-2056. Until the two-line element set format   */
-    /* is changed, it is only valid for dates through 2056 December 31. */
-    public static function Julian_Date_of_Epoch($epoch)
-    {
-        $year = 0;
-
-        /* Modification to support Y2K */
-        /* Valid 1957 through 2056     */
-        $day = self::modf($epoch * 1E-3, $year) * 1E3;
-        if ($year < 57) {
-            $year = $year + 2000;
-        } else {
-            $year = $year + 1900;
-        }
-        /* End modification */
-
-        return self::Julian_Date_of_Year($year) + $day;
-    }
-
-    /* Equivalent to the C modf function */
-    public static function modf($x, &$ipart) {
-        $ipart = (int)$x;
-        return $x - $ipart;
-    }
-
-    /* The function Julian_Date_of_Year calculates the Julian Date  */
-    /* of Day 0.0 of {year}. This function is used to calculate the */
-    /* Julian Date of any date by using Julian_Date_of_Year, DOY,   */
-    /* and Fraction_of_Day. */
-    public static function Julian_Date_of_Year($year)
-    {
-        /* Astronomical Formulae for Calculators, Jean Meeus, */
-        /* pages 23-25. Calculate Julian Date of 0.0 Jan year */
-        $year = $year - 1;
-        $i = (int) ($year / 100);
-        $A = $i;
-        $i = (int) ($A / 4);
-        $B = (int) (2 - $A + $i);
-        $i = (int) (365.25 * $year);
-        $i += (int) (30.6001 * 14);
-        $jdoy = $i + 1720994.5 + $B;
-
-        return $jdoy;
-    }
-
-    /* The function ThetaG calculates the Greenwich Mean Sidereal Time */
-    /* for an epoch specified in the format used in the NORAD two-line */
-    /* element sets. It has now been adapted for dates beyond the year */
-    /* 1999, as described above. The function ThetaG_JD provides the   */
-    /* same calculation except that it is based on an input in the     */
-    /* form of a Julian Date. */
-    public static function ThetaG($epoch, Predict_DeepArg $deep_arg)
-    {
-        /* Reference:  The 1992 Astronomical Almanac, page B6. */
-        // double year,day,UT,jd,TU,GMST,_ThetaG;
-
-        /* Modification to support Y2K */
-        /* Valid 1957 through 2056     */
-        $year = 0;
-        $day = self::modf($epoch * 1E-3, $year) * 1E3;
-
-        if ($year < 57) {
-            $year += 2000;
-        } else {
-            $year += 1900;
-        }
-        /* End modification */
-
-        $UT = fmod($day, $day);
-        $jd = self::Julian_Date_of_Year($year) + $day;
-        $TU = ($jd - 2451545.0) / 36525;
-        $GMST = 24110.54841 + $TU * (8640184.812866 + $TU * (0.093104 - $TU * 6.2E-6));
-        $GMST = Predict_Math::Modulus($GMST + Predict::secday * Predict::omega_E * $UT, Predict::secday);
-        $deep_arg->ds50 = $jd - 2433281.5 + $UT;
-
-        return Predict_Math::FMod2p(6.3003880987 * $deep_arg->ds50 + 1.72944494);
-    }
-
-    /* See the ThetaG doc block above */
-    public static function ThetaG_JD($jd)
-    {
-        /* Reference:  The 1992 Astronomical Almanac, page B6. */
-        $UT   = Predict_Math::Frac($jd + 0.5);
-        $jd   = $jd - $UT;
-        $TU   = ($jd - 2451545.0) / 36525;
-        $GMST = 24110.54841 + $TU * (8640184.812866 + $TU * (0.093104 - $TU * 6.2E-6));
-        $GMST = Predict_Math::Modulus($GMST + Predict::secday * Predict::omega_E * $UT, Predict::secday);
-
-        return Predict::twopi * $GMST / Predict::secday;
-    }
-
-    /**
-     * Read the system clock and return the current Julian day.  From phpPredict
-     *
-     * @return float
-     */
-    public static function get_current_daynum() {
-        // Gets the current decimal day number from microtime
-
-        list($usec, $sec) = explode(' ', microtime());
-        return self::unix2daynum($sec, $usec);
-    }
-
-    /**
-     * Converts a standard unix timestamp and optional
-     * milliseconds to a daynum
-     *
-     * @param int $sec  Seconds from the unix epoch
-     * @param int $usec Optional milliseconds
-     *
-     * @return float
-     */
-    public static function unix2daynum($sec, $usec = 0)
-    {
-        $time = ((($sec + $usec) / 86400.0) - 3651.0);
-        return $time + 2444238.5;
-    }
-
-    /* The function Delta_ET has been added to allow calculations on   */
-    /* the position of the sun.  It provides the difference between UT */
-    /* (approximately the same as UTC) and ET (now referred to as TDT).*/
-    /* This function is based on a least squares fit of data from 1950 */
-    /* to 1991 and will need to be updated periodically. */
-    public static function Delta_ET($year)
-    {
-      /* Values determined using data from 1950-1991 in the 1990
+	/* The function Julian_Date_of_Epoch returns the Julian Date of     */
+	/* an epoch specified in the format used in the NORAD two-line      */
+	/* element sets. It has been modified to support dates beyond       */
+	/* the year 1999 assuming that two-digit years in the range 00-56   */
+	/* correspond to 2000-2056. Until the two-line element set format   */
+	/* is changed, it is only valid for dates through 2056 December 31. */
+	public static function Julian_Date_of_Epoch($epoch)
+	{
+		$year = 0;
+
+		/* Modification to support Y2K */
+		/* Valid 1957 through 2056     */
+		$day = self::modf($epoch * 1E-3, $year) * 1E3;
+		if ($year < 57) {
+			$year = $year + 2000;
+		} else {
+			$year = $year + 1900;
+		}
+		/* End modification */
+
+		return self::Julian_Date_of_Year($year) + $day;
+	}
+
+	/* Equivalent to the C modf function */
+	public static function modf($x, &$ipart) {
+		$ipart = (int)$x;
+		return $x - $ipart;
+	}
+
+	/* The function Julian_Date_of_Year calculates the Julian Date  */
+	/* of Day 0.0 of {year}. This function is used to calculate the */
+	/* Julian Date of any date by using Julian_Date_of_Year, DOY,   */
+	/* and Fraction_of_Day. */
+	public static function Julian_Date_of_Year($year)
+	{
+		/* Astronomical Formulae for Calculators, Jean Meeus, */
+		/* pages 23-25. Calculate Julian Date of 0.0 Jan year */
+		$year = $year - 1;
+		$i = (int) ($year / 100);
+		$A = $i;
+		$i = (int) ($A / 4);
+		$B = (int) (2 - $A + $i);
+		$i = (int) (365.25 * $year);
+		$i += (int) (30.6001 * 14);
+		$jdoy = $i + 1720994.5 + $B;
+
+		return $jdoy;
+	}
+
+	/* The function ThetaG calculates the Greenwich Mean Sidereal Time */
+	/* for an epoch specified in the format used in the NORAD two-line */
+	/* element sets. It has now been adapted for dates beyond the year */
+	/* 1999, as described above. The function ThetaG_JD provides the   */
+	/* same calculation except that it is based on an input in the     */
+	/* form of a Julian Date. */
+	public static function ThetaG($epoch, Predict_DeepArg $deep_arg)
+	{
+		/* Reference:  The 1992 Astronomical Almanac, page B6. */
+		// double year,day,UT,jd,TU,GMST,_ThetaG;
+
+		/* Modification to support Y2K */
+		/* Valid 1957 through 2056     */
+		$year = 0;
+		$day = self::modf($epoch * 1E-3, $year) * 1E3;
+
+		if ($year < 57) {
+			$year += 2000;
+		} else {
+			$year += 1900;
+		}
+		/* End modification */
+
+		$UT = fmod($day, $day);
+		$jd = self::Julian_Date_of_Year($year) + $day;
+		$TU = ($jd - 2451545.0) / 36525;
+		$GMST = 24110.54841 + $TU * (8640184.812866 + $TU * (0.093104 - $TU * 6.2E-6));
+		$GMST = Predict_Math::Modulus($GMST + Predict::secday * Predict::omega_E * $UT, Predict::secday);
+		$deep_arg->ds50 = $jd - 2433281.5 + $UT;
+
+		return Predict_Math::FMod2p(6.3003880987 * $deep_arg->ds50 + 1.72944494);
+	}
+
+	/* See the ThetaG doc block above */
+	public static function ThetaG_JD($jd)
+	{
+		/* Reference:  The 1992 Astronomical Almanac, page B6. */
+		$UT   = Predict_Math::Frac($jd + 0.5);
+		$jd   = $jd - $UT;
+		$TU   = ($jd - 2451545.0) / 36525;
+		$GMST = 24110.54841 + $TU * (8640184.812866 + $TU * (0.093104 - $TU * 6.2E-6));
+		$GMST = Predict_Math::Modulus($GMST + Predict::secday * Predict::omega_E * $UT, Predict::secday);
+
+		return Predict::twopi * $GMST / Predict::secday;
+	}
+
+	/**
+	 * Read the system clock and return the current Julian day.  From phpPredict
+	 *
+	 * @return float
+	 */
+	public static function get_current_daynum() {
+		// Gets the current decimal day number from microtime
+
+		list($usec, $sec) = explode(' ', microtime());
+		return self::unix2daynum($sec, $usec);
+	}
+
+	/**
+	 * Converts a standard unix timestamp and optional
+	 * milliseconds to a daynum
+	 *
+	 * @param int $sec  Seconds from the unix epoch
+	 * @param int $usec Optional milliseconds
+	 *
+	 * @return float
+	 */
+	public static function unix2daynum($sec, $usec = 0)
+	{
+		$time = ((($sec + $usec) / 86400.0) - 3651.0);
+		return $time + 2444238.5;
+	}
+
+	/* The function Delta_ET has been added to allow calculations on   */
+	/* the position of the sun.  It provides the difference between UT */
+	/* (approximately the same as UTC) and ET (now referred to as TDT).*/
+	/* This function is based on a least squares fit of data from 1950 */
+	/* to 1991 and will need to be updated periodically. */
+	public static function Delta_ET($year)
+	{
+	  /* Values determined using data from 1950-1991 in the 1990
          Astronomical Almanac.  See DELTA_ET.WQ1 for details. */
 
-      $delta_et = 26.465 + 0.747622 * ($year - 1950) +
-                 1.886913 * sin(Predict::twopi * ($year - 1975) / 33);
-
-      return $delta_et;
-    }
-
-    /**
-     * Converts a daynum to a unix timestamp.  From phpPredict.
-     *
-     * @param float $dn Julian Daynum
-     *
-     * @return float
-     */
-    public static function daynum2unix($dn) {
-        // Converts a daynum to a UNIX timestamp
-
-        return (86400.0 * ($dn - 2444238.5 + 3651.0));
-    }
-
-    /**
-     * Converts a daynum to a readable time format.
-     *
-     * @param float $dn The julian date
-     * @param string $zone The zone string, defaults to America/Los_Angeles
-     * @param string $format The date() function's format string.  Defaults to m-d-Y H:i:s
-     *
-     * @return string
-     */
-    public static function daynum2readable($dn, $zone = 'America/Los_Angeles', $format = 'm-d-Y H:i:s')
-    {
-        $unix = self::daynum2unix($dn);
-        $date = new DateTime("@" . round($unix));
-        $dateTimezone = new DateTimezone($zone);
-        $date->setTimezone($dateTimezone);
-        return $date->format($format);
-    }
-
-    /**
-     * Returns the unix timestamp of a TLE's epoch
-     *
-     * @param Predict_TLE $tle The TLE object
-     *
-     * @return int
-     */
-    public static function getEpochTimeStamp(Predict_TLE $tle)
-    {
-        $year = $tle->epoch_year;
-        $day  = $tle->epoch_day;
-        $sec  = round(86400 * $tle->epoch_fod);
-
-        $zone = new DateTimeZone('GMT');
-        $date = new DateTime();
-        $date->setTimezone($zone);
-        $date->setDate($year, 1, 1);
-        $date->setTime(0, 0, 0);
-
-        return $date->format('U') + (86400 * $day) + $sec - 86400;
-    }
+	  $delta_et = 26.465 + 0.747622 * ($year - 1950) +
+				 1.886913 * sin(Predict::twopi * ($year - 1975) / 33);
+
+	  return $delta_et;
+	}
+
+	/**
+	 * Converts a daynum to a unix timestamp.  From phpPredict.
+	 *
+	 * @param float $dn Julian Daynum
+	 *
+	 * @return float
+	 */
+	public static function daynum2unix($dn) {
+		// Converts a daynum to a UNIX timestamp
+
+		return (86400.0 * ($dn - 2444238.5 + 3651.0));
+	}
+
+	/**
+	 * Converts a daynum to a readable time format.
+	 *
+	 * @param float $dn The julian date
+	 * @param string $zone The zone string, defaults to America/Los_Angeles
+	 * @param string $format The date() function's format string.  Defaults to m-d-Y H:i:s
+	 *
+	 * @return string
+	 */
+	public static function daynum2readable($dn, $zone = 'America/Los_Angeles', $format = 'm-d-Y H:i:s')
+	{
+		$unix = self::daynum2unix($dn);
+		$date = new DateTime("@" . round($unix));
+		$dateTimezone = new DateTimezone($zone);
+		$date->setTimezone($dateTimezone);
+		return $date->format($format);
+	}
+
+	/**
+	 * Returns the unix timestamp of a TLE's epoch
+	 *
+	 * @param Predict_TLE $tle The TLE object
+	 *
+	 * @return int
+	 */
+	public static function getEpochTimeStamp(Predict_TLE $tle)
+	{
+		$year = $tle->epoch_year;
+		$day  = $tle->epoch_day;
+		$sec  = round(86400 * $tle->epoch_fod);
+
+		$zone = new DateTimeZone('GMT');
+		$date = new DateTime();
+		$date->setTimezone($zone);
+		$date->setDate($year, 1, 1);
+		$date->setTime(0, 0, 0);
+
+		return $date->format('U') + (86400 * $day) + $sec - 86400;
+	}
 }

require/libs/Predict/Predict/SGPObs.php

Indentation +127 added lines, -127 removed lines

@@ -25,131 +25,131 @@
  */
 class Predict_SGPObs
 {
-    /* Procedure Calculate_User_PosVel passes the user's geodetic position */
-    /* and the time of interest and returns the ECI position and velocity  */
-    /* of the observer. The velocity calculation assumes the geodetic      */
-    /* position is stationary relative to the earth's surface.             */
-    public static function Calculate_User_PosVel(
-        $_time, Predict_Geodetic $geodetic, Predict_Vector $obs_pos, Predict_Vector $obs_vel
-    )
-    {
-        /* Reference:  The 1992 Astronomical Almanac, page K11. */
-
-        $sinGeodeticLat = sin($geodetic->lat); /* Only run sin($geodetic->lat) once */
-
-        $geodetic->theta = Predict_Math::FMod2p(Predict_Time::ThetaG_JD($_time) + $geodetic->lon);/*LMST*/
-        $c = 1 / sqrt(1 + Predict::__f * (Predict::__f - 2) * $sinGeodeticLat * $sinGeodeticLat);
-        $sq = (1 - Predict::__f) * (1 - Predict::__f) * $c;
-        $achcp = (Predict::xkmper * $c + $geodetic->alt) * cos($geodetic->lat);
-        $obs_pos->x = $achcp * cos($geodetic->theta); /*kilometers*/
-        $obs_pos->y = $achcp * sin($geodetic->theta);
-        $obs_pos->z = (Predict::xkmper * $sq + $geodetic->alt) * $sinGeodeticLat;
-        $obs_vel->x = -Predict::mfactor * $obs_pos->y; /*kilometers/second*/
-        $obs_vel->y =  Predict::mfactor * $obs_pos->x;
-        $obs_vel->z =  0;
-        $obs_pos->w = sqrt($obs_pos->x * $obs_pos->x + $obs_pos->y * $obs_pos->y + $obs_pos->z * $obs_pos->z);
-        $obs_vel->w = sqrt($obs_vel->x * $obs_vel->x + $obs_vel->y * $obs_vel->y + $obs_vel->z * $obs_vel->z);
-    }
-
-    /* Procedure Calculate_LatLonAlt will calculate the geodetic  */
-    /* position of an object given its ECI position pos and time. */
-    /* It is intended to be used to determine the ground track of */
-    /* a satellite.  The calculations  assume the earth to be an  */
-    /* oblate spheroid as defined in WGS '72.                     */
-    public static function Calculate_LatLonAlt($_time, Predict_Vector $pos,  Predict_Geodetic $geodetic)
-    {
-        /* Reference:  The 1992 Astronomical Almanac, page K12. */
-
-        /* double r,e2,phi,c; */
-
-        $geodetic->theta = Predict_Math::AcTan($pos->y, $pos->x); /*radians*/
-        $geodetic->lon = Predict_Math::FMod2p($geodetic->theta - Predict_Time::ThetaG_JD($_time)); /*radians*/
-        $r = sqrt(($pos->x * $pos->x) + ($pos->y * $pos->y));
-        $e2 = Predict::__f * (2 - Predict::__f);
-        $geodetic->lat = Predict_Math::AcTan($pos->z, $r); /*radians*/
-
-        do {
-            $phi    = $geodetic->lat;
-            $sinPhi = sin($phi);
-            $c      = 1 / sqrt(1 - $e2 * ($sinPhi * $sinPhi));
-            $geodetic->lat = Predict_Math::AcTan($pos->z + Predict::xkmper * $c * $e2 * $sinPhi, $r);
-        } while (abs($geodetic->lat - $phi) >= 1E-10);
-
-        $geodetic->alt = $r / cos($geodetic->lat) - Predict::xkmper * $c;/*kilometers*/
-
-        if ($geodetic->lat > Predict::pio2) {
-            $geodetic->lat -= Predict::twopi;
-        }
-    }
-
-    /* The procedures Calculate_Obs and Calculate_RADec calculate         */
-    /* the *topocentric* coordinates of the object with ECI position,     */
-    /* {pos}, and velocity, {vel}, from location {geodetic} at {time}.    */
-    /* The {obs_set} returned for Calculate_Obs consists of azimuth,      */
-    /* elevation, range, and range rate (in that order) with units of     */
-    /* radians, radians, kilometers, and kilometers/second, respectively. */
-    /* The WGS '72 geoid is used and the effect of atmospheric refraction */
-    /* (under standard temperature and pressure) is incorporated into the */
-    /* elevation calculation; the effect of atmospheric refraction on     */
-    /* range and range rate has not yet been quantified.                  */
-
-    /* The {obs_set} for Calculate_RADec consists of right ascension and  */
-    /* declination (in that order) in radians.  Again, calculations are   */
-    /* based on *topocentric* position using the WGS '72 geoid and        */
-    /* incorporating atmospheric refraction.                              */
-    public static function Calculate_Obs($_time, Predict_Vector $pos, Predict_Vector $vel, Predict_Geodetic $geodetic, Predict_ObsSet $obs_set)
-    {
-        $obs_pos = new Predict_Vector();
-        $obs_vel = new Predict_Vector();
-        $range   = new Predict_Vector();
-        $rgvel   = new Predict_Vector();
-
-        self::Calculate_User_PosVel($_time, $geodetic, $obs_pos, $obs_vel);
-
-        $range->x = $pos->x - $obs_pos->x;
-        $range->y = $pos->y - $obs_pos->y;
-        $range->z = $pos->z - $obs_pos->z;
-
-        $rgvel->x = $vel->x - $obs_vel->x;
-        $rgvel->y = $vel->y - $obs_vel->y;
-        $rgvel->z = $vel->z - $obs_vel->z;
-
-        $range->w = sqrt($range->x * $range->x + $range->y * $range->y + $range->z * $range->z);
-
-        $sin_lat   = sin($geodetic->lat);
-        $cos_lat   = cos($geodetic->lat);
-        $sin_theta = sin($geodetic->theta);
-        $cos_theta = cos($geodetic->theta);
-        $top_s = $sin_lat * $cos_theta * $range->x
-            + $sin_lat * $sin_theta * $range->y
-            - $cos_lat * $range->z;
-        $top_e = -$sin_theta * $range->x
-            + $cos_theta * $range->y;
-        $top_z = $cos_lat * $cos_theta * $range->x
-            + $cos_lat * $sin_theta * $range->y
-            + $sin_lat * $range->z;
-        $azim = atan(-$top_e / $top_s); /*Azimuth*/
-        if ($top_s > 0) {
-            $azim = $azim + Predict::pi;
-        }
-        if ($azim < 0 ) {
-            $azim = $azim + Predict::twopi;
-        }
-        $el = Predict_Math::ArcSin($top_z / $range->w);
-        $obs_set->az = $azim;        /* Azimuth (radians)  */
-        $obs_set->el = $el;          /* Elevation (radians)*/
-        $obs_set->range = $range->w; /* Range (kilometers) */
-
-        /* Range Rate (kilometers/second)*/
-        $obs_set->range_rate = Predict_Math::Dot($range, $rgvel) / $range->w;
-
-        /* Corrections for atmospheric refraction */
-        /* Reference:  Astronomical Algorithms by Jean Meeus, pp. 101-104    */
-        /* Correction is meaningless when apparent elevation is below horizon */
-        //	obs_set->el = obs_set->el + Radians((1.02/tan(Radians(Degrees(el)+
-        //							      10.3/(Degrees(el)+5.11))))/60);
-        if ($obs_set->el < 0) {
-            $obs_set->el = $el;  /*Reset to true elevation*/
-        }
-    }
+	/* Procedure Calculate_User_PosVel passes the user's geodetic position */
+	/* and the time of interest and returns the ECI position and velocity  */
+	/* of the observer. The velocity calculation assumes the geodetic      */
+	/* position is stationary relative to the earth's surface.             */
+	public static function Calculate_User_PosVel(
+		$_time, Predict_Geodetic $geodetic, Predict_Vector $obs_pos, Predict_Vector $obs_vel
+	)
+	{
+		/* Reference:  The 1992 Astronomical Almanac, page K11. */
+
+		$sinGeodeticLat = sin($geodetic->lat); /* Only run sin($geodetic->lat) once */
+
+		$geodetic->theta = Predict_Math::FMod2p(Predict_Time::ThetaG_JD($_time) + $geodetic->lon);/*LMST*/
+		$c = 1 / sqrt(1 + Predict::__f * (Predict::__f - 2) * $sinGeodeticLat * $sinGeodeticLat);
+		$sq = (1 - Predict::__f) * (1 - Predict::__f) * $c;
+		$achcp = (Predict::xkmper * $c + $geodetic->alt) * cos($geodetic->lat);
+		$obs_pos->x = $achcp * cos($geodetic->theta); /*kilometers*/
+		$obs_pos->y = $achcp * sin($geodetic->theta);
+		$obs_pos->z = (Predict::xkmper * $sq + $geodetic->alt) * $sinGeodeticLat;
+		$obs_vel->x = -Predict::mfactor * $obs_pos->y; /*kilometers/second*/
+		$obs_vel->y =  Predict::mfactor * $obs_pos->x;
+		$obs_vel->z =  0;
+		$obs_pos->w = sqrt($obs_pos->x * $obs_pos->x + $obs_pos->y * $obs_pos->y + $obs_pos->z * $obs_pos->z);
+		$obs_vel->w = sqrt($obs_vel->x * $obs_vel->x + $obs_vel->y * $obs_vel->y + $obs_vel->z * $obs_vel->z);
+	}
+
+	/* Procedure Calculate_LatLonAlt will calculate the geodetic  */
+	/* position of an object given its ECI position pos and time. */
+	/* It is intended to be used to determine the ground track of */
+	/* a satellite.  The calculations  assume the earth to be an  */
+	/* oblate spheroid as defined in WGS '72.                     */
+	public static function Calculate_LatLonAlt($_time, Predict_Vector $pos,  Predict_Geodetic $geodetic)
+	{
+		/* Reference:  The 1992 Astronomical Almanac, page K12. */
+
+		/* double r,e2,phi,c; */
+
+		$geodetic->theta = Predict_Math::AcTan($pos->y, $pos->x); /*radians*/
+		$geodetic->lon = Predict_Math::FMod2p($geodetic->theta - Predict_Time::ThetaG_JD($_time)); /*radians*/
+		$r = sqrt(($pos->x * $pos->x) + ($pos->y * $pos->y));
+		$e2 = Predict::__f * (2 - Predict::__f);
+		$geodetic->lat = Predict_Math::AcTan($pos->z, $r); /*radians*/
+
+		do {
+			$phi    = $geodetic->lat;
+			$sinPhi = sin($phi);
+			$c      = 1 / sqrt(1 - $e2 * ($sinPhi * $sinPhi));
+			$geodetic->lat = Predict_Math::AcTan($pos->z + Predict::xkmper * $c * $e2 * $sinPhi, $r);
+		} while (abs($geodetic->lat - $phi) >= 1E-10);
+
+		$geodetic->alt = $r / cos($geodetic->lat) - Predict::xkmper * $c;/*kilometers*/
+
+		if ($geodetic->lat > Predict::pio2) {
+			$geodetic->lat -= Predict::twopi;
+		}
+	}
+
+	/* The procedures Calculate_Obs and Calculate_RADec calculate         */
+	/* the *topocentric* coordinates of the object with ECI position,     */
+	/* {pos}, and velocity, {vel}, from location {geodetic} at {time}.    */
+	/* The {obs_set} returned for Calculate_Obs consists of azimuth,      */
+	/* elevation, range, and range rate (in that order) with units of     */
+	/* radians, radians, kilometers, and kilometers/second, respectively. */
+	/* The WGS '72 geoid is used and the effect of atmospheric refraction */
+	/* (under standard temperature and pressure) is incorporated into the */
+	/* elevation calculation; the effect of atmospheric refraction on     */
+	/* range and range rate has not yet been quantified.                  */
+
+	/* The {obs_set} for Calculate_RADec consists of right ascension and  */
+	/* declination (in that order) in radians.  Again, calculations are   */
+	/* based on *topocentric* position using the WGS '72 geoid and        */
+	/* incorporating atmospheric refraction.                              */
+	public static function Calculate_Obs($_time, Predict_Vector $pos, Predict_Vector $vel, Predict_Geodetic $geodetic, Predict_ObsSet $obs_set)
+	{
+		$obs_pos = new Predict_Vector();
+		$obs_vel = new Predict_Vector();
+		$range   = new Predict_Vector();
+		$rgvel   = new Predict_Vector();
+
+		self::Calculate_User_PosVel($_time, $geodetic, $obs_pos, $obs_vel);
+
+		$range->x = $pos->x - $obs_pos->x;
+		$range->y = $pos->y - $obs_pos->y;
+		$range->z = $pos->z - $obs_pos->z;
+
+		$rgvel->x = $vel->x - $obs_vel->x;
+		$rgvel->y = $vel->y - $obs_vel->y;
+		$rgvel->z = $vel->z - $obs_vel->z;
+
+		$range->w = sqrt($range->x * $range->x + $range->y * $range->y + $range->z * $range->z);
+
+		$sin_lat   = sin($geodetic->lat);
+		$cos_lat   = cos($geodetic->lat);
+		$sin_theta = sin($geodetic->theta);
+		$cos_theta = cos($geodetic->theta);
+		$top_s = $sin_lat * $cos_theta * $range->x
+			+ $sin_lat * $sin_theta * $range->y
+			- $cos_lat * $range->z;
+		$top_e = -$sin_theta * $range->x
+			+ $cos_theta * $range->y;
+		$top_z = $cos_lat * $cos_theta * $range->x
+			+ $cos_lat * $sin_theta * $range->y
+			+ $sin_lat * $range->z;
+		$azim = atan(-$top_e / $top_s); /*Azimuth*/
+		if ($top_s > 0) {
+			$azim = $azim + Predict::pi;
+		}
+		if ($azim < 0 ) {
+			$azim = $azim + Predict::twopi;
+		}
+		$el = Predict_Math::ArcSin($top_z / $range->w);
+		$obs_set->az = $azim;        /* Azimuth (radians)  */
+		$obs_set->el = $el;          /* Elevation (radians)*/
+		$obs_set->range = $range->w; /* Range (kilometers) */
+
+		/* Range Rate (kilometers/second)*/
+		$obs_set->range_rate = Predict_Math::Dot($range, $rgvel) / $range->w;
+
+		/* Corrections for atmospheric refraction */
+		/* Reference:  Astronomical Algorithms by Jean Meeus, pp. 101-104    */
+		/* Correction is meaningless when apparent elevation is below horizon */
+		//	obs_set->el = obs_set->el + Radians((1.02/tan(Radians(Degrees(el)+
+		//							      10.3/(Degrees(el)+5.11))))/60);
+		if ($obs_set->el < 0) {
+			$obs_set->el = $el;  /*Reset to true elevation*/
+		}
+	}
 }

install/populate_all.php

Indentation +31 added lines, -31 removed lines

@@ -1,48 +1,48 @@
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('class.update_db.php');
-    echo "Populate all tables...\n";
-    update_db::update_all();
-    echo "\nInstall waypoints...(VERY slow!)";
-    update_db::update_waypoints();
-    echo "Done !\n";
-    echo "Install airspace...";
-    update_db::update_airspace();
-    echo "Done !\n";
-    echo "Install countries...";
-    update_db::update_countries();
-    echo "Done !\n";
-    if (isset($globalOwner) && $globalOwner) {
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('class.update_db.php');
+	echo "Populate all tables...\n";
+	update_db::update_all();
+	echo "\nInstall waypoints...(VERY slow!)";
+	update_db::update_waypoints();
+	echo "Done !\n";
+	echo "Install airspace...";
+	update_db::update_airspace();
+	echo "Done !\n";
+	echo "Install countries...";
+	update_db::update_countries();
+	echo "Done !\n";
+	if (isset($globalOwner) && $globalOwner) {
 	echo "Install private owners...";
 	update_db::update_owner();
-        echo "Done !\n";
-    }
-    /*
+		echo "Done !\n";
+	}
+	/*
     if (isset($globalIVAO) && $globalIVAO) {
         echo "Install IVAO airlines and logos...";
         update_db::update_IVAO();
 	echo "Done !\n";
     }
     */
-    if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
+	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	echo "Install NOTAM from notaminfo.com...";
-        update_db:update_notam();
-        echo "Done !\n";
-    }
-    if (isset($globalMap3D) && $globalMap3D) {
+		update_db:update_notam();
+		echo "Done !\n";
+	}
+	if (isset($globalMap3D) && $globalMap3D) {
 	echo "Install 3D models...";
 	update_db::update_models();
 	echo "Done !\n";
 	if (isset($globalMapSatellites) && $globalMapSatellites) {
-	    echo "Install Space 3D models...";
-	    update_db::update_space_models();
-	    echo "Done !\n";
-        }
-    }
+		echo "Install Space 3D models...";
+		update_db::update_space_models();
+		echo "Done !\n";
+		}
+	}
 
 ?>
\ No newline at end of file

airport-data.php

Indentation +48 added lines, -48 removed lines

@@ -47,79 +47,79 @@
 print '</div>';
 print '<div><span>'._("Altitude").'</span>';
 if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
-        print $spotter_item['altitude'].' feet';
+		print $spotter_item['altitude'].' feet';
 } else {
-        print round($spotter_item['altitude']*0.3048).' m';
+		print round($spotter_item['altitude']*0.3048).' m';
 }
 print '</div>';
 print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
 print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>';
 if (isset($spotter_item['home_link']) && $spotter_item['home_link'] != '' && isset($spotter_item['wikipedia_link']) && $spotter_item['wikipedia_link'] != '') {
-    print '<div><span>'._("Links").'</span>';
-    print '<a href="'.$spotter_item['home_link'].'">'._("Homepage").'</a>';
-    print ' - ';
-    print '<a href="'.$spotter_item['wikipedia_link'].'">Wikipedia</a>';
-    print '</div>';
+	print '<div><span>'._("Links").'</span>';
+	print '<a href="'.$spotter_item['home_link'].'">'._("Homepage").'</a>';
+	print ' - ';
+	print '<a href="'.$spotter_item['wikipedia_link'].'">Wikipedia</a>';
+	print '</div>';
 } elseif (isset($spotter_item['home_link']) && $spotter_item['home_link'] != '') {
-    print '<div><span>'._("Links").'</span>';
-    print '<a href="'.$spotter_item['home_link'].'">'._("Homepage").'</a>';
-    print '</div>';
+	print '<div><span>'._("Links").'</span>';
+	print '<a href="'.$spotter_item['home_link'].'">'._("Homepage").'</a>';
+	print '</div>';
 } elseif (isset($spotter_item['wikipedia_link']) && $spotter_item['wikipedia_link'] != '') {
-    print '<div><span>'._("Links").'</span>';
-    print '<a href="'.$spotter_item['wikipedia_link'].'">Wikipedia</a>';
-    print '</div>';
+	print '<div><span>'._("Links").'</span>';
+	print '<a href="'.$spotter_item['wikipedia_link'].'">Wikipedia</a>';
+	print '</div>';
 }
 if ($spotter_item['type'] == 'medium_airport' || $spotter_item['type'] == 'large_airport') {
-    print '<div><span>'._("Live Air Traffic").'</span>';
-    print '<a href="http://www.liveatc.net/search/?icao='.$spotter_item['icao'].'">LiveATC</a>';
-    print '</div>';
+	print '<div><span>'._("Live Air Traffic").'</span>';
+	print '<a href="http://www.liveatc.net/search/?icao='.$spotter_item['icao'].'">LiveATC</a>';
+	print '</div>';
 }
 
 print '</div>';
 
 if (isset($metar_parse)) {
-    print '<div class="waypoints">';
-    print '<div><span>METAR</span>';
-    print '<i>'.$metar_info[0]['metar'].'</i><br />';
-    print '<b>'.$metar_info[0]['metar_date'].'</b><br />';
+	print '<div class="waypoints">';
+	print '<div><span>METAR</span>';
+	print '<i>'.$metar_info[0]['metar'].'</i><br />';
+	print '<b>'.$metar_info[0]['metar_date'].'</b><br />';
 //    print_r($metar_parse);
-    if (isset($metar_parse['wind'])) {
-        print _("Wind:").' ';
+	if (isset($metar_parse['wind'])) {
+		print _("Wind:").' ';
 	if (isset($metar_parse['wind']['direction'])) {
-	    $direction = $Spotter->parseDirection($metar_parse['wind']['direction']);
-	    print $direction[0]['direction_fullname'];
-	    print ' ('.$metar_parse['wind']['direction'].'°) ';
-        }
-        if (isset($metar_parse['wind']['speed'])) {
-	    print $metar_parse['wind']['speed'].' m/s';
-        }
+		$direction = $Spotter->parseDirection($metar_parse['wind']['direction']);
+		print $direction[0]['direction_fullname'];
+		print ' ('.$metar_parse['wind']['direction'].'°) ';
+		}
+		if (isset($metar_parse['wind']['speed'])) {
+		print $metar_parse['wind']['speed'].' m/s';
+		}
 	print '<br/>';
-    }
-    if (isset($metar_parse['visibility'])) {
-        print _("Visibility:").' '.$metar_parse['visibility'].' m'."<br/>";
-    }
-    if (isset($metar_parse['weather'])) {
-        print _("Weather:").' '.$metar_parse['weather']."<br/>";
-    }
-    if (isset($metar_parse['temperature'])) {
-        print _("Temperature:").' '.$metar_parse['temperature'].' °C'."<br/>";
-    }
-    if (isset($metar_parse['dew'])) {
-        print _("Dew point:").' '.$metar_parse['dew'].' °C'."<br/>";
-    }
-    if (isset($metar_parse['temperature']) && isset($metar_parse['dew'])) {
+	}
+	if (isset($metar_parse['visibility'])) {
+		print _("Visibility:").' '.$metar_parse['visibility'].' m'."<br/>";
+	}
+	if (isset($metar_parse['weather'])) {
+		print _("Weather:").' '.$metar_parse['weather']."<br/>";
+	}
+	if (isset($metar_parse['temperature'])) {
+		print _("Temperature:").' '.$metar_parse['temperature'].' °C'."<br/>";
+	}
+	if (isset($metar_parse['dew'])) {
+		print _("Dew point:").' '.$metar_parse['dew'].' °C'."<br/>";
+	}
+	if (isset($metar_parse['temperature']) && isset($metar_parse['dew'])) {
 	$humidity = round(100 * pow((112 - (0.1 * $metar_parse['temperature']) + $metar_parse['dew']) / (112 + (0.9 * $metar_parse['temperature'])), 8),1);
 	print _("Humidity:").' '.$humidity.'%'."<br/>";
-    }
-    if (isset($metar_parse['QNH'])) {
-        print _("Pressure:").' '.$metar_parse['QNH'].' hPa'."<br/>";
-    }
+	}
+	if (isset($metar_parse['QNH'])) {
+		print _("Pressure:").' '.$metar_parse['QNH'].' hPa'."<br/>";
+	}
 /*
 if (isset($metar_parse['QNH'])) {
     print 'Pressure : '.$metar_parse['QNH'].' hPa'."<br/>";
 }
 */
-    print '</div>';
+	print '</div>';
 /*
 Wind: from the NNE (020 degrees) at 5 MPH (4 KT) (direction variable):0
 Visibility: greater than 7 mile(s):0