timezone

prayersconnect · Oct 31, 2023 · 94deb94 · 94deb94
1 parent b344e25
commit 94deb94
Show file tree

Hide file tree

Showing 17 changed files with 746 additions and 752 deletions.
diff --git a/package.json b/package.json
@@ -44,6 +44,7 @@
   },
   "dependencies": {
     "adhan-extended": "^6.1.0",
-    "luxon": "^3.3.0"
+    "luxon": "^3.3.0",
+    "@photostructure/tz-lookup": "^8.0.0"
   }
 }
diff --git a/src/adhan/calculate.test.ts b/src/adhan/calculate.test.ts
diff --git a/src/adhan/calculate.ts b/src/adhan/calculate.ts
diff --git a/src/adhan/calculation-methods.test.ts b/src/adhan/calculation-methods.test.ts
@@ -74,7 +74,6 @@ describe('calculatePrayerTimes', () => {
     const result = calculatePrayerTimes(date, settings);
     const formated = result?.format({
       use24HourFormat: false,
-      timezone: city.timezone,
     });
 
     expect(result?.dateTime.zoneName).toEqual(city.timezone);

diff --git a/src/adhan/calculation-methods.ts b/src/adhan/calculation-methods.ts
@@ -15,9 +15,11 @@ import {
   PrayerTimesOptions,
   CalculationMethodKey,
   AsrCalculationType,
+  ICoords,
 } from './types';
 import { DateTime } from 'luxon';
 import { PrayerAndSunnahTimes } from './prayer-and-sunnah-times';
+import { timeZoneLookup } from '../utils/timezone';
 
 export const CalculationMethods: Record<
   CalculationMethodKey,
@@ -355,6 +357,7 @@ function getPrayerTimesOptionsFromSettings(
     midnightAdjustment: midnightAdjustment ?? 0,
   };
 
+  setTimeZone(prayerTimeOptions, location);
   setRounding(prayerTimeOptions, roundingMethod);
   setAdjustments(prayerTimeOptions, settings);
   setOverrides(prayerTimeOptions, settings);
@@ -366,6 +369,12 @@ function getPrayerTimesOptionsFromSettings(
   return prayerTimeOptions;
 }
 
+function setTimeZone(prayerTimeOptions: PrayerTimesOptions, location: ICoords) {
+  if (!prayerTimeOptions.timezone) {
+    prayerTimeOptions.timezone = timeZoneLookup(location);
+  }
+}
+
 function setRounding(
   prayerTimeOptions: PrayerTimesOptions,
   roundingMethod?: typeof Rounding[keyof typeof Rounding]