Fix possible error in alwaysUp/alwaysDown

shred · Jul 3, 2019 · e7552dc · e7552dc
1 parent 142d092
commit e7552dc
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/main/java/org/shredzone/commons/suncalc/SunTimes.java b/src/main/java/org/shredzone/commons/suncalc/SunTimes.java
@@ -274,9 +274,9 @@ public SunTimes execute() {
             Double set = null;
             Double noon = null;
             Double nadir = null;
+            boolean alwaysUp = true;
+            boolean alwaysDown = true;
             double ye;
-            double noonYe = 0.0;
-            double nadirYe = 0.0;
 
             double y_minus = correctedSunHeight(jd);
 
@@ -308,15 +308,18 @@ public SunTimes execute() {
                 }
 
                 if (hour < 24) {
+                    if (y_0 > 0.0) {
+                        alwaysDown = false;
+                    } else {
+                        alwaysUp = false;
+                    }
                     double xeAbs = Math.abs(qi.getXe());
                     if (xeAbs <= 1.0) {
                         double xeHour = qi.getXe() + hour;
                         if (qi.isMaximum()) {
                             noon = xeHour;
-                            noonYe = ye;
                         } else {
                             nadir = xeHour;
-                            nadirYe = ye;
                         }
                     }
                 }
@@ -333,8 +336,8 @@ public SunTimes execute() {
                     set != null ? jd.atHour(set).getDateTruncated(getTruncatedTo()) : null,
                     noon != null ? jd.atHour(noon).getDateTruncated(getTruncatedTo()) : null,
                     nadir != null ? jd.atHour(nadir).getDateTruncated(getTruncatedTo()) : null,
-                    nadir == null || nadirYe > 0.0,
-                    noon == null || noonYe < 0.0
+                    alwaysUp,
+                    alwaysDown
                 );
         }
 

diff --git a/src/test/java/org/shredzone/commons/suncalc/Locations.java b/src/test/java/org/shredzone/commons/suncalc/Locations.java
@@ -60,4 +60,10 @@ public final class Locations {
     public static final double[] MARTINIQUE = new double[] { 14.640725, -61.0112 };
     public static final TimeZone MARTINIQUE_TZ = TimeZone.getTimeZone("America/Martinique");
 
+    /**
+     * Sydney. To test a fix for issue #14.
+     */
+    public static final double[] SYDNEY = new double[] { -33.744272, 151.231291 };
+    public static final TimeZone SYDNEY_TZ = TimeZone.getTimeZone("Australia/Sydney");
+
 }
diff --git a/src/test/java/org/shredzone/commons/suncalc/SunTimesTest.java b/src/test/java/org/shredzone/commons/suncalc/SunTimesTest.java
@@ -138,6 +138,13 @@ public void testMartinique() {
         assertTimes(t1, "2019-07-01T09:38:35Z", "2019-07-01T22:37:23Z", "2019-07-01T16:06:08Z");
     }
 
+    @Test
+    public void testSydney() {
+        SunTimes t1 = SunTimes.compute().at(SYDNEY).on(2019, 7, 3).timezone(SYDNEY_TZ)
+                .truncatedTo(Unit.SECONDS).fullCycle().execute();
+        assertTimes(t1, "2019-07-02T21:00:35Z", "2019-07-03T06:58:02Z", "2019-07-03T01:59:18Z");
+    }
+
     @Test
     public void testSequence() {
         long acceptableError = 62 * 1000L;