Enhance code readability of alwaysUp/alwaysDown check

shred · Jul 8, 2019 · 8705e38 · 8705e38
1 parent e7552dc
commit 8705e38
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/main/java/org/shredzone/commons/suncalc/SunTimes.java b/src/main/java/org/shredzone/commons/suncalc/SunTimes.java
@@ -274,11 +274,16 @@ public SunTimes execute() {
             Double set = null;
             Double noon = null;
             Double nadir = null;
-            boolean alwaysUp = true;
-            boolean alwaysDown = true;
+            boolean alwaysUp = false;
+            boolean alwaysDown = false;
             double ye;
 
             double y_minus = correctedSunHeight(jd);
+            if (y_minus > 0.0) {
+                alwaysUp = true;
+            } else {
+                alwaysDown = true;
+            }
 
             int maxHours = fullCycle ? 365 * 24 : 24;
             for (int hour = 1; hour < maxHours; hour++) {
@@ -308,11 +313,6 @@ 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;
@@ -324,6 +324,15 @@ public SunTimes execute() {
                     }
                 }
 
+                if (hour == 23) {
+                    if (rise != null) {
+                        alwaysDown = false;
+                    }
+                    if (set != null) {
+                        alwaysUp = false;
+                    }
+                }
+
                 if (hour >= 24 && rise != null && set != null) {
                     break;
                 }