Skip to content

Commit b0e4816

Browse files
authored
Remove zmanim in the ComprehensiveZmanimCalendar moved to the parent class
- getShaahZmanis72Minutes() - getTzaisGeonim8Point5Degrees() - getAlos16Point1Degrees() - getSofZmanShmaMGA72Minutes() - getSofZmanTfilaMGA72Minutes() - getTzaisGeonim8Point5Degrees()
1 parent 0abca25 commit b0e4816

File tree

1 file changed

+0
-97
lines changed

1 file changed

+0
-97
lines changed

src/main/java/com/kosherjava/zmanim/ComprehensiveZmanimCalendar.java

Lines changed: 0 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -535,23 +535,6 @@ public long getShaahZmanis60Minutes() {
535535
return getTemporalHour(getAlos60(), getTzais60());
536536
}
537537

538-
/**
539-
* Method to return a <em>shaah zmanis</em> (solar hour) according to the opinion of the <a href=
540-
* "https://en.wikipedia.org/wiki/Avraham_Gombiner">Magen Avraham (MGA)</a>. This calculation divides the day
541-
* based on the opinion of the MGA that the day runs from dawn to dusk. Dawn for this calculation is 72 minutes
542-
* before sunrise and dusk is 72 minutes after sunset. This day is split into 12 equal parts with each part
543-
* being a <em>shaah zmanis</em>. Alternate methods of calculating a <em>shaah zmanis</em> are available in the
544-
* subclass {@link ComprehensiveZmanimCalendar}.
545-
*
546-
* @return the <code>long</code> millisecond length of a <em>shaah zmanis</em>. If the calculation can't be computed
547-
* such as in the Arctic Circle where there is at least one day a year where the sun does not rise, and one
548-
* where it does not set, a {@link Long#MIN_VALUE} will be returned. See detailed explanation on top of the
549-
* {@link AstronomicalCalendar} documentation.
550-
*/
551-
public long getShaahZmanis72Minutes() {
552-
return getShaahZmanisMGA();
553-
}
554-
555538
/**
556539
* Method to return a <em>shaah zmanis</em> (temporal hour) according to the opinion of the <a href=
557540
* "https://en.wikipedia.org/wiki/Avraham_Gombiner">Magen Avraham (MGA)</a> based on <em>alos</em> being
@@ -1081,25 +1064,6 @@ public Instant getAlos19Degrees() {
10811064
public Instant getAlos19Point8Degrees() {
10821065
return getSunriseOffsetByDegrees(ZENITH_19_POINT_8);
10831066
}
1084-
1085-
/**
1086-
* Method to return <em>alos</em> (dawn) calculated when the sun is {@link #ZENITH_16_POINT_1 16.1&deg;} below the
1087-
* eastern geometric horizon before sunrise. This calculation is based on the same calculation of
1088-
* {@link #getAlos72() 72 minutes} but uses a degree-based calculation instead of 72 exact minutes. This calculation
1089-
* is based on the position of the sun 72 minutes before sunrise in Jerusalem <a href=
1090-
* "https://kosherjava.com/2022/01/12/equinox-vs-equilux-zmanim-calculations/">around the equinox / equilux</a>, which
1091-
* calculates to 16.1&deg; below {@link #GEOMETRIC_ZENITH geometric zenith}.
1092-
*
1093-
* @return the <code>Instant</code> representing <em>alos</em>. If the calculation can't be computed such as northern
1094-
* and southern locations even south of the Arctic Circle and north of the Antarctic Circle where the sun
1095-
* may not reach low enough below the horizon for this calculation, a <code>null</code> will be returned. See
1096-
* detailed explanation on top of the {@link AstronomicalCalendar} documentation.
1097-
* @see #ZENITH_16_POINT_1
1098-
* @see #getAlos72()
1099-
*/
1100-
public Instant getAlos16Point1Degrees() {
1101-
return getSunriseOffsetByDegrees(ZENITH_16_POINT_1);
1102-
}
11031067

