From 6e2de1facd7a2f412bb52e3becef2bdeef529cbc Mon Sep 17 00:00:00 2001
From: Daniel Warner <contact@danrw.com>
Date: Tue, 13 Dec 2011 22:49:01 +0000
Subject: [PATCH] Updated Observer

---
 Observer.cpp | 27 ---------------------------
 Observer.h   | 42 +++++++++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/Observer.cpp b/Observer.cpp
index 0d18413..c07dc09 100644
--- a/Observer.cpp
+++ b/Observer.cpp
@@ -2,33 +2,6 @@
 
 #include "Globals.h"
 
-/*
- * in degrees!
- */
-Observer::Observer(const double latitude, const double longitude, const double altitude)
-    : geo_(DegreesToRadians(latitude), DegreesToRadians(longitude), altitude), 
-    observers_eci_(Julian(), geo_)
-{
-}
-
-Observer::Observer(const CoordGeodetic &geo)
-    : geo_(geo), observers_eci_(Julian(), geo_)
-{
-}
-
-Observer::~Observer(void) {
-}
-
-void Observer::UpdateObserversEci(const Julian &date) {
-
-    /*
-     * if date has changed, update for new date
-     */
-    if (observers_eci_.GetDate() != date) {
-        observers_eci_ = Eci(date, geo_);
-    }
-}
-
 /*
  * calculate lookangle between the observer and the passed in Eci object
  */
diff --git a/Observer.h b/Observer.h
index 2e7553f..124e47e 100644
--- a/Observer.h
+++ b/Observer.h
@@ -6,29 +6,53 @@
 #include "Julian.h"
 #include "Eci.h"
 
-class Observer {
+class Observer
+{
 public:
-    Observer(const double latitude, const double longitude, const double altitude);
-    Observer(const CoordGeodetic &geo);
-    virtual ~Observer(void);
+    Observer(double latitude, double longitude, double altitude)
+        : geo_(latitude, longitude, altitude),
+        observers_eci_(Julian(), geo_)
+    {
+    }
 
-    void SetLocation(const CoordGeodetic& geo) {
-        geo_ = geo;
+    Observer(const CoordGeodetic &g)
+        : geo_(g), observers_eci_(Julian(), geo_)
+    {
+    }
+
+    virtual ~Observer()
+    {
+    }
+
+    void SetLocation(const CoordGeodetic& g)
+    {
+        geo_ = g;
         observers_eci_ = Eci(observers_eci_.GetDate(), geo_);
     }
 
-    CoordGeodetic GetLocation() const {
+    CoordGeodetic GetLocation() const
+    {
         return geo_;
     }
 
-    Eci GetEciPosition(const Julian &date) const {
+    Eci GetEciPosition(const Julian &date) const
+    {
         return Eci(date, geo_);
     }
 
     CoordTopographic GetLookAngle(const Eci &eci);
 
 private:
-    void UpdateObserversEci(const Julian &date);
+    void UpdateObserversEci(const Julian &date)
+    {
+        /*
+         * if date has changed, update for new date
+         */
+        if (observers_eci_.GetDate() != date)
+        {
+            observers_eci_ = Eci(date, geo_);
+        }
+    }
 
     /*
      * the observers position