Index: trunk/FACT++/src/Time.cc
===================================================================
--- trunk/FACT++/src/Time.cc	(revision 15201)
+++ trunk/FACT++/src/Time.cc	(revision 15202)
@@ -28,6 +28,5 @@
 
 #ifdef HAVE_LIBNOVA
-#include <libnova/solar.h>
-#include <libnova/rise_set.h>
+#include "../externals/nova.h"
 #endif
 
@@ -308,13 +307,6 @@
 {
 #ifdef HAVE_LIBNOVA
-    const double lon = -(17.+53./60+26.525/3600);
-    const double lat =   28.+45./60+42.462/3600;
-
-    ln_lnlat_posn observer;
-    observer.lng = lon;
-    observer.lat = lat;
-
     ln_rst_time sun_day;
-    if (ln_get_solar_rst_horizon(JD()-0.5, &observer, horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()-0.5, &Nova::ORM(), horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");
 
@@ -322,5 +314,5 @@
         return Time(sun_day.rise);
 
-    if (ln_get_solar_rst_horizon(JD()-1.5, &observer, horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()-1.5, &Nova::ORM(), horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");
 
@@ -346,13 +338,6 @@
 {
 #ifdef HAVE_LIBNOVA
-    const double lon = -(17.+53./60+26.525/3600);
-    const double lat =   28.+45./60+42.462/3600;
-
-    ln_lnlat_posn observer;
-    observer.lng = lon;
-    observer.lat = lat;
-
     ln_rst_time sun_day;
-    if (ln_get_solar_rst_horizon(JD()-0.5, &observer, horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()-0.5, &Nova::ORM(), horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");
 
@@ -360,5 +345,5 @@
         return Time(sun_day.rise);
 
-    if (ln_get_solar_rst_horizon(JD()+0.5, &observer, horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()+0.5, &Nova::ORM(), horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");