jcal-zmanim 1.0.9 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/JCal/Dafyomi.js +5 -5
- package/dist/JCal/Dafyomi.js.map +1 -1
- package/dist/JCal/Molad.d.ts +0 -1
- package/dist/JCal/Molad.d.ts.map +1 -1
- package/dist/JCal/Molad.js +15 -18
- package/dist/JCal/Molad.js.map +1 -1
- package/dist/JCal/PirkeiAvos.js +3 -3
- package/dist/JCal/PirkeiAvos.js.map +1 -1
- package/dist/JCal/Sedra.d.ts +1 -1
- package/dist/JCal/Sedra.js +1 -1
- package/dist/JCal/Zmanim.d.ts.map +1 -1
- package/dist/JCal/Zmanim.js +15 -16
- package/dist/JCal/Zmanim.js.map +1 -1
- package/dist/{AppUtils.d.ts → JCal/ZmanimUtils.d.ts} +8 -45
- package/dist/JCal/ZmanimUtils.d.ts.map +1 -0
- package/dist/{AppUtils.js → JCal/ZmanimUtils.js} +53 -123
- package/dist/JCal/ZmanimUtils.js.map +1 -0
- package/dist/JCal/jDate.d.ts +3 -3
- package/dist/JCal/jDate.js +23 -24
- package/dist/JCal/jDate.js.map +1 -1
- package/dist/Notifications.d.ts +9 -6
- package/dist/Notifications.d.ts.map +1 -1
- package/dist/Notifications.js +110 -130
- package/dist/Notifications.js.map +1 -1
- package/{README.md → dist/README.md} +227 -41
- package/dist/{JCal/Utils.d.ts → Utils.d.ts} +71 -10
- package/dist/Utils.d.ts.map +1 -0
- package/dist/{JCal/Utils.js → Utils.js} +175 -70
- package/dist/Utils.js.map +1 -0
- package/dist/index.js +13 -32
- package/dist/index.js.map +1 -1
- package/package.json +5 -2
- package/dist/AppUtils.d.ts.map +0 -1
- package/dist/AppUtils.js.map +0 -1
- package/dist/GeneralUtils.d.ts +0 -44
- package/dist/GeneralUtils.d.ts.map +0 -1
- package/dist/GeneralUtils.js +0 -94
- package/dist/GeneralUtils.js.map +0 -1
- package/dist/JCal/Utils.d.ts.map +0 -1
- package/dist/JCal/Utils.js.map +0 -1
- package/dist/Settings.d.ts +0 -34
- package/dist/Settings.d.ts.map +0 -1
- package/dist/Settings.js +0 -84
- package/dist/Settings.js.map +0 -1
package/dist/JCal/Dafyomi.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const Utils_js_1 =
|
|
6
|
+
const Utils_js_1 = require("../Utils.js");
|
|
7
7
|
const jDate_js_1 = __importDefault(require("./jDate.js"));
|
|
8
8
|
'use strict';
|
|
9
9
|
/** *********************************************************************************************************
|
|
@@ -25,12 +25,12 @@ class Dafyomi {
|
|
|
25
25
|
if (absoluteDate < osday)
|
|
26
26
|
return null; /* daf yomi hadn't started yet */
|
|
27
27
|
if (absoluteDate >= nsday) {
|
|
28
|
-
cno = 8 + Utils_js_1.
|
|
28
|
+
cno = 8 + Utils_js_1.Utils.toInt(((absoluteDate - nsday) / 2711));
|
|
29
29
|
dno = (absoluteDate - nsday) % 2711;
|
|
30
30
|
}
|
|
31
31
|
else {
|
|
32
|
-
cno = 1 + Utils_js_1.
|
|
33
|
-
dno = Utils_js_1.
|
|
32
|
+
cno = 1 + Utils_js_1.Utils.toInt((absoluteDate - osday) / 2702);
|
|
33
|
+
dno = Utils_js_1.Utils.toInt((absoluteDate - osday) / 2702);
|
|
34
34
|
}
|
|
35
35
|
/* Find the daf taking note that the cycle changed slightly after cycle 7. */
|
|
36
36
|
total = blatt = 0;
|
|
@@ -82,7 +82,7 @@ class Dafyomi {
|
|
|
82
82
|
static toStringHeb(jd) {
|
|
83
83
|
const d = Dafyomi.getDaf(jd);
|
|
84
84
|
if (d !== null) {
|
|
85
|
-
return d.masechet.heb + ' דף ' + Utils_js_1.
|
|
85
|
+
return d.masechet.heb + ' דף ' + Utils_js_1.Utils.toJewishNumber(d.daf);
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
}
|
package/dist/JCal/Dafyomi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dafyomi.js","sourceRoot":"","sources":["../../src/JCal/Dafyomi.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"Dafyomi.js","sourceRoot":"","sources":["../../src/JCal/Dafyomi.ts"],"names":[],"mappings":"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"}
|
package/dist/JCal/Molad.d.ts
CHANGED
|
@@ -26,7 +26,6 @@ export default class Molad {
|
|
|
26
26
|
* @param {Number} month
|
|
27
27
|
*/
|
|
28
28
|
static getString(year: number, month: number): string;
|
|
29
|
-
time(sunset: any, time: any): void;
|
|
30
29
|
/**
|
|
31
30
|
* Returns the time of the molad as a string in the format: ליל שני 20:33 12 חלקים
|
|
32
31
|
* The molad is always in Jerusalem so we use the Jerusalem sunset times
|
package/dist/JCal/Molad.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Molad.d.ts","sourceRoot":"","sources":["../../src/JCal/Molad.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,KAAK;IACtB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,IAAI,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;IAoB5F;;;;;;OAMG;IACH,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"Molad.d.ts","sourceRoot":"","sources":["../../src/JCal/Molad.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,KAAK;IACtB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,IAAI,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;IAoB5F;;;;;;OAMG;IACH,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAyBrD;;;;;;OAMG;IACH,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CAuB3D"}
|
package/dist/JCal/Molad.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const Utils_js_1 =
|
|
6
|
+
const Utils_js_1 = require("../Utils.js");
|
|
7
7
|
const jDate_js_1 = __importDefault(require("./jDate.js"));
|
|
8
8
|
const Location_js_1 = __importDefault(require("./Location.js"));
|
|
9
9
|
/**
|
|
@@ -24,15 +24,15 @@ class Molad {
|
|
|
24
24
|
if (monthAdj < 0) {
|
|
25
25
|
monthAdj += jDate_js_1.default.monthsJYear(year);
|
|
26
26
|
}
|
|
27
|
-
totalMonths = Utils_js_1.
|
|
27
|
+
totalMonths = Utils_js_1.Utils.toInt(monthAdj + 235 * Utils_js_1.Utils.toInt((year - 1) / 19) + 12 * ((year - 1) % 19) +
|
|
28
28
|
((((year - 1) % 19) * 7) + 1) / 19);
|
|
29
29
|
partsElapsed = 204 + (793 * (totalMonths % 1080));
|
|
30
|
-
hoursElapsed = 5 + (12 * totalMonths) + 793 * Utils_js_1.
|
|
31
|
-
Utils_js_1.
|
|
32
|
-
parts = Utils_js_1.
|
|
30
|
+
hoursElapsed = 5 + (12 * totalMonths) + 793 * Utils_js_1.Utils.toInt(totalMonths / 1080) +
|
|
31
|
+
Utils_js_1.Utils.toInt(partsElapsed / 1080) - 6;
|
|
32
|
+
parts = Utils_js_1.Utils.toInt((partsElapsed % 1080) + 1080 * (hoursElapsed % 24));
|
|
33
33
|
return {
|
|
34
|
-
jDate: new jDate_js_1.default((1 + (29 * Utils_js_1.
|
|
35
|
-
time: { hour: Utils_js_1.
|
|
34
|
+
jDate: new jDate_js_1.default((1 + (29 * Utils_js_1.Utils.toInt(totalMonths))) + Utils_js_1.Utils.toInt((hoursElapsed / 24))),
|
|
35
|
+
time: { hour: Utils_js_1.Utils.toInt(hoursElapsed) % 24, minute: Utils_js_1.Utils.toInt((parts % 1080) / 18), second: 0 },
|
|
36
36
|
chalakim: parts % 18
|
|
37
37
|
};
|
|
38
38
|
}
|
|
@@ -44,10 +44,10 @@ class Molad {
|
|
|
44
44
|
* @param {Number} month
|
|
45
45
|
*/
|
|
46
46
|
static getString(year, month) {
|
|
47
|
-
const molad = Molad.getMolad(month, year), zmanim = molad.jDate.getSunriseSunset(Location_js_1.default.getJerusalem()), isNight = Utils_js_1.
|
|
47
|
+
const molad = Molad.getMolad(month, year), zmanim = molad.jDate.getSunriseSunset(Location_js_1.default.getJerusalem()), isNight = Utils_js_1.Utils.isTimeAfter(zmanim.sunset, molad.time), dow = molad.jDate.getDayOfWeek();
|
|
48
48
|
let str = '';
|
|
49
49
|
if (!zmanim.sunset || isNaN(zmanim.sunset.hour)) {
|
|
50
|
-
str += Utils_js_1.
|
|
50
|
+
str += Utils_js_1.DaysOfWeekEng[dow];
|
|
51
51
|
}
|
|
52
52
|
else if (dow === 6 && isNight) {
|
|
53
53
|
str += 'Motzai Shabbos,';
|
|
@@ -56,15 +56,12 @@ class Molad {
|
|
|
56
56
|
str += 'Shabbos Night,';
|
|
57
57
|
}
|
|
58
58
|
else {
|
|
59
|
-
str += Utils_js_1.
|
|
59
|
+
str += Utils_js_1.DaysOfWeekEng[dow] + (isNight ? ' Night' : '');
|
|
60
60
|
}
|
|
61
|
-
str += ' ' + Utils_js_1.
|
|
61
|
+
str += ' ' + Utils_js_1.Utils.getTimeString(molad.time) + ' and ' +
|
|
62
62
|
molad.chalakim.toString() + ' Chalakim';
|
|
63
63
|
return str;
|
|
64
64
|
}
|
|
65
|
-
time(sunset, time) {
|
|
66
|
-
throw new Error('Method not implemented.');
|
|
67
|
-
}
|
|
68
65
|
/**
|
|
69
66
|
* Returns the time of the molad as a string in the format: ליל שני 20:33 12 חלקים
|
|
70
67
|
* The molad is always in Jerusalem so we use the Jerusalem sunset times
|
|
@@ -73,8 +70,8 @@ class Molad {
|
|
|
73
70
|
* @param {Number} month
|
|
74
71
|
*/
|
|
75
72
|
static getStringHeb(year, month) {
|
|
76
|
-
const molad = Molad.getMolad(month, year), zmanim = molad.jDate.getSunriseSunset(Location_js_1.default.getJerusalem()), isNight = Utils_js_1.
|
|
77
|
-
Utils_js_1.
|
|
73
|
+
const molad = Molad.getMolad(month, year), zmanim = molad.jDate.getSunriseSunset(Location_js_1.default.getJerusalem()), isNight = Utils_js_1.Utils.isTimeAfter(zmanim.sunset, molad.time) &&
|
|
74
|
+
Utils_js_1.Utils.isTimeAfter(molad.time, zmanim.sunrise), dow = molad.jDate.getDayOfWeek();
|
|
78
75
|
let str = '';
|
|
79
76
|
if (dow === 6) {
|
|
80
77
|
str += (isNight ? 'מוצאי שב"ק' : 'יום שב"ק');
|
|
@@ -84,9 +81,9 @@ class Molad {
|
|
|
84
81
|
}
|
|
85
82
|
else {
|
|
86
83
|
str += (isNight ? 'ליל' : 'יום') +
|
|
87
|
-
Utils_js_1.
|
|
84
|
+
Utils_js_1.DaysOfWeekHeb[dow].replace('יום', '');
|
|
88
85
|
}
|
|
89
|
-
str += ' ' + Utils_js_1.
|
|
86
|
+
str += ' ' + Utils_js_1.Utils.getTimeString(molad.time, 1, true) + ' ' +
|
|
90
87
|
molad.chalakim.toString() + ' חלקים';
|
|
91
88
|
return str;
|
|
92
89
|
}
|
package/dist/JCal/Molad.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Molad.js","sourceRoot":"","sources":["../../src/JCal/Molad.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"Molad.js","sourceRoot":"","sources":["../../src/JCal/Molad.ts"],"names":[],"mappings":"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"}
|
package/dist/JCal/PirkeiAvos.js
CHANGED
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const jDate_js_1 = __importDefault(require("./jDate.js"));
|
|
7
|
-
const Utils_js_1 =
|
|
7
|
+
const Utils_js_1 = require("../Utils.js");
|
|
8
8
|
'use strict';
|
|
9
9
|
/****************************************************************************************************************
|
|
10
10
|
* Computes the Perek/Prakim of the week for the given Shabbos.
|
|
@@ -43,7 +43,7 @@ PirkeiAvos._get1stPerek = function (jd, israel) {
|
|
|
43
43
|
shb1 = (israel ? 7 : 8) + (6 - pes1.getDayOfWeek()),
|
|
44
44
|
//What number shabbos after pesach is the current date
|
|
45
45
|
cShb = ((jMonth === 1 && jDay === (shb1 + 15)) ? 1 :
|
|
46
|
-
Utils_js_1.
|
|
46
|
+
Utils_js_1.Utils.toInt((jd.Abs - (pes1.Abs + shb1)) / 7) + 1);
|
|
47
47
|
let prk = cShb % 6;
|
|
48
48
|
if (prk === 0)
|
|
49
49
|
prk = 6;
|
|
@@ -67,7 +67,7 @@ PirkeiAvos._ellul = function (jd, israel) {
|
|
|
67
67
|
//The year/month/day/absoluteDay constructor for JDate is used for efficiency.
|
|
68
68
|
day1 = new jDate_js_1.default(jYear, 6, 1, jd.Abs - jd.Day + 1), day1DOW = day1.getDayOfWeek(), shabbos1Day = day1DOW === 6 ? 1 : ((6 - (day1DOW + 6) % 6) + 1), shabbos1Date = new jDate_js_1.default(jYear, 6, shabbos1Day, day1.Abs + shabbos1Day - 1),
|
|
69
69
|
//Which shabbos in Ellul are we working out now?
|
|
70
|
-
cShb = jDay === shabbos1Day ? 1 : Utils_js_1.
|
|
70
|
+
cShb = jDay === shabbos1Day ? 1 : Utils_js_1.Utils.toInt((jDay - shabbos1Day) / 7) + 1;
|
|
71
71
|
switch (PirkeiAvos._get1stPerek(shabbos1Date, israel)) {
|
|
72
72
|
case 1:
|
|
73
73
|
switch (cShb) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PirkeiAvos.js","sourceRoot":"","sources":["../../src/JCal/PirkeiAvos.ts"],"names":[],"mappings":";;;;;AAAA,0DAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"PirkeiAvos.js","sourceRoot":"","sources":["../../src/JCal/PirkeiAvos.ts"],"names":[],"mappings":"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"}
|
package/dist/JCal/Sedra.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import jDate from './jDate.js';
|
|
|
3
3
|
* Computes the Sedra/Sedras of the week for the given day.
|
|
4
4
|
* The property "sedras" an array of sedras (either one or two) for the given Jewish Date
|
|
5
5
|
* Sample of use to get todays sedra in Israel:
|
|
6
|
-
* const sedras = new Sedra(new jDate(
|
|
6
|
+
* const sedras = new Sedra(new jDate(), true).toString();
|
|
7
7
|
* The code was converted to javascript and tweaked by CBS.
|
|
8
8
|
* It is directly based on the C code in Danny Sadinoff's HebCal - Copyright (C) 1994.
|
|
9
9
|
* Portions of that code are Copyright (c) 2002 Michael J. Radwin. All Rights Reserved.
|
package/dist/JCal/Sedra.js
CHANGED
|
@@ -8,7 +8,7 @@ const jDate_js_1 = __importDefault(require("./jDate.js"));
|
|
|
8
8
|
* Computes the Sedra/Sedras of the week for the given day.
|
|
9
9
|
* The property "sedras" an array of sedras (either one or two) for the given Jewish Date
|
|
10
10
|
* Sample of use to get todays sedra in Israel:
|
|
11
|
-
* const sedras = new Sedra(new jDate(
|
|
11
|
+
* const sedras = new Sedra(new jDate(), true).toString();
|
|
12
12
|
* The code was converted to javascript and tweaked by CBS.
|
|
13
13
|
* It is directly based on the C code in Danny Sadinoff's HebCal - Copyright (C) 1994.
|
|
14
14
|
* Portions of that code are Copyright (c) 2002 Michael J. Radwin. All Rights Reserved.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Zmanim.d.ts","sourceRoot":"","sources":["../../src/JCal/Zmanim.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"Zmanim.d.ts","sourceRoot":"","sources":["../../src/JCal/Zmanim.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,MAAM;IACvB;;;;;;;;OAQG;IACH,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,UAAO,GAAG,QAAQ;IAiF9F;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ;IAKxD;;OAEG;IACH,MAAM,CAAC,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAWvD;;;;OAIG;IACH,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAMpF;;;OAGG;IACH,MAAM,CAAC,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;IAmB7E;;;OAGG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO;IAY3D;;;OAGG;IACH,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK,EAAE,QAAQ,EAAE,QAAQ;IAM/D;;;OAGG;IACH,MAAM,CAAC,6BAA6B,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ;IAK3E;;;OAGG;IACH,MAAM,CAAC,2BAA2B,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ;IAInE;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI;IAO3B;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAIxC;;OAEG;IACH,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM;IAIlB;;OAEG;IACH,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM;IAIlB;;OAEG;IACH,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM;IAIpB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAI3B;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ;;;;;CAe9D"}
|
package/dist/JCal/Zmanim.js
CHANGED
|
@@ -3,9 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const Utils_js_1 =
|
|
6
|
+
const Utils_js_1 = require("../Utils.js");
|
|
7
7
|
const jDate_js_1 = __importDefault(require("./jDate.js"));
|
|
8
|
-
const GeneralUtils_js_1 = require("../GeneralUtils.js");
|
|
9
8
|
/**
|
|
10
9
|
* Computes the daily Zmanim for any single date at any location.
|
|
11
10
|
* The astronomical and mathematical calculations were directly adapted from the excellent
|
|
@@ -28,7 +27,7 @@ class Zmanim {
|
|
|
28
27
|
else if (date instanceof String) {
|
|
29
28
|
date = new Date(date);
|
|
30
29
|
}
|
|
31
|
-
if (!
|
|
30
|
+
if (!Utils_js_1.Utils.isValidDate(date)) {
|
|
32
31
|
throw 'Zmanim.getSunTimes: supplied date parameter cannot be converted to a Date';
|
|
33
32
|
}
|
|
34
33
|
let sunrise, sunset, zenithDeg = 90, zenithMin = 50, lonHour = 0, longitude = 0, latitude = 0, cosLat = 0, sinLat = 0, cosZen = 0, sinDec = 0, cosDec = 0, xmRise = 0, xmSet = 0, xlRise = 0, xlSet = 0, aRise = 0, aSet = 0, ahrRise = 0, ahrSet = 0, hRise = 0, hSet = 0, tRise = 0, tSet = 0, utRise = 0, utSet = 0;
|
|
@@ -104,8 +103,8 @@ class Zmanim {
|
|
|
104
103
|
if (rise === undefined || isNaN(rise.hour) || set === undefined || isNaN(set.hour)) {
|
|
105
104
|
return { hour: NaN, minute: NaN };
|
|
106
105
|
}
|
|
107
|
-
const chatz = Utils_js_1.
|
|
108
|
-
return Utils_js_1.
|
|
106
|
+
const chatz = Utils_js_1.Utils.toInt((Utils_js_1.Utils.totalSeconds(set) - Utils_js_1.Utils.totalSeconds(rise)) / 2);
|
|
107
|
+
return Utils_js_1.Utils.addSeconds(rise, chatz);
|
|
109
108
|
}
|
|
110
109
|
/**
|
|
111
110
|
* @param {jDate | Date} date
|
|
@@ -128,10 +127,10 @@ class Zmanim {
|
|
|
128
127
|
return NaN;
|
|
129
128
|
}
|
|
130
129
|
if (offset) {
|
|
131
|
-
rise = Utils_js_1.
|
|
132
|
-
set = Utils_js_1.
|
|
130
|
+
rise = Utils_js_1.Utils.addMinutes(rise, -offset);
|
|
131
|
+
set = Utils_js_1.Utils.addMinutes(set, offset);
|
|
133
132
|
}
|
|
134
|
-
return (Utils_js_1.
|
|
133
|
+
return (Utils_js_1.Utils.totalSeconds(set) - Utils_js_1.Utils.totalSeconds(rise)) / 720;
|
|
135
134
|
}
|
|
136
135
|
/**
|
|
137
136
|
* @param {{ sunrise: any; sunset: any; }} sunTimes
|
|
@@ -139,11 +138,11 @@ class Zmanim {
|
|
|
139
138
|
*/
|
|
140
139
|
static getShaaZmanisMga(sunTimes, israel) {
|
|
141
140
|
const minutes = israel ? 90 : 72;
|
|
142
|
-
let rise = sunTimes.sunrise && Utils_js_1.
|
|
141
|
+
let rise = sunTimes.sunrise && Utils_js_1.Utils.addMinutes(sunTimes.sunrise, -minutes), set = sunTimes.sunset && Utils_js_1.Utils.addMinutes(sunTimes.sunset, minutes);
|
|
143
142
|
if (!rise || isNaN(rise.hour) || !set || isNaN(set.hour)) {
|
|
144
143
|
return NaN;
|
|
145
144
|
}
|
|
146
|
-
return (Utils_js_1.
|
|
145
|
+
return (Utils_js_1.Utils.totalSeconds(set) - Utils_js_1.Utils.totalSeconds(rise)) / 720;
|
|
147
146
|
}
|
|
148
147
|
/**
|
|
149
148
|
* @param {jDate | Date} date
|
|
@@ -164,13 +163,13 @@ class Zmanim {
|
|
|
164
163
|
* @param {Location} location
|
|
165
164
|
*/
|
|
166
165
|
static getCandleLightingFromSunset(sunset, location) {
|
|
167
|
-
return Utils_js_1.
|
|
166
|
+
return Utils_js_1.Utils.addMinutes(sunset, -(location.CandleLighting || 0));
|
|
168
167
|
}
|
|
169
168
|
/**
|
|
170
169
|
* @param {Date} date
|
|
171
170
|
*/
|
|
172
171
|
static dayOfYear(date) {
|
|
173
|
-
const month = date.getMonth(), isLeap = () => Utils_js_1.
|
|
172
|
+
const month = date.getMonth(), isLeap = () => Utils_js_1.Utils.isSecularLeapYear(date.getFullYear()), yearDay = [0, 1, 32, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335];
|
|
174
173
|
return yearDay[month + 1] + date.getDate() + ((month > 1 && isLeap()) ? 1 : 0);
|
|
175
174
|
}
|
|
176
175
|
/**
|
|
@@ -213,12 +212,12 @@ class Zmanim {
|
|
|
213
212
|
if (time < 0) {
|
|
214
213
|
time += 24;
|
|
215
214
|
}
|
|
216
|
-
let hour = Utils_js_1.
|
|
217
|
-
const minFloat = (time - hour) * 60 + 0.5, min = Utils_js_1.
|
|
218
|
-
if (Utils_js_1.
|
|
215
|
+
let hour = Utils_js_1.Utils.toInt(time);
|
|
216
|
+
const minFloat = (time - hour) * 60 + 0.5, min = Utils_js_1.Utils.toInt(minFloat), sec = Math.round(60.0 * (minFloat - min));
|
|
217
|
+
if (Utils_js_1.Utils.isDST(location, date)) {
|
|
219
218
|
hour++;
|
|
220
219
|
}
|
|
221
|
-
return Utils_js_1.
|
|
220
|
+
return Utils_js_1.Utils.fixTime({ hour: hour, minute: min, second: sec });
|
|
222
221
|
}
|
|
223
222
|
}
|
|
224
223
|
exports.default = Zmanim;
|
package/dist/JCal/Zmanim.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Zmanim.js","sourceRoot":"","sources":["../../src/JCal/Zmanim.ts"],"names":[],"mappings":";;;;;AACA,
|
|
1
|
+
{"version":3,"file":"Zmanim.js","sourceRoot":"","sources":["../../src/JCal/Zmanim.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import Location from './
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import { SunTimes, Time, ZmanToShow } from './jcal-zmanim';
|
|
1
|
+
import Location from './Location';
|
|
2
|
+
import jDate from './jDate';
|
|
3
|
+
import { SunTimes, Time, ZmanToShow } from '../jcal-zmanim';
|
|
5
4
|
type ZmanTime = {
|
|
6
5
|
date: Date;
|
|
7
6
|
location: Location;
|
|
@@ -15,15 +14,6 @@ type ZmanTime = {
|
|
|
15
14
|
shaaZmanis: number | undefined;
|
|
16
15
|
shaaZmanisMga: number | undefined;
|
|
17
16
|
};
|
|
18
|
-
export declare const DaysOfWeek: Readonly<{
|
|
19
|
-
SUNDAY: 0;
|
|
20
|
-
MONDAY: 1;
|
|
21
|
-
TUESDAY: 2;
|
|
22
|
-
WEDNESDAY: 3;
|
|
23
|
-
THURSDAY: 4;
|
|
24
|
-
FRIDAY: 5;
|
|
25
|
-
SHABBOS: 6;
|
|
26
|
-
}>;
|
|
27
17
|
export declare const WhichDaysFlags: Readonly<{
|
|
28
18
|
SUNDAY: 1;
|
|
29
19
|
MONDAY: 2;
|
|
@@ -34,23 +24,8 @@ export declare const WhichDaysFlags: Readonly<{
|
|
|
34
24
|
SHABBOS: 64;
|
|
35
25
|
YOMTOV: 128;
|
|
36
26
|
}>;
|
|
37
|
-
export default class
|
|
27
|
+
export default class ZmanimUtils {
|
|
38
28
|
static zmanTimesCache: ZmanTime[];
|
|
39
|
-
/**
|
|
40
|
-
* Returns the date corrected time of the given zmanim on the given date at the given location
|
|
41
|
-
* If the zman is after or within 30 minutes of the given time, this days zman is returned, othwise tomorrows zman is returned.
|
|
42
|
-
* @param {Date} sdate
|
|
43
|
-
* @param {jDate} jdate
|
|
44
|
-
* @param {Time} time
|
|
45
|
-
* @param {Settings} settings
|
|
46
|
-
* @param {Time} sunset
|
|
47
|
-
* @returns {[{zmanType:ZmanToShow,time:Time, isTomorrow:boolean}]}
|
|
48
|
-
*/
|
|
49
|
-
static getCorrectZmanTimes(sdate: Date, jdate: jDate, time: Time, settings: Settings, sunset: Time): {
|
|
50
|
-
zmanType: ZmanToShow;
|
|
51
|
-
time: Time;
|
|
52
|
-
isTomorrow: boolean;
|
|
53
|
-
}[];
|
|
54
29
|
/**
|
|
55
30
|
* Gets the zmanim for all the types in the given list.
|
|
56
31
|
* @param {[ZmanToShow]} zmanTypes An array of ZmanTypes to get the zman for.
|
|
@@ -69,15 +44,14 @@ export default class AppUtils {
|
|
|
69
44
|
* @param {jDate} jdate
|
|
70
45
|
* @param {Location} location
|
|
71
46
|
*/
|
|
72
|
-
static getWhichDays(date: Date, jdate: jDate, location: Location):
|
|
47
|
+
static getWhichDays(date: Date, jdate: jDate, location: Location): 2 | 0 | 1 | 8 | 32 | 4 | 16 | 64 | 128;
|
|
73
48
|
/**
|
|
74
49
|
* Returns the zmanim necessary for showing basic shul notifications: chatzosHayom, chatzosHalayla, alos
|
|
75
|
-
* @param {jDate}
|
|
76
|
-
* @param {Date} sdate
|
|
50
|
+
* @param {jDate|Date} date
|
|
77
51
|
* @param {Location} location
|
|
78
52
|
* @returns {{chatzosHayom:Time, chatzosHalayla:Time, alos:Time, shkia:Time }}
|
|
79
53
|
*/
|
|
80
|
-
static getBasicShulZmanim(
|
|
54
|
+
static getBasicShulZmanim(date: jDate | Date, location: Location): {
|
|
81
55
|
chatzosHayom: Time | undefined;
|
|
82
56
|
chatzosHalayla: Time | undefined;
|
|
83
57
|
alos: Time | undefined;
|
|
@@ -93,17 +67,6 @@ export default class AppUtils {
|
|
|
93
67
|
zmanType: ZmanToShow;
|
|
94
68
|
time?: Time | undefined;
|
|
95
69
|
}[];
|
|
96
|
-
/**
|
|
97
|
-
* Compares two zmanim for showing to see if they are the same
|
|
98
|
-
* @param {{id:number,offset:?Number, whichDaysFlags:?Number, desc: String, eng: String, heb: String }} zman1
|
|
99
|
-
* @param {{id:number,offset:?Number, whichDaysFlags:?Number, desc: String, eng: String, heb: String }} zman2
|
|
100
|
-
*/
|
|
101
|
-
static IsSameZmanToShow(zman1: ZmanToShow, zman2: ZmanToShow): boolean;
|
|
102
|
-
/**
|
|
103
|
-
* Returns all available ZmanTypes - including baseTypes and custom added types
|
|
104
|
-
* @param {Settings} settings
|
|
105
|
-
*/
|
|
106
|
-
static AllZmanTypes(settings: Settings): ZmanToShow[];
|
|
107
70
|
}
|
|
108
71
|
export {};
|
|
109
|
-
//# sourceMappingURL=
|
|
72
|
+
//# sourceMappingURL=ZmanimUtils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ZmanimUtils.d.ts","sourceRoot":"","sources":["../../src/JCal/ZmanimUtils.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5D,KAAK,QAAQ,GAAG;IACZ,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,IAAI,GAAG,SAAS,CAAC;IAC1B,MAAM,EAAE,IAAI,GAAG,SAAS,CAAC;IACzB,cAAc,EAAE,QAAQ,GAAG,SAAS,CAAC;IACrC,aAAa,EAAE,IAAI,GAAG,SAAS,CAAC;IAChC,YAAY,EAAE,IAAI,GAAG,SAAS,CAAC;IAC/B,WAAW,EAAE,IAAI,GAAG,SAAS,CAAC;IAC9B,OAAO,EAAE,IAAI,GAAG,SAAS,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC,CAAC;AACF,eAAO,MAAM,cAAc;;;;;;;;;EASzB,CAAC;AAEH,MAAM,CAAC,OAAO,OAAO,WAAW;IAC5B,MAAM,CAAC,cAAc,EAAE,QAAQ,EAAE,CAAM;IAEvC;;;;;;;OAOG;IACH,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG;QAAE,QAAQ,EAAE,UAAU,CAAC;QAAC,IAAI,CAAC,EAAE,IAAI,CAAA;KAAE,EAAE;IAkSnI;;;;;OAKG;IACH,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ;IAuBhE;;;;;OAKG;IACH,MAAM,CAAC,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ;;;;;;IAqBhE;;;;;MAKE;IACF,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ;;;;CAI7D"}
|