Fix Jerusalem 40-minutes before sunset candle-lighting by using locat…

…ion.getShortName()
hebcal · Jul 31, 2020 · 5803078 · 5803078
1 parent de01746
commit 5803078
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/core",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "contributors": [
     "Eyal Schachter (https://github.com/Scimonster)",

diff --git a/src/hebcal.js b/src/hebcal.js
@@ -116,14 +116,14 @@ function getCandleLightingMinutes(options) {
   if (!options.candlelighting) {
     return undefined;
   }
-  const location = options.location || {};
   let min = 18;
-  if (location.il && location.name === 'Jerusalem') {
-    min = 40;
-  }
   if (typeof options.candleLightingMins === 'number') {
     min = Math.abs(options.candleLightingMins);
   }
+  if (options.location && options.location.getIsrael() &&
+      options.location.getShortName() === 'Jerusalem') {
+    min = 40;
+  }
   return -1 * min;
 }
 

diff --git a/src/hebcal.spec.js b/src/hebcal.spec.js
@@ -566,7 +566,7 @@ test('jerusalem40', (t) => {
     year: 2020,
     month: 1,
     noHolidays: true,
-    location: Location.lookup('Jerusalem'),
+    location: new Location(31.76904, 35.21633, true, 'Asia/Jerusalem', 'Jerusalem, Israel', 'IL'),
     candlelighting: true,
     havdalahMins: 0,
   };