Adjust calendar logic for noon and midnight events (#245)

dickermoshe · web-flow · commit 3ebea96eb57e · 2025-10-13T14:23:49.000-04:00
* Adjust calendar logic for noon and midnight events

* Fix noon condition to check for hours greater than 24
diff --git a/src/main/java/com/kosherjava/zmanim/AstronomicalCalendar.java b/src/main/java/com/kosherjava/zmanim/AstronomicalCalendar.java
@@ -650,6 +650,8 @@ protected Date getDateFromTime(double time, SolarEvent solarEvent) {
 			cal.add(Calendar.DAY_OF_MONTH, 1);
 		} else if (solarEvent == SolarEvent.MIDNIGHT && localTimeHours + hours < 12) {
 			cal.add(Calendar.DAY_OF_MONTH, 1);
+		} else if (solarEvent == SolarEvent.NOON && localTimeHours + hours > 24) {
+			cal.add(Calendar.DAY_OF_MONTH, -1);
 		}
 
 		cal.set(Calendar.HOUR_OF_DAY, hours);

Original file line number	Diff line number	Diff line change
`@@ -650,6 +650,8 @@ protected Date getDateFromTime(double time, SolarEvent solarEvent) {`
`650`	`650`	`cal.add(Calendar.DAY_OF_MONTH, 1);`
`651`	`651`	`} else if (solarEvent == SolarEvent.MIDNIGHT && localTimeHours + hours < 12) {`
`652`	`652`	`cal.add(Calendar.DAY_OF_MONTH, 1);`
	`653`	`+ } else if (solarEvent == SolarEvent.NOON && localTimeHours + hours > 24) {`
	`654`	`+ cal.add(Calendar.DAY_OF_MONTH, -1);`
`653`	`655`	`}`
`654`	`656`
`655`	`657`	`cal.set(Calendar.HOUR_OF_DAY, hours);`