From db1b42de86408e4ba706815b26d5431b1fc06778 Mon Sep 17 00:00:00 2001
From: Daniel Warner <contact@danrw.com>
Date: Tue, 28 May 2013 21:28:22 +0100
Subject: [PATCH] Update so that SolarPosition class works

---
 libsgp4/Makefile.am       | 2 ++
 libsgp4/SolarPosition.cpp | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libsgp4/Makefile.am b/libsgp4/Makefile.am
index de1c866..6252e21 100644
--- a/libsgp4/Makefile.am
+++ b/libsgp4/Makefile.am
@@ -8,6 +8,7 @@ libsgp4_a_SOURCES = \
 			Observer.cpp \
 			OrbitalElements.cpp \
 			SGP4.cpp \
+			SolarPosition.cpp \
 			TimeSpan.cpp \
 			Tle.cpp \
 			Util.cpp \
@@ -22,6 +23,7 @@ include_HEADERS = CoordGeodetic.h \
 			Globals.h \
 			Observer.h \
 			SGP4.h \
+			SolarPosition.h \
 			Tle.h \
 			Util.h \
 			TimeSpan.h \
diff --git a/libsgp4/SolarPosition.cpp b/libsgp4/SolarPosition.cpp
index 33240b9..11ae82e 100644
--- a/libsgp4/SolarPosition.cpp
+++ b/libsgp4/SolarPosition.cpp
@@ -24,7 +24,7 @@
 
 Eci SolarPosition::FindPosition(const DateTime& dt)
 {
-    const double mjd = j.FromJan1_12h_1900();
+    const double mjd = dt.ToJulian() - kEPOCH_JAN1_12H_1900;
     const double year = 1900 + mjd / 365.25;
     const double T = (mjd + Delta_ET(year) / kSECONDS_PER_DAY) / 36525.0;
     const double M = Util::DegreesToRadians(Util::Wrap360(358.47583
@@ -48,12 +48,12 @@ Eci SolarPosition::FindPosition(const DateTime& dt)
                 + (0.00000164 - 0.000000503 * T) * T) * T + 0.00256 * cos(O));
     R = R * kAU;
 
-    Vector solar_position = Vector(R * cos(Lsa),
+    Vector solar_position(R * cos(Lsa),
             R * sin(Lsa) * cos(eps),
             R * sin(Lsa) * sin(eps),
             R);
 
-    return Eci(j, solar_position);
+    return Eci(dt, solar_position);
 }
 
 double SolarPosition::Delta_ET(double year) const