Ysurac / FlightAirMap

require/libs/Predict/Predict/TLE.php

Spacing +28 added lines, -28 removed lines

@@ -12,30 +12,30 @@ 
  */
 class Predict_TLE
 {
-    public $header;     /* Header line of TLE file */
-    public $line1;      /* Line 1 of TLE */
-    public $line2;      /* Line 2 of TLE */
-    public $epoch;      /*!< Epoch Time in NORAD TLE format YYDDD.FFFFFFFF */
+    public $header; /* Header line of TLE file */
+    public $line1; /* Line 1 of TLE */
+    public $line2; /* Line 2 of TLE */
+    public $epoch; /*!< Epoch Time in NORAD TLE format YYDDD.FFFFFFFF */
     public $epoch_year; /*!< Epoch: year */
-    public $epoch_day;  /*!< Epoch: day of year */
-    public $epoch_fod;  /*!< Epoch: Fraction of day. */
-    public $xndt2o;     /*!< 1. time derivative of mean motion */
-    public $xndd6o;     /*!< 2. time derivative of mean motion */
-    public $bstar;      /*!< Bstar drag coefficient. */
-    public $xincl;      /*!< Inclination */
-    public $xnodeo;     /*!< R.A.A.N. */
-    public $eo;         /*!< Eccentricity */
-    public $omegao;     /*!< argument of perigee */
-    public $xmo;        /*!< mean anomaly */
-    public $xno;        /*!< mean motion */
-
-    public $catnr;      /*!< Catalogue Number.  */
-    public $elset;      /*!< Element Set number. */
-    public $revnum;     /*!< Revolution Number at epoch. */
-
-    public $sat_name;   /*!< Satellite name string. */
-    public $idesg;      /*!< International Designator. */
-    public $status;     /*!< Operational status. */
+    public $epoch_day; /*!< Epoch: day of year */
+    public $epoch_fod; /*!< Epoch: Fraction of day. */
+    public $xndt2o; /*!< 1. time derivative of mean motion */
+    public $xndd6o; /*!< 2. time derivative of mean motion */
+    public $bstar; /*!< Bstar drag coefficient. */
+    public $xincl; /*!< Inclination */
+    public $xnodeo; /*!< R.A.A.N. */
+    public $eo; /*!< Eccentricity */
+    public $omegao; /*!< argument of perigee */
+    public $xmo; /*!< mean anomaly */
+    public $xno; /*!< mean motion */
+
+    public $catnr; /*!< Catalogue Number.  */
+    public $elset; /*!< Element Set number. */
+    public $revnum; /*!< Revolution Number at epoch. */
+
+    public $sat_name; /*!< Satellite name string. */
+    public $idesg; /*!< International Designator. */
+    public $status; /*!< Operational status. */
 
     /* values needed for squint calculations */
     public $xincl1;
@@ -93,12 +93,12 @@ 
         $this->xndt2o = (float) substr($line1, 33, 10);
 
         /* Satellite's Second Time Derivative */
-        $this->xndd6o = (float) (substr($line1, 44, 1) . '.' . substr($line1, 45, 5) . 'E' . substr($line1, 50, 2));
+        $this->xndd6o = (float) (substr($line1, 44, 1).'.'.substr($line1, 45, 5).'E'.substr($line1, 50, 2));
 
         /* Satellite's bstar drag term
            FIXME: How about buff[0] ????
         */
-        $this->bstar = (float) (substr($line1, 53, 1) . '.' . substr($line1, 54, 5) . 'E' . substr($line1, 59, 2));
+        $this->bstar = (float) (substr($line1, 53, 1).'.'.substr($line1, 54, 5).'E'.substr($line1, 59, 2));
 
         /* Element Number */
         $this->elset = (int) substr($line1, 64, 4);
@@ -111,7 +111,7 @@ 
         $this->xnodeo = (float) substr($line2, 17, 8);
 
         /* Satellite's Orbital Eccentricity */
-        $this->eo = (float) ('.' . substr($line2, 26, 7));
+        $this->eo = (float) ('.'.substr($line2, 26, 7));
 
         /* Satellite's Argument of Perigee (degrees) */
         $this->omegao = (float) substr($line2, 34, 8);
@@ -145,7 +145,7 @@ 
         for ($i = 0; $i < 68; $i++) {
             if (($tle_set[$i] >= '0') && ($tle_set[$i] <= '9')) {
                 $value = $tle_set[$i] - '0';
-            } else if ($tle_set[$i] == '-' ) {
+            } else if ($tle_set[$i] == '-') {
                 $value = 1;
             } else {
                 $value = 0;
@@ -216,7 +216,7 @@ 
         for ($i = 0; $i < 68; $i++) {
             if (($line[$i] >= '0') && ($line[$i] <= '9')) {
                 $value = (int) $line[$i];
-            } else if ($line[$i] == '-' ) {
+            } else if ($line[$i] == '-') {
                 $value = 1;
             } else {
                 $value = 0;

require/libs/Predict/Predict/QTH.php

Spacing +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

Spacing +55 added lines, -55 removed lines

@@ -29,42 +29,42 @@ 
     public $nickname = null;
     public $website  = null;
 
-    public $tle      = null;   /*!< Keplerian elements */
-    public $flags    = 0;      /*!< Flags for algo ctrl */
+    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 */
+    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 */
+    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 $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)
     {
@@ -93,30 +93,30 @@ 
         $this->tle->omegao *= Predict::de2ra;
         $this->tle->xmo    *= Predict::de2ra;
         $this->tle->xincl  *= Predict::de2ra;
-        $temp = Predict::twopi / Predict::xmnpda / Predict::xmnpda;
+        $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->xno     = $this->tle->xno*$temp*Predict::xmnpda;
         $this->tle->xndt2o *= $temp;
-        $this->tle->xndd6o  = $this->tle->xndd6o * $temp / Predict::xmnpda;
+        $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;
+        $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);
+        $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) {
+        if (Predict::twopi/$xnodp/Predict::xmnpda >= .15625) {
             $this->flags |= Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
         } else {
             $this->flags &= ~Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG;
@@ -142,9 +142,9 @@ 
 
         /* 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->lon = $qth->lon*Predict::de2ra;
+            $obs_geodetic->lat = $qth->lat*Predict::de2ra;
+            $obs_geodetic->alt = $qth->alt/1000.0;
             $obs_geodetic->theta = 0;
         }
         else {
@@ -156,7 +156,7 @@ 
 
         /* execute computations */
         $sdpsgp = Predict_SGPSDP::getInstance($sat);
-        if ($sat->flags & Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
+        if ($sat->flags&Predict_SGPSDP::DEEP_SPACE_EPHEM_FLAG) {
             $sdpsgp->SDP4($sat, 0.0);
         } else {
             $sdpsgp->SGP4($sat, 0.0);
@@ -166,7 +166,7 @@ 
         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->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);
@@ -187,12 +187,12 @@ 
         $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);
+        $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;
+        $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);
@@ -256,10 +256,10 @@ 
              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) {
+        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) {
+    	} 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;
@@ -298,7 +298,7 @@ 
         $observerGeo      = new Predict_Geodetic();
         $observerGeo->lat = Predict_Math::Radians($qth->lat);
         $observerGeo->lon = Predict_Math::Radians($qth->lon);
-        $observerGeo->alt = $qth->alt * 1000;
+        $observerGeo->alt = $qth->alt*1000;
 
         // Now determine the sun and observer positions
         $observerPos      = new Predict_Vector();
@@ -311,12 +311,12 @@ 
         $observerSatPos = new Predict_Vector();
         Predict_Math::Vec_Sub($this->pos, $observerPos, $observerSatPos);
         $phaseAngle = Predict_Math::Degrees(Predict_Math::Angle($solarVector, $observerSatPos));
-        $illum      = $phaseAngle / 180;
+        $illum      = $phaseAngle/180;
 
-        $illuminationChange            = $illum / $imag['illum'];
-        $inverseSquareOfDistanceChange = pow(($imag['distance'] / $this->range), 2);
+        $illuminationChange            = $illum/$imag['illum'];
+        $inverseSquareOfDistanceChange = pow(($imag['distance']/$this->range), 2);
         $changeInMagnitude             = log(
-            $illuminationChange * $inverseSquareOfDistanceChange,
+            $illuminationChange*$inverseSquareOfDistanceChange,
             self::POGSONS_RATIO
         );
 

require/libs/Predict/Predict/Time.php

Spacing +22 added lines, -22 removed lines

@@ -42,7 +42,7 @@ 
 
         /* Modification to support Y2K */
         /* Valid 1957 through 2056     */
-        $day = self::modf($epoch * 1E-3, $year) * 1E3;
+        $day = self::modf($epoch*1E-3, $year)*1E3;
         if ($year < 57) {
             $year = $year + 2000;
         } else {
@@ -55,7 +55,7 @@ 
 
     /* Equivalent to the C modf function */
     public static function modf($x, &$ipart) {
-        $ipart = (int)$x;
+        $ipart = (int) $x;
         return $x - $ipart;
     }
 
@@ -68,12 +68,12 @@ 
         /* Astronomical Formulae for Calculators, Jean Meeus, */
         /* pages 23-25. Calculate Julian Date of 0.0 Jan year */
         $year = $year - 1;
-        $i = (int) ($year / 100);
+        $i = (int) ($year/100);
         $A = $i;
-        $i = (int) ($A / 4);
+        $i = (int) ($A/4);
         $B = (int) (2 - $A + $i);
-        $i = (int) (365.25 * $year);
-        $i += (int) (30.6001 * 14);
+        $i = (int) (365.25*$year);
+        $i += (int) (30.6001*14);
         $jdoy = $i + 1720994.5 + $B;
 
         return $jdoy;
@@ -93,7 +93,7 @@ 
         /* Modification to support Y2K */
         /* Valid 1957 through 2056     */
         $year = 0;
-        $day = self::modf($epoch * 1E-3, $year) * 1E3;
+        $day = self::modf($epoch*1E-3, $year)*1E3;
 
         if ($year < 57) {
             $year += 2000;
@@ -104,12 +104,12 @@ 
 
         $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);
+        $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);
+        return Predict_Math::FMod2p(6.3003880987*$deep_arg->ds50 + 1.72944494);
     }
 
     /* See the ThetaG doc block above */
@@ -118,11 +118,11 @@ 
         /* 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);
+        $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;
+        return Predict::twopi*$GMST/Predict::secday;
     }
 
     /**
@@ -148,7 +148,7 @@ 
      */
     public static function unix2daynum($sec, $usec = 0)
     {
-        $time = ((($sec + $usec) / 86400.0) - 3651.0);
+        $time = ((($sec + $usec)/86400.0) - 3651.0);
         return $time + 2444238.5;
     }
 
@@ -162,8 +162,8 @@ 
       /* 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);
+      $delta_et = 26.465 + 0.747622*($year - 1950) +
+                 1.886913*sin(Predict::twopi*($year - 1975)/33);
 
       return $delta_et;
     }
@@ -178,7 +178,7 @@ 
     public static function daynum2unix($dn) {
         // Converts a daynum to a UNIX timestamp
 
-        return (86400.0 * ($dn - 2444238.5 + 3651.0));
+        return (86400.0*($dn - 2444238.5 + 3651.0));
     }
 
     /**
@@ -193,7 +193,7 @@ 
     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));
+        $date = new DateTime("@".round($unix));
         $dateTimezone = new DateTimezone($zone);
         $date->setTimezone($dateTimezone);
         return $date->format($format);
@@ -210,7 +210,7 @@ 
     {
         $year = $tle->epoch_year;
         $day  = $tle->epoch_day;
-        $sec  = round(86400 * $tle->epoch_fod);
+        $sec  = round(86400*$tle->epoch_fod);
 
         $zone = new DateTimeZone('GMT');
         $date = new DateTime();
@@ -218,6 +218,6 @@ 
         $date->setDate($year, 1, 1);
         $date->setTime(0, 0, 0);
 
-        return $date->format('U') + (86400 * $day) + $sec - 86400;
+        return $date->format('U') + (86400*$day) + $sec - 86400;
     }
 }

require/libs/Predict/Predict/SGPObs.php

Spacing +34 added lines, -34 removed lines

@@ -37,18 +37,18 @@ 
 
         $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);
+        $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  */
@@ -56,7 +56,7 @@ 
     /* 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)
+    public static function Calculate_LatLonAlt($_time, Predict_Vector $pos, Predict_Geodetic $geodetic)
     {
         /* Reference:  The 1992 Astronomical Almanac, page K12. */
 
@@ -64,18 +64,18 @@ 
 
         $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);
+        $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);
+            $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*/
+        $geodetic->alt = $r/cos($geodetic->lat) - Predict::xkmper*$c; /*kilometers*/
 
         if ($geodetic->lat > Predict::pio2) {
             $geodetic->lat -= Predict::twopi;
@@ -114,34 +114,34 @@ 
         $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);
