mihrab-methods 1.0.2 → 1.1.0

package/docs/methods.md

@@ -110,7 +110,11 @@ statement of it that gives the tables.
 ## Morocco
 
 `src/methods/morocco.ts`. The Ministry of Habous and Islamic Affairs, read
-off its tables for 164 cities.
+off its tables for 164 cities: 96 days of 2026 for all of them, and — through
+the Internet Archive's copies of its pages — 2014 to 2025 for Rabat, Figuig,
+Tangier, Casablanca, Laayoune and a dozen more, every month of the year. The
+ministry's program changed between 2019 and 2023 (until then Asr was the
+noon shadow on the true sun); this is the program it has used since.
 
 - The sun is **Meeus's apparent sun** with the full nutation (the mean
   elements above; apparent longitude `L0 + C − 0.00569 + Δψ`, with
@@ -118,14 +122,26 @@ off its tables for 164 cities.
   and his chapter-28 equation of time
   `E = L0 − 0.0057183 − α + Δψ cos ε`, taken at **each prayer's own
   moment** (iterated), declination and equation of time alike.
-- Fajr −19°, Isha −17°, Asr one shadow length (Shafiʿi).
+- Fajr −19°, Isha −17°, true altitudes.
 - Dhuhr five minutes after the transit.
-- Sunrise 2.85 minutes before, and Maghrib 3.7 minutes after, the sun's
-  upper limb on the horizon: altitude `−(34′ + s) − dip`, with s the sun's
-  semi-diameter for its distance that day and dip the city's own horizon
-  dip — eastward at sunrise (`Place.dipDeg`), westward at Maghrib
-  (`Place.dipMaghribDeg`), each fitted from the tables with the city's
-  point; where not fitted, `0.02°·√height(m)`, and 0.86 of it at Maghrib.
+- Asr on the **apparent** sun, by the classical rule: with δ the noon
+  declination, the noon altitude `h = 90° − |φ − δ|` is raised by
+  refraction, `h' = h + R(h)`, `R(h) = 1.02′ / tan(h + 10.3/(h + 5.11))`
+  (Sæmundsson, Meeus 16.4, h in degrees); the gnomon's shadow is `cot h'`,
+  and Asr is when the apparent sun's shadow is one length more:
+  apparent altitude `a' = arctan(1 / (1 + cot h'))`, and the true altitude
+  the hour angle is solved for, `a = a' − R'(a')`,
+  `R'(a') = 1′ / tan(a' + 7.31/(a' + 4.4))` (Bennett, Meeus 16.3), with the
+  declination at the event. Hanafi takes two lengths.
+- Sunrise one minute before, and Maghrib 1.8 minutes after, the sun on the
+  altitude `−(34′ + s) − dip`, with s the sun's semi-diameter for its
+  distance that day and dip the city's own horizon allowance — eastward at
+  sunrise (`Place.dipDeg`), westward at Maghrib (`Place.dipMaghribDeg`),
+  each fitted from the tables with the city's point. It is an angle: the
+  minutes it is worth grow towards the solstices, as the ministry's do.
+  It follows the city's height (92 % correlation), and a city not fitted
+  gets `0.32° + 0.025°·√height(m)` east and `0.37° + 0.021°·√height(m)`
+  west.
 - Fajr rounded **down** to the minute, every other time to the nearest.
 - The ministry's clock is GMT+1 until 17 September 2026 and GMT from then
   on (`Place.clock`); the zone databases still move Morocco's clock, so the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mihrab-methods",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "The prayer-time authorities' own calculation methods, each reproducing its published timetable to the minute: Sweden (Diyanet, as Islamiska Förbundet prints it), Diyanet worldwide, Morocco (Habous), Algeria (Ministry of Religious Affairs), Indonesia (Kemenag).",
   "license": "MPL-2.0",
   "author": "Hassan El Ghamri",
@@ -169,6 +169,8 @@
     "precertify": "npm run embed",
     "certify": "tsx tools/certify.ts",
     "vectors": "npm run embed && tsx tools/vectors.ts",
+    "prefeed-check": "npm run embed",
+    "feed-check": "tsx tools/feed-check.ts",
     "readme": "node scripts/readme.mjs",
     "preflight": "npm run typecheck && npm test && node scripts/readme.mjs --check",
     "serve": "npm run embed && tsx tools/serve.ts"

package/dist/cjs/methods/scratch-congress.d.ts

@@ -1,87 +0,0 @@
-/**
- * The International Prayer Times Congress method (Istanbul, 2021 — the
- * Diyanet and the European Council for Fatwa and Research) as Diyanet's
- * tables realise it. Islamiska Förbundet's Swedish tables are those
- * tables, row for row, so this is Sweden's method (id 24).
- *
- * The published rules (awqatsalah.com, "Tespit Kriterleri"):
- *  - Dhuhr five minutes after transit; Asr one shadow (Dhuhr when the
- *    shadow never forms), four minutes late; sunrise seven early,
- *    Maghrib seven late ("temkin").
- *  - Neither the day nor the night is shorter than five hours.
- *  - True Fajr at 18°, true Isha at 16°. Where the 18° dawn no longer
- *    forms, the share of the night the sharia night's third took on the
- *    last day it did is carried: Isha that share of the night after
- *    Maghrib, Fajr the same share scaled by 18/16 before sunrise.
- *  - The move from true times to the carried ones is gradual, starting
- *    twenty minutes before (Isha) or after (Fajr) the takdir.
- *
- * What the tables turn out to do with them, read off Diyanet's own tables
- * for all 160 Swedish places, 2024–2027 (99.98 % of times on the printed
- * minute, the rest a fraction of a second from the rounding point):
- *  - The sun is taken once a day, at 0h UT less 45 s: Meeus's mean
- *    elements and equation of the centre, the TRUE (geometric) longitude,
- *    the apparent obliquity (mean plus nutation), the equation of time as
- *    the mean longitude less the right ascension, 0.106 s later; and
- *    two small waves by the mean longitude the formula leaves out: a few
- *    hundredths of a second on the transit, a tenth of an arc-second on
- *    the declination.
- *  - Coordinates are kept to three decimals of a degree.
- *  - Asr that never forms is printed at Dhuhr's time.
- *  - The night a share is taken of is the day's own: 24 h less the
- *    printed day, sunrise to Maghrib.
- *  - The five-hour floors hold each end separately, 150 minutes from the
- *    printed Dhuhr or from the midnight after it. Where midsummer's
- *    night is floored at both ends (to within a minute), that night
- *    anchors the season, and the floored times never step back: before
- *    midsummer no sunrise earlier than midsummer's and a floored Maghrib
- *    no earlier than the day before; after it no sunrise earlier nor
- *    Maghrib later than on any day since midsummer — and Fajr and Isha
- *    carried the same way.
- *  - The gradual transition is a straight line across the days next to
- *    the gap on which the true time lies within twenty minutes of the
- *    takdir at the gap's edge: twenty minutes away at the far end, the
- *    takdir at the edge.
- *
- * Beyond Sweden the same code gives Diyanet's tables worldwide, read off
- * them for places on six continents:
- *  - Where the dawn forms all summer but midsummer's true Isha (at 16°)
- *    falls later than the share carried from that night, midsummer is the
- *    takdir's day — a gap of one day, with its ramps (from about 44.4°
- *    north: Austria, central France, northern Bosnia).
- *  - Isha is printed at 16° in some countries and 17° in others; the
- *    high-latitude rules are worked at 16° either way (`ishaDeg`).
- *
- * Times are minutes past 0h UT of the date, a frame the clock changes
- * cannot bend; `congressTimes` turns them into instants.
- */
-/**
- * Isha's depression: the Congress's 16° (Diyanet's in much of Europe,
- * Russia, Central Asia, China and North America), or Diyanet's own 17°
- * (elsewhere). The high-latitude rules are the Congress's at 16° either way;
- * the angle sets only the true Isha printed.
- */
-export declare const CONGRESS_ISHA_DEG = 16;
-export declare const DIYANET_ISHA_DEG = 17;
-export type CongressInstants = {
-    fajr: Date;
-    sunrise: Date;
-    dhuhr: Date;
-    asr: Date;
-    maghrib: Date;
-    isha: Date;
-};
-/**
- * The Congress method's times for a calendar date (year, month 0–11, day),
- * as instants, unrounded. `asrShadow` is 1 for the standard Asr, 2 for the
- * Hanafi one; the tables print the standard. `ishaDeg` is Isha's depression:
- * 16° (the Congress's, Diyanet's in Europe and North America) or 17°
- * (Diyanet's everywhere else).
- */
-export declare function congressTimes(latitude: number, longitude: number, year: number, month: number, day: number, asrShadow?: number, ishaDeg?: number): CongressInstants;
-/** For tests and the verification tool: the year's structure as the method sees it. */
-export declare function congressYearInfo(latitude: number, longitude: number, year: number): {
-    gap: [string, string] | null;
-    ratio: number | null;
-    midsummerFloors: boolean;
-};