Add :year and :traditional-year to :hebrew.

Author: johanthoren

README.md

@@ -82,17 +82,19 @@ to calculate the day.
 ;; => 
 {:hebrew
  {:days-in-month 30,
-  :day-of-week 3,
+  :traditional-year 5781,
+  :day-of-week 5,
   :month-of-year 5,
   :minor-feast-day false,
-  :day-of-month 9,
+  :day-of-month 18,
+  :year 6021,
   :major-feast-day false,
   :sabbath false,
   :names
   {:month-of-year "5th",
    :traditional-month-of-year "Av",
-   :day-of-month "9th",
-   :day-of-week "3rd day of the week"},
+   :day-of-month "18th",
+   :day-of-week "5th day of the week"},
   :months-in-year 12},
  :time
  {:year
@@ -106,13 +108,13 @@ to calculate the day.
    :start-adjusted-for-polar-region false,
    :end-adjusted-for-polar-region false},
   :week
-  {:start #time/zoned-date-time "2021-08-14T19:23+03:00[Asia/Jerusalem]",
-   :end #time/zoned-date-time "2021-08-21T19:15:59+03:00[Asia/Jerusalem]",
+  {:start #time/zoned-date-time "2021-08-21T19:16+03:00[Asia/Jerusalem]",
+   :end #time/zoned-date-time "2021-08-28T19:07:59+03:00[Asia/Jerusalem]",
    :start-adjusted-for-polar-region false,
    :end-adjusted-for-polar-region false},
   :day
-  {:start #time/zoned-date-time "2021-08-16T19:21+03:00[Asia/Jerusalem]",
-   :end #time/zoned-date-time "2021-08-17T19:19:59+03:00[Asia/Jerusalem]",
+  {:start #time/zoned-date-time "2021-08-25T19:11+03:00[Asia/Jerusalem]",
+   :end #time/zoned-date-time "2021-08-26T19:09:59+03:00[Asia/Jerusalem]",
    :start-adjusted-for-polar-region false,
    :end-adjusted-for-polar-region false}}}
 ```
@@ -124,10 +126,12 @@ It too can be provided with a range of arguments which it passes on to `date`.
 ;; => 
 {:hebrew
  {:days-in-month 30,
+  :traditional-year 5781,
   :day-of-week 5,
   :month-of-year 5,
   :minor-feast-day false,
   :day-of-month 11,
+  :year 6021,
   :major-feast-day false,
   :sabbath false,
   :names
@@ -167,10 +171,12 @@ to find a `date` in.
 ;; => 
 {:hebrew
  {:days-in-month 30,
+  :traditional-year 5785,
   :day-of-week 7,
   :month-of-year 1,
   :minor-feast-day false,
   :day-of-month 14,
+  :year 6025,
   :major-feast-day
   {:name "Passover", :hebrew-name "Pesach", :day-of-feast 1, :days-in-feast 1},
   :sabbath true,

project.clj

@@ -1,4 +1,4 @@
-(defproject xyz.thoren/luminary "0.6.6-SNAPSHOT"
+(defproject xyz.thoren/luminary "0.7.0-SNAPSHOT"
   :description "Calculate dates based on the Bible and the 1st Book of Enoch."
   :url "https://github.com/johanthoren/luminary"
   :license {:name "LGPL-3.0"

src/xyz/thoren/luminary.clj

@@ -489,6 +489,18 @@
          (first)
          (inc))))
 
+(defn- hebrew-year
+  [start-of-year]
+  (let [y (tick/int (tick/year start-of-year))]
+    (+ 4000 y)))
+
+(defn- trad-jewish-year
+  [month-of-year start-of-year]
+  (let [y (tick/int (tick/year start-of-year))]
+    (if (> month-of-year 6)
+      (+ 3761 y)
+      (+ 3760 y))))
+
 (def trad-month-names
   ["Nisan" "Iyar" "Sivan" "Tammuz" "Av" "Elul" "Tishrei" "Marcheshvan" "Kislev"
    "Tevet" "Shevat" "Adar" "Adar II"])
@@ -666,11 +678,14 @@
 (defn- hebrew-date
   [lat lon y m t]
   (let [months-in-y (hebrew-months-in-year lat lon t)
+        start-of-year (first y)
         moy (hebrew-month-of-year lat lon t)
         dom (hebrew-day-of-month lat lon t)
         dow (hebrew-day-of-week lat lon t)
-        major-feast-day (major-feast-day moy dom dow (first y) (first m))]
-    {:month-of-year moy
+        major-feast-day (major-feast-day moy dom dow start-of-year (first m))]
+    {:year (hebrew-year start-of-year)
+     :traditional-year (trad-jewish-year moy start-of-year)
+     :month-of-year moy
      :months-in-year months-in-y
      :day-of-month dom
      :days-in-month (hebrew-days-in-month lat lon t)

test/xyz/thoren/luminary_test.clj

@@ -586,11 +586,15 @@
               (l/date tm-lat tm-lon
                       (apply l/zdt (flatten ["Asia/Jerusalem" args]))))]
       (let [h (r 2021 4 12 12 0)]
+        (is (= 6020 (get-in h [:hebrew :year])))
+        (is (= 5781 (get-in h [:hebrew :traditional-year])))
         (is (= 13 (get-in h [:hebrew :month-of-year])))
         (is (= 30 (get-in h [:hebrew :day-of-month])))
         (is (= 2 (get-in h [:hebrew :day-of-week])))
         (is (false? (get-in h [:hebrew :sabbath]))))
       (let [h (r 2021 4 12 23 0)]
+        (is (= 6021 (get-in h [:hebrew :year])))
+        (is (= 5781 (get-in h [:hebrew :traditional-year])))
         (is (= 1 (get-in h [:hebrew :month-of-year])))
         (is (= 1 (get-in h [:hebrew :day-of-month])))
         (is (= "Rosh Chodesh Nisan" (get-in h [:hebrew :minor-feast-day :hebrew-name])))
@@ -619,6 +623,8 @@
         (is (= "Feast of Weeks" (get-in h [:hebrew :major-feast-day :name])))
         (is (= "Sivan" (get-in h [:hebrew :names :traditional-month-of-year]))))
       (let [h (r 2021 10 6 23 0)]
+        (is (= 6021 (get-in h [:hebrew :year])))
+        (is (= 5782 (get-in h [:hebrew :traditional-year])))
         (is (= 7 (get-in h [:hebrew :month-of-year])))
         (is (= 1 (get-in h [:hebrew :day-of-month])))
         (is (= 5 (get-in h [:hebrew :day-of-week])))
@@ -675,6 +681,8 @@
         (is (= "Shushan Purim" (get-in h [:hebrew :major-feast-day :name])))
         (is (= "Adar I" (get-in h [:hebrew :names :traditional-month-of-year]))))
       (let [h (r 2021 3 26 23 0)]
+        (is (= 6020 (get-in h [:hebrew :year])))
+        (is (= 5781 (get-in h [:hebrew :traditional-year])))
         (is (= 13 (get-in h [:hebrew :month-of-year])))
         (is (= 14 (get-in h [:hebrew :day-of-month])))
         (is (= 7 (get-in h [:hebrew :day-of-week])))