+        $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*/
+        $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 ) {
+        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)*/
+        $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;
+        $obs_set->range_rate = Predict_Math::Dot($range, $rgvel)/$range->w;
 
         /* Corrections for atmospheric refraction */
         /* Reference:  Astronomical Algorithms by Jean Meeus, pp. 101-104    */
@@ -149,7 +149,7 @@ 
         //	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*/
+            $obs_set->el = $el; /*Reset to true elevation*/
         }
     }
 }

notam-data.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 <button type="button" class="close">&times;</button>
 <?php
 
-$notamref = filter_input(INPUT_GET,'notam',FILTER_SANITIZE_STRING);
+$notamref = filter_input(INPUT_GET, 'notam', FILTER_SANITIZE_STRING);
 $notamref = urldecode($notamref);
 $NOTAM = new NOTAM();
 $notam = $NOTAM->getNOTAMbyRef($notamref);

notam-geojson.php

Spacing +11 added lines, -11 removed lines

@@ -10,24 +10,24 @@ 
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
 	if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] != '' && $_COOKIE['notamscope'] != 'All') {
-		$scope = filter_var($_COOOKIE['notamscope'],FILTER_SANITIZE_STRING);
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
+		$scope = filter_var($_COOOKIE['notamscope'], FILTER_SANITIZE_STRING);
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
 	} elseif (isset($_GET['scope']) && $_GET['scope'] != '' && $_GET['scope'] != 'All') {
-		$scope = filter_input(INPUT_GET,'scope',FILTER_SANITIZE_STRING);
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
+		$scope = filter_input(INPUT_GET, 'scope', FILTER_SANITIZE_STRING);
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
 	} else {
 		$spotter_array = $NOTAM->getAllNOTAMbyCoord($coords);
 	}
 //	$spotter_array = $NOTAM->getAllNOTAM();
 } else {
 	if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] != '' && $_COOKIE['notamscope'] != 'All') {
-		$scope = filter_var($_COOKIE['notamscope'],FILTER_SANITIZE_STRING);
+		$scope = filter_var($_COOKIE['notamscope'], FILTER_SANITIZE_STRING);
 		$spotter_array = $NOTAM->getAllNOTAMbyScope($scope);
 	} elseif (isset($_GET['scope']) && $_GET['scope'] != '' && $_GET['scope'] != 'All') {
-		$scope = filter_input(INPUT_GET,'scope',FILTER_SANITIZE_STRING);
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
+		$scope = filter_input(INPUT_GET, 'scope', FILTER_SANITIZE_STRING);
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
 	} else {
 		$spotter_array = $NOTAM->getAllNOTAM();
 	}