11041068
/**
11051069
* This method returns <em>misheyakir</em> based on the position of the sun {@link #ZENITH_12_POINT_85 12.85&deg;}
@@ -1321,29 +1285,6 @@ public Instant getSofZmanShmaMGA18Degrees() {
13211285
return getSofZmanShma(getAlos18Degrees(), getTzais18Degrees(), true);
13221286
}
13231287

1324-
/**
1325-
* This method returns the latest <em>zman krias shema</em> (time to recite Shema in the morning) according to the
1326-
* opinion of the <a href="https://en.wikipedia.org/wiki/Avraham_Gombiner">Magen Avraham (MGA)</a> based on
1327-
* <em>alos</em> being {@link #getAlos72() 72} minutes before {@link #getSunriseWithElevation() sunrise}. This time is 3 {@link
1328-
* #getShaahZmanis72Minutes() <em>shaos zmaniyos</em>} (solar hours) after {@link #getAlos72() dawn} based on the opinion
1329-
* of the MGA that the day is calculated from a {@link #getAlos72() dawn} of 72 minutes before sunrise to
1330-
* {@link #getTzais72() nightfall} of 72 minutes after sunset. This returns the time of 3 * {@link
1331-
* #getShaahZmanis72Minutes()} after {@link #getAlos72() dawn}. This class returns an identical time to {@link
1332-
* #getSofZmanShmaMGA()} and is repeated here for clarity.
1333-
*
1334-
* @return the <code>Instant</code> of the latest <em>zman krias shema</em>. If the calculation can't be computed such
1335-
* as in the Arctic Circle where there is at least one day a year where the sun does not rise, and one where
1336-
* it does not set, a <code>null</code> will be returned. See detailed explanation on top of the
1337-
* {@link AstronomicalCalendar} documentation.
1338-
* @see #isUseAstronomicalChatzosForOtherZmanim()
1339-
* @see #getShaahZmanis72Minutes()
1340-
* @see #getAlos72()
1341-
* @see #getSofZmanShmaMGA()
1342-
*/
1343-
public Instant getSofZmanShmaMGA72Minutes() {
1344-
return getSofZmanShmaMGA();
1345-
}
1346-
13471288
/**
13481289
* This method returns the latest <em>zman krias shema</em> (time to recite <em>Shema</em> in the morning) according
13491290
* to the opinion of the <a href="https://en.wikipedia.org/wiki/Avraham_Gombiner">Magen Avraham (MGA)</a> based
@@ -1617,28 +1558,6 @@ public Instant getSofZmanTfilaMGA18Degrees() {
16171558
return getSofZmanTfila(getAlos18Degrees(), getTzais18Degrees(), true);
16181559
}
16191560

1620-
/**
1621-
* This method returns the latest <em>zman tfila</em> (time to recite the morning prayers) according to the opinion
1622-
* of the <a href="https://en.wikipedia.org/wiki/Avraham_Gombiner">Magen Avraham (MGA)</a> based on
1623-
* <em>alos</em> being {@link #getAlos72() 72} minutes before {@link #getSunriseWithElevation() sunrise}. This time is 4
1624-
* {@link #getShaahZmanis72Minutes() <em>shaos zmaniyos</em>} (solar hours) after {@link #getAlos72() dawn} based on
1625-
* the opinion of the MGA that the day is calculated from a {@link #getAlos72() dawn} of 72 minutes before
1626-
* sunrise to {@link #getTzais72() nightfall} of 72 minutes after sunset. This returns the time of 4 *
1627-
* {@link #getShaahZmanis72Minutes()} after {@link #getAlos72() dawn}. This class returns an identical time to
1628-
* {@link #getSofZmanTfilaMGA()} and is repeated here for clarity.
1629-
*
1630-
* @return the <code>Instant</code> of the latest <em>zman tfila</em>. If the calculation can't be computed such as in
1631-
* the Arctic Circle where there is at least one day a year where the sun does not rise, and one where it
1632-
* does not set, a <code>null</code> will be returned. See detailed explanation on top of the
1633-
* {@link AstronomicalCalendar} documentation.
1634-
* @see #getShaahZmanis72Minutes()
1635-
* @see #getAlos72()
1636-
* @see #getSofZmanShmaMGA()
1637-
*/
1638-
public Instant getSofZmanTfilaMGA72Minutes() {
1639-
return getSofZmanTfilaMGA();
1640-
}
1641-
16421561
/**
16431562
* This method returns the latest <em>zman tfila</em> (time to the morning prayers) according to the opinion of the
16441563
* <a href="https://en.wikipedia.org/wiki/Avraham_Gombiner">Magen Avraham (MGA)</a> based on <em>alos</em>
@@ -1893,7 +1812,6 @@ public Instant getMinchaGedolaAhavatShalom() {
18931812
}
18941813

18951814
/**
1896-
* FIXME check for synchronous
18971815
* This is a convenience method that returns the later of the minchaGedola passed in and {@link
18981816
* #getMinchaGedola30Minutes()}. In the winter when 1/2 of a {@link #getShaahZmanisGra() <em>shaah zmanis</em>} is less
18991817
* than 30 minutes {@link #getMinchaGedola30Minutes()} will be returned, otherwise the minchaGedola passed in will be
@@ -2713,21 +2631,6 @@ public Instant getTzaisGeonim7Point083Degrees() {
27132631
public Instant getTzaisGeonim7Point67Degrees() {
27142632
return getSunsetOffsetByDegrees(ZENITH_7_POINT_67);
27152633
}
2716-
2717-
/**
2718-
* This method returns the <em>tzais</em> (nightfall) based on the opinion of the <em>Geonim</em> calculated at the
2719-
* sun's position at {@link #ZENITH_8_POINT_5 8.5&deg;} below the western horizon.
2720-
*
2721-
* @return the <code>Instant</code> representing the time when the sun is 8.5&deg; below sea level. If the calculation
2722-
* can't be computed such as northern and southern locations even south of the Arctic Circle and north of
2723-
* the Antarctic Circle where the sun may not reach low enough below the horizon for this calculation, a
2724-
* <code>null</code> will be returned. See detailed explanation on top of the {@link AstronomicalCalendar}
2725-
* documentation.
2726-
* @see #ZENITH_8_POINT_5
2727-
*/
2728-
public Instant getTzaisGeonim8Point5Degrees() {
2729-
return getSunsetOffsetByDegrees(ZENITH_8_POINT_5);
2730-
}
27312634

27322635
/**
27332636
* This method returns the <em>tzais</em> (nightfall) based on the calculations used in the <a href=

0 commit comments

Comments
 (0)