@@ -37,7 +37,7 @@ 
             
 if (!empty($spotter_array))
 {	  
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -46,7 +46,7 @@ 
 			$output .= '"ref": "'.$spotter_item['ref'].'",';
 			$output .= '"title": "'.$spotter_item['title'].'",';
 			$output .= '"fir": "'.$spotter_item['fir'].'",';
-			$output .= '"text": "'.str_replace(array("\r\n", "\r", "\n"),'<br />',str_replace(array('"',"\t"), '',$spotter_item['notam_text'])).'",';
+			$output .= '"text": "'.str_replace(array("\r\n", "\r", "\n"), '<br />', str_replace(array('"', "\t"), '', $spotter_item['notam_text'])).'",';
 			$output .= '"latitude": '.$spotter_item['center_latitude'].',';
 			$output .= '"longitude": '.$spotter_item['center_longitude'].',';
 			$output .= '"lower_limit": '.$spotter_item['lower_limit'].',';
@@ -85,7 +85,7 @@ 
 		    $output .= '}';
 		$output .= '},';
 	}
-	$output  = substr($output, 0, -1);
+	$output = substr($output, 0, -1);
 }
 $output .= ']}';
 

waypoints-geojson.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
 	$spotter_array = $Spotter->getAllWaypointsInfobyCoord($coords);
 } else {
 	die;
@@ -21,7 +21,7 @@ 
 if (!empty($spotter_array))
 {	  
 //	print_r($spotter_array);
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -102,7 +102,7 @@ 
 		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
+			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048); ;
 			$output .= ']';
 		    $output .= '}';
 

airspace-data.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 <button type="button" class="close">&times;</button>
 <?php
 
-$airspaceid = filter_input(INPUT_GET,'airspace',FILTER_SANITIZE_NUMBER_INT);
+$airspaceid = filter_input(INPUT_GET, 'airspace', FILTER_SANITIZE_NUMBER_INT);
 //$notamref = urldecode($notamref);
 if ($globalDBdriver == 'mysql') {
 	$query = "SELECT * FROM airspace WHERE ogr_fid = :id";
@@ -18,10 +18,10 @@ 
 try {
 	$sth = $Connection->db->prepare($query);
 	$sth->execute(array(':id' => $airspaceid));
-} catch(PDOException $e) {
+} catch (PDOException $e) {
 	echo "error";
 }
-$result=$sth->fetchAll(PDO::FETCH_ASSOC);
+$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 $airspace = $result[0];
 date_default_timezone_set('UTC');
 print '<div class="top">';