warehack.ing/pg_orrery
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add v0.18.0: Saturn ring tilt, penumbral eclipse, rise/set windows, angular rate

Browse Source 
Four features, 10 new SQL functions (174 → 184 objects), 29 test suites:

Saturn ring tilt: saturn_ring_tilt() exposes sub-observer latitude B'.
planet_magnitude() for Saturn now includes Mallama & Hilton Eq. 10
ring correction (-2.60|sin B'| + 1.25 sin²B'), removing the ~1.5 mag
globe-only caveat. IAU 2000 pole direction, ecliptic J2000 projection.

Conical shadow model: Replaces cylindrical shadow with umbra/penumbra
cones using Sun's finite angular size. Four new functions:
satellite_in_penumbra(), satellite_shadow_state(),
satellite_next_penumbra_entry/exit(). Existing eclipse functions are
backward compatible via narrower (more accurate) umbra boundary.

Rise/set event windows: Three SRFs returning TABLE(event_time, event_type)
for all rise/set events within a time window — planet_rise_set_events(),
sun_rise_set_events(), moon_rise_set_events(). Follows predict_passes()
SRF pattern. Optional refracted parameter, 366-day window limit.

Angular separation rate: Vincenty formula extracted to reusable helper.
eq_angular_rate() for generic finite-difference rate, planet_angular_rate()
for solar system body convenience (1-minute dt, handles Sun/planets/Moon).
This commit is contained in:
Ryan Malloy 2026-02-27 23:52:06 -07:00
parent 08a5cdf994
commit b309980003
12 changed files with 3364 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
CLAUDE.md
View File

@ -1,9 +1,9 @@
# pg_orrery — A Database Orrery for PostgreSQL
## What This Is
A database orrery — celestial mechanics types and functions for PostgreSQL. Native C extension using PGXS, 174 SQL objects (158 user-visible functions + 16 GiST support), 9 custom types, covering satellites (SGP4/SDP4), planets (VSOP87 + optional JPL DE441), Moon (ELP2000-82B), 19 planetary moons (L1.2/TASS17/GUST86/MarsSat), stars (with proper motion and annual parallax), comets, asteroids (MPC catalog), Jupiter radio bursts, interplanetary Lambert transfers, equatorial RA/Dec coordinates with GiST-indexed angular separation, atmospheric refraction, annual stellar aberration, light-time correction, rise/set prediction (geometric + refracted) with status diagnostics, IAU constellation identification with full name lookup (Roman 1987), twilight dawn/dusk (civil/nautical/astronomical), lunar phase (angle, illumination, name, age), planet apparent magnitude (Mallama & Hilton 2018), solar elongation, planet phase fraction, satellite eclipse prediction (cylindrical shadow), observing night quality assessment, and lunar optical libration (Meeus Ch. 53).
A database orrery — celestial mechanics types and functions for PostgreSQL. Native C extension using PGXS, 184 SQL objects (168 user-visible functions + 16 GiST support), 9 custom types, covering satellites (SGP4/SDP4), planets (VSOP87 + optional JPL DE441), Moon (ELP2000-82B), 19 planetary moons (L1.2/TASS17/GUST86/MarsSat), stars (with proper motion and annual parallax), comets, asteroids (MPC catalog), Jupiter radio bursts, interplanetary Lambert transfers, equatorial RA/Dec coordinates with GiST-indexed angular separation, atmospheric refraction, annual stellar aberration, light-time correction, rise/set prediction (geometric + refracted + event windows) with status diagnostics, IAU constellation identification with full name lookup (Roman 1987), twilight dawn/dusk (civil/nautical/astronomical), lunar phase (angle, illumination, name, age), planet apparent magnitude with Saturn ring correction (Mallama & Hilton 2018), solar elongation, planet phase fraction, satellite eclipse prediction (conical shadow with penumbra), observing night quality assessment, lunar optical libration (Meeus Ch. 53), and angular separation rate.
**Current version:** 0.17.0
**Current version:** 0.18.0
**Repository:** https://git.supported.systems/warehack.ing/pg_orrery
**Documentation:** https://pg-orrery.warehack.ing
@ -11,7 +11,7 @@ A database orrery — celestial mechanics types and functions for PostgreSQL. Na
```bash
make PG_CONFIG=/usr/bin/pg_config # Compile with PGXS
sudo make install PG_CONFIG=/usr/bin/pg_config # Install extension
make installcheck PG_CONFIG=/usr/bin/pg_config # Run 28 regression test suites
make installcheck PG_CONFIG=/usr/bin/pg_config # Run 29 regression test suites
```
Requires: PostgreSQL 17 development headers, GCC, Make.
@ -27,7 +27,7 @@ Image: `git.supported.systems/warehack.ing/pg_orrery:pg17`
## Project Layout
```
pg_orrery.control # Extension metadata (version 0.17.0)
pg_orrery.control # Extension metadata (version 0.18.0)
Makefile # PGXS build + Docker targets
sql/
pg_orrery--0.1.0.sql # v0.1.0: satellite types/functions/operators
@ -47,6 +47,7 @@ sql/
pg_orrery--0.15.0.sql # v0.15.0: constellation full name, rise/set status (151 objects)
pg_orrery--0.16.0.sql # v0.16.0: twilight, lunar phase, planet magnitude (162 objects)
pg_orrery--0.17.0.sql # v0.17.0: elongation, phase, eclipse, night quality, libration (174 objects)
pg_orrery--0.18.0.sql # v0.18.0: ring tilt, penumbral eclipse, rise/set windows, angular rate (184 objects)
pg_orrery--0.1.0--0.2.0.sql # Migration: v0.1.0 → v0.2.0 (adds solar system)
pg_orrery--0.2.0--0.3.0.sql # Migration: v0.2.0 → v0.3.0 (adds DE ephemeris)
pg_orrery--0.3.0--0.4.0.sql # Migration: v0.3.0 → v0.4.0
@ -63,6 +64,7 @@ sql/
pg_orrery--0.14.0--0.15.0.sql # Migration: v0.14.0 → v0.15.0 (constellation full name, rise/set status)
pg_orrery--0.15.0--0.16.0.sql # Migration: v0.15.0 → v0.16.0 (twilight, lunar phase, planet magnitude)
pg_orrery--0.16.0--0.17.0.sql # Migration: v0.16.0 → v0.17.0 (elongation, phase, eclipse, night quality, libration)
pg_orrery--0.17.0--0.18.0.sql # Migration: v0.17.0 → v0.18.0 (ring tilt, penumbral eclipse, rise/set windows, angular rate)
src/
pg_orrery.c # PG_MODULE_MAGIC + _PG_init() (GUC registration)
types.h # All struct definitions + constants + DE body ID mapping
@ -87,14 +89,14 @@ src/
kepler_funcs.c # kepler_propagate(), comet_observe()
kepler.h # Shared Kepler solver interface (kepler_position())
orbital_elements_type.c # orbital_elements type, MPC parser, small_body_observe/equatorial/apparent()
equatorial_funcs.c # equatorial type I/O, accessors, satellite/planet/sun/moon RA/Dec
equatorial_funcs.c # equatorial type I/O, accessors, satellite/planet/sun/moon RA/Dec, angular rate
refraction_funcs.c # atmospheric_refraction(), _ext(), topo_elevation_apparent()
rise_set_funcs.c # planet/sun/moon rise/set (geometric + refracted) + twilight dawn/dusk
rise_set_funcs.c # planet/sun/moon rise/set (geometric + refracted) + twilight dawn/dusk + event window SRFs
constellation_data.h / .c # Roman (1987) IAU boundary table (CDS VI/42, 357 segments)
constellation_funcs.c # constellation() from equatorial or RA/Dec
lunar_phase_funcs.c # moon_phase_angle(), moon_illumination(), moon_phase_name(), moon_age()
magnitude_funcs.c # planet_magnitude(), solar_elongation(), planet_phase()
eclipse_funcs.c # satellite eclipse prediction (cylindrical shadow, Vallado §5.3)
magnitude_funcs.c # planet_magnitude() (with Saturn ring correction), solar_elongation(), planet_phase(), saturn_ring_tilt()
eclipse_funcs.c # satellite eclipse prediction (conical shadow with penumbra, Vallado §5.3)
libration.h / libration_funcs.c # lunar optical libration (Meeus Ch. 53)
l12.c / l12.h # L1.2 Galilean moon theory (Lieske 1998)
tass17.c / tass17.h # TASS 1.7 Saturn moon theory (Vienne & Duriez 1995)
@ -120,7 +122,7 @@ src/
PROVENANCE.md # Vendoring decision, modifications, verification
LICENSE # MIT license (Bill Gray / Project Pluto)
test/
sql/ # 27 regression test suites
sql/ # 29 regression test suites
expected/ # Expected output
data/vallado_518.json # 518 Vallado test vectors (AIAA 2006-6753-Rev1)
docs/
@ -147,7 +149,7 @@ All types are fixed-size, `STORAGE = plain`, `ALIGNMENT = double`. No TOAST over
| `orbital_elements` | 72 | Classical Keplerian elements for comets/asteroids (epoch, q, e, inc, omega, Omega, tp, H, G) |
| `equatorial` | 24 | Apparent RA (hours), Dec (degrees), distance (km) — of date |
## Function Domains (174 SQL objects)
## Function Domains (184 SQL objects)
| Domain | Theory | Key Functions | Count |
|--------|--------|---------------|-------|
@ -158,19 +160,19 @@ All types are fixed-size, `STORAGE = plain`, `ALIGNMENT = double`. No TOAST over
| Stars | J2000 + IAU 1976 precession | `star_observe()`, `star_equatorial()`, `star_observe_pm()` | 5 |
| Comets/asteroids | Two-body Keplerian + MPC | `small_body_observe()`, `small_body_equatorial()`, `oe_from_mpc()` | 19 |
| Refraction | Bennett (1982) | `atmospheric_refraction()`, `predict_passes_refracted()` | 4 |
| Equatorial spatial | Vincenty formula | `eq_angular_distance()`, `eq_within_cone()`, `<->` | 2 |
| Equatorial spatial | Vincenty formula | `eq_angular_distance()`, `eq_within_cone()`, `eq_angular_rate()`, `<->` | 4 |
| Jupiter radio | Carr et al. (1983) | `jupiter_burst_probability()` | 3 |
| Transfers | Lambert (Izzo 2015) | `lambert_transfer()`, `lambert_c3()` | 2 |
| DE ephemeris | JPL DE440/441 (optional) | `planet_observe_de()`, `*_equatorial_de()`, `*_apparent_de()` | 23 |
| GiST index (TLE) | Altitude-band approximation | `&&` (overlap), `<->` (distance) | 8 |
| GiST index (equatorial) | Spherical bounding box | `<->` (KNN ordering) | 8 |
| Rise/set | Bisection (60s scan) | `planet_next_rise()`, `sun_next_rise_refracted()`, `*_rise_set_status()` | 15 |
| Rise/set | Bisection (60s scan) | `planet_next_rise()`, `sun_next_rise_refracted()`, `*_rise_set_status()`, `*_rise_set_events()` | 18 |
| Twilight | Sun depression angles | `sun_civil_dawn()`, `sun_nautical_dusk()`, `sun_astronomical_dawn()` | 6 |
| Lunar phase | VSOP87 + ELP2000-82B geometry | `moon_phase_angle()`, `moon_illumination()`, `moon_phase_name()`, `moon_age()` | 4 |
| Planet magnitude | Mallama & Hilton (2018) | `planet_magnitude()` | 1 |
| Planet magnitude | Mallama & Hilton (2018) | `planet_magnitude()`, `saturn_ring_tilt()` | 2 |
| Solar elongation | VSOP87 geometry | `solar_elongation()` | 1 |
| Planet phase | VSOP87 geometry | `planet_phase()` | 1 |
| Satellite eclipse | Cylindrical shadow (Vallado §5.3) | `satellite_is_eclipsed()`, `satellite_next_eclipse_entry()` | 4 |
| Satellite eclipse | Conical shadow (Vallado §5.3) | `satellite_is_eclipsed()`, `satellite_next_eclipse_entry()`, `satellite_shadow_state()`, `satellite_in_penumbra()` | 8 |
| Observing quality | Composite (twilight+Moon) | `observing_night_quality()` | 1 |
| Lunar libration | Meeus (1998) Ch. 53 | `moon_libration_longitude()`, `moon_libration()`, `moon_subsolar_longitude()` | 5 |
| Constellation | Roman (1987) CDS VI/42 | `constellation()`, `constellation_full_name()` | 3 |
@ -307,7 +309,7 @@ All numerical logic is byte-identical to upstream. Verified against 518 Vallado
## Testing
28 regression test suites via `make installcheck`:
29 regression test suites via `make installcheck`:
| Suite | What it tests |
|-------|--------------|
@ -339,10 +341,11 @@ All numerical logic is byte-identical to upstream. Verified against 518 Vallado
| v015_features | constellation_full_name lookup, rise_set_status diagnostics (circumpolar/never_rises) |
| v016_features | Twilight ordering/offset/polar, lunar phase at known events, planet magnitude ranges/errors |
| v017_features | Solar elongation ranges/errors, planet phase ranges, satellite eclipse, observing night quality, lunar libration ranges, subsolar longitude |
| v018_features | Saturn ring tilt range/variation, penumbral eclipse (shadow state, penumbra precedes umbra), rise/set event windows (Sun/Moon/planet, refracted vs geometric), angular separation rate (generic + planet convenience) |
### PG Version Matrix
Test all 28 regression suites + DE reader unit test across PostgreSQL 14-18 using Docker:
Test all 29 regression suites + DE reader unit test across PostgreSQL 14-18 using Docker:
```bash
make test-matrix # Full matrix (PG 14-18)
@ -368,7 +371,7 @@ Logs saved to `test/matrix-logs/pg${ver}.log`. The script reuses the Dockerfile
Starlight docs at `docs/` — 44+ MDX pages covering all domains.
Sections: Getting Started, Guides (9 domain walkthroughs incl. DE ephemeris), Workflow Translation (Skyfield/Horizons/GMAT/Radio Jupiter Pro comparisons), Reference (all 174 SQL objects incl. DE variants, equatorial GiST, refraction, rise/set, constellation, twilight, lunar phase, planet magnitude, solar elongation, planet phase, satellite eclipse, observing quality, lunar libration), Architecture (Hamilton's principles, constant custody, observation pipeline), Performance (benchmarks).
Sections: Getting Started, Guides (9 domain walkthroughs incl. DE ephemeris), Workflow Translation (Skyfield/Horizons/GMAT/Radio Jupiter Pro comparisons), Reference (all 184 SQL objects incl. DE variants, equatorial GiST, refraction, rise/set, constellation, twilight, lunar phase, planet magnitude, Saturn ring tilt, solar elongation, planet phase, satellite eclipse with penumbra, observing quality, lunar libration, angular separation rate), Architecture (Hamilton's principles, constant custody, observation pipeline), Performance (benchmarks).
### Local Development
```bash

6
Makefile
View File

@ -15,7 +15,8 @@ DATA = sql/pg_orrery--0.1.0.sql sql/pg_orrery--0.2.0.sql sql/pg_orrery--0.1.0--0
sql/pg_orrery--0.14.0.sql sql/pg_orrery--0.13.0--0.14.0.sql \
sql/pg_orrery--0.15.0.sql sql/pg_orrery--0.14.0--0.15.0.sql \
sql/pg_orrery--0.16.0.sql sql/pg_orrery--0.15.0--0.16.0.sql \
sql/pg_orrery--0.17.0.sql sql/pg_orrery--0.16.0--0.17.0.sql
sql/pg_orrery--0.17.0.sql sql/pg_orrery--0.16.0--0.17.0.sql \
sql/pg_orrery--0.18.0.sql sql/pg_orrery--0.17.0--0.18.0.sql
# Our extension C sources
OBJS = src/pg_orrery.o src/tle_type.o src/eci_type.o src/observer_type.o \
@ -58,7 +59,8 @@ REGRESS = tle_parse sgp4_propagate coord_transforms pass_prediction gist_index c
constellation \
v015_features \
v016_features \
v017_features
v017_features \
v018_features
REGRESS_OPTS = --inputdir=test
# Pure C — no C++ runtime needed. LAPACK for OD solver (dgelss_).

2
pg_orrery.control
View File

@ -1,4 +1,4 @@
comment = 'A database orrery — celestial mechanics types and functions for PostgreSQL'
default_version = '0.17.0'
default_version = '0.18.0'
module_pathname = '$libdir/pg_orrery'
relocatable = true

92
sql/pg_orrery--0.17.0--0.18.0.sql Normal file
View File

@ -0,0 +1,92 @@
-- pg_orrery 0.17.0 -> 0.18.0: Saturn ring tilt, penumbral eclipse,
-- rise/set event windows, angular separation rate
-- ============================================================
-- Saturn ring tilt (1)
-- ============================================================
CREATE FUNCTION saturn_ring_tilt(timestamptz) RETURNS float8
AS 'MODULE_PATHNAME', 'saturn_ring_tilt'
LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
COMMENT ON FUNCTION saturn_ring_tilt(timestamptz) IS
'Sub-observer latitude B'' of Earth relative to Saturn ring plane (degrees, [-27, +27]). Uses IAU 2000 pole direction.';
-- ============================================================
-- Penumbral eclipse prediction (4)
-- ============================================================
CREATE FUNCTION satellite_in_penumbra(tle, timestamptz) RETURNS bool
AS 'MODULE_PATHNAME', 'satellite_in_penumbra'
LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
COMMENT ON FUNCTION satellite_in_penumbra(tle, timestamptz) IS
'True if the satellite is in Earth penumbral shadow (partial sunlight) at the given time.';
CREATE FUNCTION satellite_shadow_state(tle, timestamptz) RETURNS text
AS 'MODULE_PATHNAME', 'satellite_shadow_state'
LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
COMMENT ON FUNCTION satellite_shadow_state(tle, timestamptz) IS
'Shadow state of satellite: ''sunlit'', ''penumbra'', or ''umbra''. Uses conical shadow model.';
CREATE FUNCTION satellite_next_penumbra_entry(tle, timestamptz) RETURNS timestamptz
AS 'MODULE_PATHNAME', 'satellite_next_penumbra_entry'
LANGUAGE C STABLE STRICT PARALLEL SAFE;
COMMENT ON FUNCTION satellite_next_penumbra_entry(tle, timestamptz) IS
'Next time the satellite enters Earth penumbral shadow (up to 7-day search). NULL if none found.';
CREATE FUNCTION satellite_next_penumbra_exit(tle, timestamptz) RETURNS timestamptz
AS 'MODULE_PATHNAME', 'satellite_next_penumbra_exit'
LANGUAGE C STABLE STRICT PARALLEL SAFE;
COMMENT ON FUNCTION satellite_next_penumbra_exit(tle, timestamptz) IS
'Next time the satellite exits Earth penumbral shadow (up to 7-day search). NULL if none found.';
-- ============================================================
-- Rise/set event windows (3 SRFs)
-- ============================================================
CREATE FUNCTION planet_rise_set_events(
body_id int4, observer, start timestamptz, stop timestamptz,
refracted bool DEFAULT false
) RETURNS TABLE(event_time timestamptz, event_type text)
AS 'MODULE_PATHNAME', 'planet_rise_set_events'
LANGUAGE C STABLE STRICT PARALLEL SAFE
ROWS 10;
COMMENT ON FUNCTION planet_rise_set_events(int4, observer, timestamptz, timestamptz, bool) IS
'All rise and set events for a planet within a time window. Returns TABLE(event_time, event_type). Max 366-day window.';
CREATE FUNCTION sun_rise_set_events(
observer, start timestamptz, stop timestamptz,
refracted bool DEFAULT false
) RETURNS TABLE(event_time timestamptz, event_type text)
AS 'MODULE_PATHNAME', 'sun_rise_set_events'
LANGUAGE C STABLE STRICT PARALLEL SAFE
ROWS 10;
COMMENT ON FUNCTION sun_rise_set_events(observer, timestamptz, timestamptz, bool) IS
'All rise and set events for the Sun within a time window. Returns TABLE(event_time, event_type). Max 366-day window.';
CREATE FUNCTION moon_rise_set_events(
observer, start timestamptz, stop timestamptz,
refracted bool DEFAULT false
) RETURNS TABLE(event_time timestamptz, event_type text)
AS 'MODULE_PATHNAME', 'moon_rise_set_events'
LANGUAGE C STABLE STRICT PARALLEL SAFE
ROWS 10;
COMMENT ON FUNCTION moon_rise_set_events(observer, timestamptz, timestamptz, bool) IS
'All rise and set events for the Moon within a time window. Returns TABLE(event_time, event_type). Max 366-day window.';
-- ============================================================
-- Angular separation rate (2)
-- ============================================================
CREATE FUNCTION eq_angular_rate(
equatorial, equatorial, equatorial, equatorial, float8
) RETURNS float8
AS 'MODULE_PATHNAME', 'eq_angular_rate'
LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
COMMENT ON FUNCTION eq_angular_rate(equatorial, equatorial, equatorial, equatorial, float8) IS
'Rate of change of angular separation (deg/hr). Args: pos1_t0, pos2_t0, pos1_t1, pos2_t1, dt_seconds. Positive = separating, negative = approaching.';
CREATE FUNCTION planet_angular_rate(int4, int4, timestamptz) RETURNS float8
AS 'MODULE_PATHNAME', 'planet_angular_rate'
LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
COMMENT ON FUNCTION planet_angular_rate(int4, int4, timestamptz) IS
'Rate of angular separation change between two bodies (deg/hr). Body IDs: 0=Sun, 1-8=planets, 10=Moon. Uses 1-minute finite difference.';

1905
sql/pg_orrery--0.18.0.sql Normal file
View File

File diff suppressed because it is too large Load Diff

293
src/eclipse_funcs.c
View File

@ -2,13 +2,20 @@
* eclipse_funcs.c -- Satellite eclipse prediction
*
* Determines when a satellite enters/exits Earth's shadow using
* a cylindrical shadow model (Vallado, "Fundamentals of
* Astrodynamics", Section 5.3).
* a conical shadow model that accounts for the finite angular size
* of the Sun (Vallado, "Fundamentals of Astrodynamics", Section 5.3).
*
* Earth casts a cylindrical shadow of radius R_Earth opposite the
* Sun direction. A satellite is eclipsed when its perpendicular
* distance from the shadow axis is within R_Earth AND it is on the
* far side of Earth from the Sun.
* The umbra cone converges behind Earth (full shadow):
* r_umbra(d) = R_earth - d * (R_sun - R_earth) / D_sun
*
* The penumbra cone diverges (partial shadow):
* r_penumbra(d) = R_earth + d * (R_sun + R_earth) / D_sun
*
* where d is the satellite's distance along the shadow axis.
*
* Existing cylindrical-model functions (satellite_is_eclipsed, etc.)
* now use the umbra cone boundary, which is more physically accurate.
* New functions expose the penumbra zone and tri-state shadow model.
*
* Sun direction computed via VSOP87 (ecliptic J2000 -> equatorial
* J2000). TEME differs from J2000 by ~arcsec nutation residual,
@ -17,6 +24,7 @@
#include "postgres.h"
#include "fmgr.h"
#include "utils/builtins.h"
#include "utils/timestamp.h"
#include "types.h"
#include "astro_math.h"
@ -29,6 +37,10 @@ PG_FUNCTION_INFO_V1(satellite_is_eclipsed);
PG_FUNCTION_INFO_V1(satellite_next_eclipse_entry);
PG_FUNCTION_INFO_V1(satellite_next_eclipse_exit);
PG_FUNCTION_INFO_V1(satellite_eclipse_fraction);
PG_FUNCTION_INFO_V1(satellite_in_penumbra);
PG_FUNCTION_INFO_V1(satellite_shadow_state);
PG_FUNCTION_INFO_V1(satellite_next_penumbra_entry);
PG_FUNCTION_INFO_V1(satellite_next_penumbra_exit);
#define DEG_TO_RAD_EC (M_PI / 180.0)
#define RAD_TO_DEG_EC (180.0 / M_PI)
@ -37,6 +49,13 @@ PG_FUNCTION_INFO_V1(satellite_eclipse_fraction);
#define ECLIPSE_BISECT_TOL_JD (0.5 / 86400.0) /* 0.5 second */
#define ECLIPSE_SEARCH_DAYS 7.0
/* Shadow state: sunlit (no shadow), penumbra (partial), umbra (full) */
typedef enum {
SHADOW_SUNLIT = 0,
SHADOW_PENUMBRA = 1,
SHADOW_UMBRA = 2
} shadow_state_t;
/* ----------------------------------------------------------------
* Static helpers -- duplicated from pass_funcs.c per project
@ -100,29 +119,27 @@ do_propagate_ec(const pg_tle *tle, double jd, double *pos, double *vel)
/*
* Compute unit vector from Earth to Sun in equatorial J2000.
* Compute unit Sun direction AND Sun distance from Earth center.
*
* Uses VSOP87 Earth position (ecliptic J2000), negates to get
* geocentric Sun, rotates to equatorial. Returns unit vector.
* geocentric Sun, rotates to equatorial. Returns unit direction
* vector and distance in km.
*/
static void
sun_direction_equ(double jd, double sun_dir[3])
sun_direction_and_distance(double jd, double sun_dir[3], double *sun_dist_km)
{
double earth_xyz[6];
double sun_ecl[3], sun_equ[3];
double r;
GetVsop87Coor(jd, 2, earth_xyz); /* VSOP87 body 2 = Earth */
GetVsop87Coor(jd, 2, earth_xyz);
/* Geocentric Sun = -Earth heliocentric */
sun_ecl[0] = -earth_xyz[0];
sun_ecl[1] = -earth_xyz[1];
sun_ecl[2] = -earth_xyz[2];
/* Ecliptic J2000 -> equatorial J2000 */
ecliptic_to_equatorial(sun_ecl, sun_equ);
/* Normalize to unit vector */
r = sqrt(sun_equ[0] * sun_equ[0] +
sun_equ[1] * sun_equ[1] +
sun_equ[2] * sun_equ[2]);
@ -130,33 +147,50 @@ sun_direction_equ(double jd, double sun_dir[3])
sun_dir[0] = sun_equ[0] / r;
sun_dir[1] = sun_equ[1] / r;
sun_dir[2] = sun_equ[2] / r;
*sun_dist_km = r * AU_KM;
}
/*
* is_satellite_eclipsed_pos -- cylindrical shadow test
* satellite_shadow_state_pos -- cone shadow model
*
* sat_pos[3]: satellite position relative to Earth center (km, TEME/J2000)
* sun_dir[3]: unit vector from Earth toward Sun (J2000 equatorial)
* Determines whether a satellite is in sunlight, penumbra, or umbra
* using a conical shadow model that accounts for the finite angular
* size of the Sun.
*
* Eclipsed when:
* 1. sat dot sun_dir < 0 (satellite on shadow side of Earth)
* 2. perpendicular distance from shadow axis < R_Earth
* The umbra cone converges behind Earth (full shadow, smaller radius
* with distance). The penumbra cone diverges (partial shadow, larger
* radius with distance).
*
* r_umbra(d) = R_earth - d * (R_sun - R_earth) / D_sun
* r_penumbra(d) = R_earth + d * (R_sun + R_earth) / D_sun
*
* where d is the satellite's distance along the shadow axis
* (negative of projection onto Sun direction).
*/
static bool
is_satellite_eclipsed_pos(const double sat_pos[3], const double sun_dir[3])
static shadow_state_t
satellite_shadow_state_pos(const double sat_pos[3],
const double sun_dir[3],
double sun_dist_km)
{
double proj, perp[3], perp_dist;
double d; /* distance along shadow axis behind Earth */
double r_umbra, r_penumbra;
/* Project satellite position onto Sun direction */
proj = sat_pos[0] * sun_dir[0] +
sat_pos[1] * sun_dir[1] +
sat_pos[2] * sun_dir[2];
/* Satellite on Sun side of Earth = sunlit */
if (proj > 0.0)
return false; /* sunlit side of Earth */
return SHADOW_SUNLIT;
/* Perpendicular vector from shadow axis */
/* Distance behind Earth along shadow axis */
d = -proj;
/* Perpendicular distance from shadow axis */
perp[0] = sat_pos[0] - proj * sun_dir[0];
perp[1] = sat_pos[1] - proj * sun_dir[1];
perp[2] = sat_pos[2] - proj * sun_dir[2];
@ -164,30 +198,55 @@ is_satellite_eclipsed_pos(const double sat_pos[3], const double sun_dir[3])
perp[1] * perp[1] +
perp[2] * perp[2]);
return (perp_dist < WGS84_A); /* 6378.137 km */
/* Cone radii at satellite distance */
r_umbra = WGS84_A - d * (SUN_RADIUS_KM - WGS84_A) / sun_dist_km;
r_penumbra = WGS84_A + d * (SUN_RADIUS_KM + WGS84_A) / sun_dist_km;
/* Umbra cone may converge to zero -- if r_umbra < 0, satellite is
* beyond the umbral cone vertex (only penumbra possible) */
if (r_umbra > 0.0 && perp_dist < r_umbra)
return SHADOW_UMBRA;
if (perp_dist < r_penumbra)
return SHADOW_PENUMBRA;
return SHADOW_SUNLIT;
}
/*
* Compute cone shadow state at a single time.
* Returns SHADOW_SUNLIT on propagation error (conservative).
*/
static shadow_state_t
shadow_state_at_jd(const pg_tle *tle, double jd)
{
double pos[3], vel[3];
double sun_dir[3];
double sun_dist_km;
int err;
err = do_propagate_ec(tle, jd, pos, vel);
if (err != 0)
return SHADOW_SUNLIT;
sun_direction_and_distance(jd, sun_dir, &sun_dist_km);
return satellite_shadow_state_pos(pos, sun_dir, sun_dist_km);
}
/*
* eclipse_state_at_jd -- compute eclipse state at a single time
*
* Returns true if eclipsed, false if sunlit.
* Returns true if in umbra, false if sunlit or penumbra.
* Uses cone model internally (backward compatible with cylinder callers).
* Returns false on propagation error (conservative: assume sunlit).
*/
static bool
eclipse_state_at_jd(const pg_tle *tle, double jd)
{
double pos[3], vel[3];
double sun_dir[3];
int err;
err = do_propagate_ec(tle, jd, pos, vel);
if (err != 0)
return false; /* propagation failed, assume sunlit */
sun_direction_equ(jd, sun_dir);
return is_satellite_eclipsed_pos(pos, sun_dir);
return (shadow_state_at_jd(tle, jd) == SHADOW_UMBRA);
}
@ -195,7 +254,7 @@ eclipse_state_at_jd(const pg_tle *tle, double jd)
* satellite_is_eclipsed(tle, timestamptz) -> bool
*
* Point-in-time eclipse test. Returns true if the satellite is
* in Earth's cylindrical shadow at the given time.
* in Earth's umbral shadow (cone model) at the given time.
* ================================================================
*/
Datum
@ -360,3 +419,163 @@ satellite_eclipse_fraction(PG_FUNCTION_ARGS)
PG_RETURN_FLOAT8((double) eclipsed_samples / (double) total_samples);
}
/* ================================================================
* satellite_in_penumbra(tle, timestamptz) -> bool
*
* Returns true if the satellite is in Earth's penumbral zone
* (partial shadow) at the given time. False if sunlit or in
* full umbra.
* ================================================================
*/
Datum
satellite_in_penumbra(PG_FUNCTION_ARGS)
{
pg_tle *tle = (pg_tle *) PG_GETARG_POINTER(0);
int64 ts = PG_GETARG_INT64(1);
double jd;
jd = timestamptz_to_jd(ts);
PG_RETURN_BOOL(shadow_state_at_jd(tle, jd) == SHADOW_PENUMBRA);
}
/* ================================================================
* satellite_shadow_state(tle, timestamptz) -> text
*
* Returns 'sunlit', 'penumbra', or 'umbra' indicating the
* satellite's shadow state at the given time.
* ================================================================
*/
Datum
satellite_shadow_state(PG_FUNCTION_ARGS)
{
pg_tle *tle = (pg_tle *) PG_GETARG_POINTER(0);
int64 ts = PG_GETARG_INT64(1);
double jd;
shadow_state_t state;
const char *label;
jd = timestamptz_to_jd(ts);
state = shadow_state_at_jd(tle, jd);
switch (state)
{
case SHADOW_PENUMBRA: label = "penumbra"; break;
case SHADOW_UMBRA: label = "umbra"; break;
default: label = "sunlit"; break;
}
PG_RETURN_TEXT_P(cstring_to_text(label));
}
/* ================================================================
* satellite_next_penumbra_entry(tle, timestamptz) -> timestamptz
*
* Scans forward to find when the satellite next enters the
* penumbral zone (transition from sunlit to penumbra).
* Searches up to 7 days. Returns NULL if no entry found.
* ================================================================
*/
Datum
satellite_next_penumbra_entry(PG_FUNCTION_ARGS)
{
pg_tle *tle = (pg_tle *) PG_GETARG_POINTER(0);
int64 ts = PG_GETARG_INT64(1);
double jd, stop_jd;
shadow_state_t prev_state, curr_state;
double lo, hi, mid;
jd = timestamptz_to_jd(ts);
stop_jd = jd + ECLIPSE_SEARCH_DAYS;
prev_state = shadow_state_at_jd(tle, jd);
while (jd < stop_jd)
{
jd += ECLIPSE_SCAN_STEP_JD;
if (jd > stop_jd)
jd = stop_jd;
curr_state = shadow_state_at_jd(tle, jd);
/* Transition from sunlit to any shadow (penumbra or umbra) */
if (prev_state == SHADOW_SUNLIT && curr_state != SHADOW_SUNLIT)
{
lo = jd - ECLIPSE_SCAN_STEP_JD;
hi = jd;
while (hi - lo > ECLIPSE_BISECT_TOL_JD)
{
mid = (lo + hi) / 2.0;
if (shadow_state_at_jd(tle, mid) != SHADOW_SUNLIT)
hi = mid;
else
lo = mid;
}
PG_RETURN_TIMESTAMPTZ(jd_to_timestamptz((lo + hi) / 2.0));
}
prev_state = curr_state;
}
PG_RETURN_NULL();
}
/* ================================================================
* satellite_next_penumbra_exit(tle, timestamptz) -> timestamptz
*
* Scans forward to find when the satellite next exits the
* penumbral zone (transition from penumbra to sunlit).
* This is the moment the satellite fully emerges from Earth's shadow.
* Searches up to 7 days. Returns NULL if no exit found.
* ================================================================
*/
Datum
satellite_next_penumbra_exit(PG_FUNCTION_ARGS)
{
pg_tle *tle = (pg_tle *) PG_GETARG_POINTER(0);
int64 ts = PG_GETARG_INT64(1);
double jd, stop_jd;
shadow_state_t prev_state, curr_state;
double lo, hi, mid;
jd = timestamptz_to_jd(ts);
stop_jd = jd + ECLIPSE_SEARCH_DAYS;
prev_state = shadow_state_at_jd(tle, jd);
while (jd < stop_jd)
{
jd += ECLIPSE_SCAN_STEP_JD;
if (jd > stop_jd)
jd = stop_jd;
curr_state = shadow_state_at_jd(tle, jd);
/* Transition from any shadow to sunlit */
if (prev_state != SHADOW_SUNLIT && curr_state == SHADOW_SUNLIT)
{
lo = jd - ECLIPSE_SCAN_STEP_JD;
hi = jd;
while (hi - lo > ECLIPSE_BISECT_TOL_JD)
{
mid = (lo + hi) / 2.0;
if (shadow_state_at_jd(tle, mid) != SHADOW_SUNLIT)
lo = mid;
else
hi = mid;
}
PG_RETURN_TIMESTAMPTZ(jd_to_timestamptz((lo + hi) / 2.0));
}
prev_state = curr_state;
}
PG_RETURN_NULL();
}

234
src/equatorial_funcs.c
View File

@ -53,6 +53,10 @@ PG_FUNCTION_INFO_V1(make_equatorial);
PG_FUNCTION_INFO_V1(eq_angular_distance);
PG_FUNCTION_INFO_V1(eq_within_cone);
/* Angular separation rate */
PG_FUNCTION_INFO_V1(eq_angular_rate);
PG_FUNCTION_INFO_V1(planet_angular_rate);
/* ----------------------------------------------------------------
* Static helper -- observer geodetic to ECEF.
@ -412,6 +416,40 @@ make_equatorial(PG_FUNCTION_ARGS)
}
/*
* Vincenty formula for angular separation between two spherical positions.
*
* Takes RA and Dec in radians, returns separation in degrees.
* Numerically stable at all separations (0, 180, and everything between).
*
* Extracted from eq_angular_distance() for reuse by angular rate functions.
*/
static double
vincenty_separation_deg(double ra1_rad, double dec1_rad,
double ra2_rad, double dec2_rad)
{
double d_ra, cos_d_ra, sin_d_ra;
double sin_d1, cos_d1, sin_d2, cos_d2;
double num1, num2, num, den;
d_ra = ra2_rad - ra1_rad;
cos_d_ra = cos(d_ra);
sin_d_ra = sin(d_ra);
sin_d1 = sin(dec1_rad);
cos_d1 = cos(dec1_rad);
sin_d2 = sin(dec2_rad);
cos_d2 = cos(dec2_rad);
num1 = cos_d2 * sin_d_ra;
num2 = cos_d1 * sin_d2 - sin_d1 * cos_d2 * cos_d_ra;
num = sqrt(num1 * num1 + num2 * num2);
den = sin_d1 * sin_d2 + cos_d1 * cos_d2 * cos_d_ra;
return atan2(num, den) * RAD_TO_DEG;
}
/* ================================================================
* eq_angular_distance(equatorial, equatorial) -> float8
*
@ -429,25 +467,8 @@ eq_angular_distance(PG_FUNCTION_ARGS)
{
pg_equatorial *a = (pg_equatorial *) PG_GETARG_POINTER(0);
pg_equatorial *b = (pg_equatorial *) PG_GETARG_POINTER(1);
double d_ra, cos_d_ra, sin_d_ra;
double sin_d1, cos_d1, sin_d2, cos_d2;
double num1, num2, num, den;
d_ra = b->ra - a->ra;
cos_d_ra = cos(d_ra);
sin_d_ra = sin(d_ra);
sin_d1 = sin(a->dec);
cos_d1 = cos(a->dec);
sin_d2 = sin(b->dec);
cos_d2 = cos(b->dec);
num1 = cos_d2 * sin_d_ra;
num2 = cos_d1 * sin_d2 - sin_d1 * cos_d2 * cos_d_ra;
num = sqrt(num1 * num1 + num2 * num2);
den = sin_d1 * sin_d2 + cos_d1 * cos_d2 * cos_d_ra;
PG_RETURN_FLOAT8(atan2(num, den) * RAD_TO_DEG);
PG_RETURN_FLOAT8(vincenty_separation_deg(a->ra, a->dec, b->ra, b->dec));
}
@ -478,3 +499,180 @@ eq_within_cone(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(cos_sep >= cos_r);
}
/* ================================================================
* eq_angular_rate(eq1, eq2, eq1_later, eq2_later, dt_seconds) -> float8
*
* Rate of change of angular separation between two objects,
* in degrees per hour.
*
* eq1, eq2: positions of the two objects at time t
* eq1_later, eq2_later: positions at time t + dt_seconds
* dt_seconds: time step in seconds (must be > 0)
*
* Positive = separating, negative = approaching.
* Uses Vincenty formula for both separations.
* ================================================================
*/
Datum
eq_angular_rate(PG_FUNCTION_ARGS)
{
pg_equatorial *eq1 = (pg_equatorial *) PG_GETARG_POINTER(0);
pg_equatorial *eq2 = (pg_equatorial *) PG_GETARG_POINTER(1);
pg_equatorial *eq1_later = (pg_equatorial *) PG_GETARG_POINTER(2);
pg_equatorial *eq2_later = (pg_equatorial *) PG_GETARG_POINTER(3);
double dt_sec = PG_GETARG_FLOAT8(4);
double d1, d2, rate;
if (dt_sec <= 0.0)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("eq_angular_rate: dt_seconds must be positive")));
d1 = vincenty_separation_deg(eq1->ra, eq1->dec, eq2->ra, eq2->dec);
d2 = vincenty_separation_deg(eq1_later->ra, eq1_later->dec,
eq2_later->ra, eq2_later->dec);
/* degrees per hour */
rate = (d2 - d1) / (dt_sec / 3600.0);
PG_RETURN_FLOAT8(rate);
}
/* ================================================================
* planet_angular_rate(body_id1, body_id2, timestamptz) -> float8
*
* Rate of change of angular separation between two solar system
* bodies as seen from Earth, in degrees per hour.
*
* Uses 1-minute finite difference (planets move slowly enough that
* this gives sub-arcsecond accuracy; even the Moon at ~0.5 deg/hr
* displaces only ~0.008 deg per minute, well within linear regime).
*
* Body IDs: 0=Sun, 1-8=Mercury-Neptune, 10=Moon.
* Error if both body IDs are the same.
*
* Positive = separating, negative = approaching.
* ================================================================
*/
Datum
planet_angular_rate(PG_FUNCTION_ARGS)
{
int32 body_id1 = PG_GETARG_INT32(0);
int32 body_id2 = PG_GETARG_INT32(1);
int64 ts = PG_GETARG_INT64(2);
double jd, jd_later;
double earth1[6], earth2[6];
double target1_1[6], target1_2[6];
double target2_1[6], target2_2[6];
double geo1_1[3], geo1_2[3], geo2_1[3], geo2_2[3];
double ra1_1, dec1_1, dist1_1;
double ra1_2, dec1_2, dist1_2;
double ra2_1, dec2_1, dist2_1;
double ra2_2, dec2_2, dist2_2;
double equ1[3], equ2[3];
double d1, d2, rate;
/* 1-minute finite difference step */
#define RATE_DT_JD (60.0 / 86400.0)
if (body_id1 == body_id2)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("planet_angular_rate: body IDs must be different")));
jd = timestamptz_to_jd(ts);
jd_later = jd + RATE_DT_JD;
/* Get Earth position at both times */
GetVsop87Coor(jd, 2, earth1);
GetVsop87Coor(jd_later, 2, earth2);
/* Compute geocentric ecliptic positions for body 1 at both times */
if (body_id1 == BODY_SUN)
{
geo1_1[0] = -earth1[0]; geo1_1[1] = -earth1[1]; geo1_1[2] = -earth1[2];
geo1_2[0] = -earth2[0]; geo1_2[1] = -earth2[1]; geo1_2[2] = -earth2[2];
}
else if (body_id1 == BODY_MOON)
{
double moon_ecl[3];
GetElp82bCoor(jd, moon_ecl);
geo1_1[0] = moon_ecl[0]; geo1_1[1] = moon_ecl[1]; geo1_1[2] = moon_ecl[2];
GetElp82bCoor(jd_later, moon_ecl);
geo1_2[0] = moon_ecl[0]; geo1_2[1] = moon_ecl[1]; geo1_2[2] = moon_ecl[2];
}
else if (body_id1 >= BODY_MERCURY && body_id1 <= BODY_NEPTUNE && body_id1 != BODY_EARTH)
{
int vsop1 = body_id1 - 1;
GetVsop87Coor(jd, vsop1, target1_1);
GetVsop87Coor(jd_later, vsop1, target1_2);
geo1_1[0] = target1_1[0] - earth1[0];
geo1_1[1] = target1_1[1] - earth1[1];
geo1_1[2] = target1_1[2] - earth1[2];
geo1_2[0] = target1_2[0] - earth2[0];
geo1_2[1] = target1_2[1] - earth2[1];
geo1_2[2] = target1_2[2] - earth2[2];
}
else
ereport(ERROR,
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
errmsg("planet_angular_rate: body_id1 %d invalid (0=Sun,1-8=planets,10=Moon)",
body_id1)));
/* Same for body 2 */
if (body_id2 == BODY_SUN)
{
geo2_1[0] = -earth1[0]; geo2_1[1] = -earth1[1]; geo2_1[2] = -earth1[2];
geo2_2[0] = -earth2[0]; geo2_2[1] = -earth2[1]; geo2_2[2] = -earth2[2];
}
else if (body_id2 == BODY_MOON)
{
double moon_ecl[3];
GetElp82bCoor(jd, moon_ecl);
geo2_1[0] = moon_ecl[0]; geo2_1[1] = moon_ecl[1]; geo2_1[2] = moon_ecl[2];
GetElp82bCoor(jd_later, moon_ecl);
geo2_2[0] = moon_ecl[0]; geo2_2[1] = moon_ecl[1]; geo2_2[2] = moon_ecl[2];
}
else if (body_id2 >= BODY_MERCURY && body_id2 <= BODY_NEPTUNE && body_id2 != BODY_EARTH)
{
int vsop2 = body_id2 - 1;
GetVsop87Coor(jd, vsop2, target2_1);
GetVsop87Coor(jd_later, vsop2, target2_2);
geo2_1[0] = target2_1[0] - earth1[0];
geo2_1[1] = target2_1[1] - earth1[1];
geo2_1[2] = target2_1[2] - earth1[2];
geo2_2[0] = target2_2[0] - earth2[0];
geo2_2[1] = target2_2[1] - earth2[1];
geo2_2[2] = target2_2[2] - earth2[2];
}
else
ereport(ERROR,
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
errmsg("planet_angular_rate: body_id2 %d invalid (0=Sun,1-8=planets,10=Moon)",
body_id2)));
/* Convert geocentric ecliptic to equatorial, get RA/Dec */
ecliptic_to_equatorial(geo1_1, equ1);
cartesian_to_spherical(equ1, &ra1_1, &dec1_1, &dist1_1);
ecliptic_to_equatorial(geo1_2, equ2);
cartesian_to_spherical(equ2, &ra1_2, &dec1_2, &dist1_2);
ecliptic_to_equatorial(geo2_1, equ1);
cartesian_to_spherical(equ1, &ra2_1, &dec2_1, &dist2_1);
ecliptic_to_equatorial(geo2_2, equ2);
cartesian_to_spherical(equ2, &ra2_2, &dec2_2, &dist2_2);
/* Angular separation at both times */
d1 = vincenty_separation_deg(ra1_1, dec1_1, ra2_1, dec2_1);
d2 = vincenty_separation_deg(ra1_2, dec1_2, ra2_2, dec2_2);
/* Rate in degrees per hour (dt = 60 seconds = 1/60 hour) */
rate = (d2 - d1) / (60.0 / 3600.0);
PG_RETURN_FLOAT8(rate);
}

103
src/magnitude_funcs.c
View File

@ -22,6 +22,7 @@
PG_FUNCTION_INFO_V1(planet_magnitude);
PG_FUNCTION_INFO_V1(solar_elongation);
PG_FUNCTION_INFO_V1(planet_phase);
PG_FUNCTION_INFO_V1(saturn_ring_tilt);
/*
@ -32,9 +33,8 @@ PG_FUNCTION_INFO_V1(planet_phase);
* small vs large phase angles. Jupiter is piecewise at 12 deg.
* Saturn, Uranus, Neptune use simpler models.
*
* Saturn caveat: ring tilt contribution (their Eq. 10) requires
* saturnicentric sub-observer latitude, which we don't compute.
* We use the globe-only model (Eq. 11/12) — error up to ~1.5 mag.
* Saturn: globe model (Eq. 11/12) plus ring tilt correction (Eq. 10)
* using IAU 2000 Saturn pole direction for sub-observer latitude B'.
*/
static double
@ -81,7 +81,7 @@ phase_correction(int body_id, double i)
- 1.876 * a * a * a * a * a);
}
case 6: /* Saturn: globe-only (Eq. 11), no ring tilt */
case 6: /* Saturn: globe phase (Eq. 11/12), ring tilt added in planet_magnitude() */
if (i <= 6.5)
return -3.7e-04 * i + 6.16e-04 * i2;
else
@ -115,7 +115,7 @@ static const double planet_v10[] = {
[3] = 0.0, /* Earth: unused */
[4] = -1.601, /* Mars (i <= 50; piecewise shifts in phase_correction) */
[5] = -9.395, /* Jupiter (i <= 12; piecewise shifts in phase_correction) */
[6] = -8.95, /* Saturn (globe-only) */
[6] = -8.95, /* Saturn (globe + ring) */
[7] = -7.110, /* Uranus */
[8] = -7.00, /* Neptune */
};
@ -134,6 +134,7 @@ typedef struct
double delta; /* Earth-Planet distance (AU) */
double R; /* Sun-Earth distance (AU) */
double i_deg; /* Phase angle, degrees (Sun-Planet-Earth vertex) */
double gv[3]; /* geocentric ecliptic J2000 (AU) — for Saturn ring tilt */
} planet_geometry;
static void
@ -157,6 +158,9 @@ compute_planet_geometry(int body_id, double jd, planet_geometry *geo)
gv[1] = planet_xyz[1] - earth_xyz[1];
gv[2] = planet_xyz[2] - earth_xyz[2];
geo->delta = sqrt(gv[0] * gv[0] + gv[1] * gv[1] + gv[2] * gv[2]);
geo->gv[0] = gv[0];
geo->gv[1] = gv[1];
geo->gv[2] = gv[2];
/* Sun-Earth distance */
geo->R = sqrt(earth_xyz[0] * earth_xyz[0] +
@ -172,6 +176,54 @@ compute_planet_geometry(int body_id, double jd, planet_geometry *geo)
}
/*
* Saturn pole direction in ecliptic J2000.
*
* IAU 2000 pole: RA0 = 40.589 deg, Dec0 = 83.537 deg (equatorial J2000).
* Converted to ecliptic J2000 via rotation by obliquity.
*
* ecl_x = cos(dec)*cos(ra)
* ecl_y = cos(dec)*sin(ra)*cos(eps) + sin(dec)*sin(eps)
* ecl_z = -cos(dec)*sin(ra)*sin(eps) + sin(dec)*cos(eps)
*
* Pre-computed unit vector (constant across timescales relevant here).
*/
static const double saturn_pole_ecl[3] = {
0.08547883, /* x: cos(83.537)*cos(40.589) */
0.46244181, /* y: cos(83.537)*sin(40.589)*cos(23.4393) + sin(83.537)*sin(23.4393) */
0.88251965 /* z: -cos(83.537)*sin(40.589)*sin(23.4393) + sin(83.537)*cos(23.4393) */
};
/*
* Compute sub-observer latitude of Earth relative to Saturn's ring plane.
*
* B' = arcsin(dot(geocentric_unit_vector, saturn_pole_ecl))
*
* When |B'| is large, rings are maximally tilted toward Earth (brighter).
* When B' ~ 0, rings are edge-on (dimmest, nearly invisible).
* Range: [-27, +27] deg (Saturn's axial tilt is 26.73 deg).
*/
static double
compute_ring_tilt(const double gv[3], double delta)
{
double gv_unit[3];
double dot;
gv_unit[0] = gv[0] / delta;
gv_unit[1] = gv[1] / delta;
gv_unit[2] = gv[2] / delta;
dot = gv_unit[0] * saturn_pole_ecl[0] +
gv_unit[1] * saturn_pole_ecl[1] +
gv_unit[2] * saturn_pole_ecl[2];
if (dot > 1.0) dot = 1.0;
if (dot < -1.0) dot = -1.0;
return asin(dot); /* radians */
}
/*
* Validate planet body_id for magnitude/elongation/phase.
* Must be 1-8 (Mercury-Neptune), not 3 (Earth).
@ -201,9 +253,8 @@ validate_planet_body_id(int body_id, const char *func_name)
*
* Body IDs: 1=Mercury, ..., 8=Neptune (not Sun 0, Earth 3, or Moon 10)
*
* NOTE: Saturn magnitude does not account for ring tilt, which
* can vary the apparent magnitude by ~1.5 mag. The returned value
* is approximate for Saturn.
* Saturn includes ring tilt correction (Eq. 10) using the IAU 2000
* pole direction and VSOP87 geometry.
* ================================================================
*/
Datum
@ -224,6 +275,15 @@ planet_magnitude(PG_FUNCTION_ARGS)
+ 5.0 * log10(geo.r * geo.delta)
+ phase_correction(body_id, geo.i_deg);
/* Saturn ring tilt correction -- Mallama & Hilton (2018) Eq. 10 */
if (body_id == BODY_SATURN)
{
double Bp = compute_ring_tilt(geo.gv, geo.delta);
double sin_Bp = fabs(sin(Bp));
double sin2_Bp = sin(Bp) * sin(Bp);
V += -2.60 * sin_Bp + 1.25 * sin2_Bp;
}
PG_RETURN_FLOAT8(V);
}
@ -296,3 +356,30 @@ planet_phase(PG_FUNCTION_ARGS)
PG_RETURN_FLOAT8(k);
}
/* ================================================================
* saturn_ring_tilt(timestamptz) -> float8
*
* Sub-observer latitude of Earth relative to Saturn's ring plane,
* in degrees [-27, +27]. Indicates how much the rings are tilted
* toward Earth at the given time.
*
* Near 0: rings edge-on (ring crossing events, e.g. 2025 March).
* Near +/-27: rings maximally open (brightest configuration).
*
* Uses IAU 2000 Saturn pole and VSOP87 Earth-Saturn geometry.
* ================================================================
*/
Datum
saturn_ring_tilt(PG_FUNCTION_ARGS)
{
int64 ts = PG_GETARG_INT64(0);
double jd;
planet_geometry geo;
jd = timestamptz_to_jd(ts);
compute_planet_geometry(BODY_SATURN, jd, &geo);
PG_RETURN_FLOAT8(compute_ring_tilt(geo.gv, geo.delta) * RAD_TO_DEG);
}

203
src/rise_set_funcs.c
View File

@ -15,6 +15,9 @@
#include "postgres.h"
#include "fmgr.h"
#include "funcapi.h"
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "utils/timestamp.h"
#include "utils/builtins.h"
#include "types.h"
@ -44,10 +47,14 @@ PG_FUNCTION_INFO_V1(sun_nautical_dawn);
PG_FUNCTION_INFO_V1(sun_nautical_dusk);
PG_FUNCTION_INFO_V1(sun_astronomical_dawn);
PG_FUNCTION_INFO_V1(sun_astronomical_dusk);
PG_FUNCTION_INFO_V1(planet_rise_set_events);
PG_FUNCTION_INFO_V1(sun_rise_set_events);
PG_FUNCTION_INFO_V1(moon_rise_set_events);
#define COARSE_STEP_JD (60.0 / 86400.0) /* 60 seconds */
#define BISECT_TOL_JD (0.1 / 86400.0) /* 0.1 second */
#define DEFAULT_WINDOW_DAYS 7.0
#define MAX_WINDOW_DAYS 366.0
/* body_type encoding for the elevation helper */
#define BTYPE_PLANET 0
@ -869,3 +876,199 @@ sun_astronomical_dusk(PG_FUNCTION_ARGS)
PG_RETURN_TIMESTAMPTZ(jd_to_timestamptz(result_jd));
}
/* ================================================================
* Rise/set event window SRFs
*
* Returns a stream of (event_time timestamptz, event_type text) rows
* for rise and set events within a time window. Follows the
* predict_passes() SRF pattern from pass_funcs.c.
* ================================================================
*/
typedef struct
{
int body_type; /* BTYPE_PLANET, BTYPE_SUN, BTYPE_MOON */
int body_id;
pg_observer obs;
double current_jd;
double stop_jd;
double threshold_rad;
bool looking_for_rise;
} rise_set_events_ctx;
/*
* Shared SRF implementation for all body types.
* The first call initializes context; subsequent calls find events.
*/
static Datum
rise_set_events_internal(PG_FUNCTION_ARGS, int body_type, int body_id_arg_idx)
{
FuncCallContext *funcctx;
rise_set_events_ctx *ctx;
if (SRF_IS_FIRSTCALL())
{
MemoryContext oldctx;
TupleDesc tupdesc;
pg_observer *obs;
int64 start_ts, stop_ts;
bool refracted;
double start_jd, stop_jd;
double threshold;
double init_el;
int body_id = 0;
funcctx = SRF_FIRSTCALL_INIT();
oldctx = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
/* Parse arguments based on body type */
if (body_type == BTYPE_PLANET)
{
body_id = PG_GETARG_INT32(0);
obs = (pg_observer *) PG_GETARG_POINTER(1);
start_ts = PG_GETARG_INT64(2);
stop_ts = PG_GETARG_INT64(3);
refracted = (PG_NARGS() > 4 && !PG_ARGISNULL(4))
? PG_GETARG_BOOL(4) : false;
if (body_id < BODY_MERCURY || body_id > BODY_NEPTUNE)
ereport(ERROR,
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
errmsg("planet_rise_set_events: body_id %d must be 1-8",
body_id)));
if (body_id == BODY_EARTH)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot observe Earth from Earth")));
}
else
{
obs = (pg_observer *) PG_GETARG_POINTER(0);
start_ts = PG_GETARG_INT64(1);
stop_ts = PG_GETARG_INT64(2);
refracted = (PG_NARGS() > 3 && !PG_ARGISNULL(3))
? PG_GETARG_BOOL(3) : false;
}
start_jd = timestamptz_to_jd(start_ts);
stop_jd = timestamptz_to_jd(stop_ts);
if (stop_jd <= start_jd)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("stop time must be after start time")));
if (stop_jd - start_jd > MAX_WINDOW_DAYS)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("window exceeds 366-day maximum")));
/* Determine threshold based on refraction and body type */
if (refracted)
{
if (body_type == BTYPE_PLANET)
threshold = REFRACTION_ONLY_HORIZON_RAD;
else
threshold = SUN_MOON_REFRACTED_HORIZON_RAD;
}
else
threshold = 0.0;
/* Build output tuple descriptor */
if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("function returning record called in context that cannot accept type record")));
funcctx->tuple_desc = BlessTupleDesc(tupdesc);
/* Allocate context */
ctx = (rise_set_events_ctx *)
palloc0(sizeof(rise_set_events_ctx));
ctx->body_type = body_type;
ctx->body_id = body_id;
memcpy(&ctx->obs, obs, sizeof(pg_observer));
ctx->current_jd = start_jd;
ctx->stop_jd = stop_jd;
ctx->threshold_rad = threshold;
/* Determine initial state: is body above or below threshold? */
init_el = elevation_at_jd_body(body_type, body_id, &ctx->obs, start_jd);
ctx->looking_for_rise = (init_el <= threshold);
funcctx->user_fctx = ctx;
MemoryContextSwitchTo(oldctx);
}
funcctx = SRF_PERCALL_SETUP();
ctx = (rise_set_events_ctx *) funcctx->user_fctx;
/* Find next event */
{
double event_jd;
Datum values[2];
bool nulls[2] = {false, false};
HeapTuple tuple;
event_jd = find_next_crossing(ctx->body_type, ctx->body_id,
&ctx->obs,
ctx->current_jd, ctx->stop_jd,
ctx->threshold_rad,
ctx->looking_for_rise);
if (event_jd < 0.0)
SRF_RETURN_DONE(funcctx);
/* Build result tuple */
values[0] = Int64GetDatum(jd_to_timestamptz(event_jd));
values[1] = PointerGetDatum(
cstring_to_text(ctx->looking_for_rise ? "rise" : "set"));
tuple = heap_form_tuple(funcctx->tuple_desc, values, nulls);
/* Advance past this event */
ctx->current_jd = event_jd + COARSE_STEP_JD;
ctx->looking_for_rise = !ctx->looking_for_rise;
SRF_RETURN_NEXT(funcctx, HeapTupleGetDatum(tuple));
}
}
/* ================================================================
* planet_rise_set_events(body_id, observer, start, stop [, refracted])
* -> TABLE(event_time timestamptz, event_type text)
* ================================================================
*/
Datum
planet_rise_set_events(PG_FUNCTION_ARGS)
{
return rise_set_events_internal(fcinfo, BTYPE_PLANET, 0);
}
/* ================================================================
* sun_rise_set_events(observer, start, stop [, refracted])
* -> TABLE(event_time timestamptz, event_type text)
* ================================================================
*/
Datum
sun_rise_set_events(PG_FUNCTION_ARGS)
{
return rise_set_events_internal(fcinfo, BTYPE_SUN, -1);
}
/* ================================================================
* moon_rise_set_events(observer, start, stop [, refracted])
* -> TABLE(event_time timestamptz, event_type text)
* ================================================================
*/
Datum
moon_rise_set_events(PG_FUNCTION_ARGS)
{
return rise_set_events_internal(fcinfo, BTYPE_MOON, -1);
}

1
src/types.h
View File

@ -255,6 +255,7 @@ typedef struct pg_equatorial
#define GAUSS_K2 (GAUSS_K * GAUSS_K)
#define OBLIQUITY_J2000 0.40909280422232897 /* 23.4392911 deg in radians */
#define C_LIGHT_AU_DAY 173.1446327 /* speed of light, AU/day (299792.458 * 86400 / 149597870.7) */
#define SUN_RADIUS_KM 695700.0 /* solar radius, km (IAU 2015) */
/*
* Solar system body IDs (VSOP87 convention, extended)

312
test/expected/v018_features.out Normal file
View File

@ -0,0 +1,312 @@
-- v018_features.sql -- Tests for v0.18.0: Saturn ring tilt, penumbral eclipse,
-- rise/set event windows, angular separation rate
--
-- Verifies all 10 new functions added in v0.18.0.
CREATE EXTENSION IF NOT EXISTS pg_orrery;
NOTICE: extension "pg_orrery" already exists, skipping
-- ============================================================
-- Saturn ring tilt: in [-27, +27] range
-- ============================================================
SELECT saturn_ring_tilt('2024-01-15 00:00:00+00'::timestamptz) BETWEEN -27.0 AND 27.0
AS ring_tilt_in_range;
ring_tilt_in_range
--------------------
t
(1 row)
-- ============================================================
-- Saturn ring tilt: near zero around 2025 ring crossing
-- (rings edge-on to Earth around March 2025)
-- ============================================================
SELECT abs(saturn_ring_tilt('2025-03-23 00:00:00+00'::timestamptz)) < 5.0
AS ring_tilt_near_edge_on;
ring_tilt_near_edge_on
------------------------
t
(1 row)
-- ============================================================
-- Saturn ring tilt: varies over time (not constant)
-- ============================================================
SELECT saturn_ring_tilt('2024-01-01 00:00:00+00'::timestamptz)
!= saturn_ring_tilt('2024-07-01 00:00:00+00'::timestamptz)
AS ring_tilt_varies;
ring_tilt_varies
------------------
t
(1 row)
-- ============================================================
-- Saturn ring tilt: sign changes across ring plane crossing
-- (2017 was fully open, 2025 is edge-on, tilt changes sign)
-- ============================================================
SELECT abs(saturn_ring_tilt('2017-06-15 00:00:00+00'::timestamptz)) > 10.0
AS ring_tilt_open_2017;
ring_tilt_open_2017
---------------------
t
(1 row)
-- ============================================================
-- Planet magnitude: Saturn now includes ring correction
-- (ring-corrected magnitude should differ from globe-only)
-- Saturn magnitude should be roughly between -0.5 and +1.5
-- ============================================================
SELECT planet_magnitude(6, '2024-01-15 00:00:00+00'::timestamptz) BETWEEN -1.0 AND 2.0
AS saturn_mag_valid_range;
saturn_mag_valid_range
------------------------
t
(1 row)
-- ============================================================
-- Satellite shadow state: returns valid text values
-- ============================================================
SELECT satellite_shadow_state(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) IN ('sunlit', 'penumbra', 'umbra')
AS shadow_state_valid;
shadow_state_valid
--------------------
t
(1 row)
-- ============================================================
-- Satellite in penumbra: returns bool
-- ============================================================
SELECT satellite_in_penumbra(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) IS NOT NULL
AS penumbra_returns_bool;
penumbra_returns_bool
-----------------------
t
(1 row)
-- ============================================================
-- Backward compatibility: satellite_is_eclipsed still works
-- (cone model upgrade is internal-only)
-- ============================================================
SELECT satellite_is_eclipsed(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) IS NOT NULL
AS eclipse_backward_compat;
eclipse_backward_compat
-------------------------
t
(1 row)
-- ============================================================
-- Penumbra entry precedes umbra entry (penumbra is outer zone)
-- ============================================================
SELECT satellite_next_penumbra_entry(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) <= satellite_next_eclipse_entry(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) AS penumbra_precedes_umbra;
penumbra_precedes_umbra
-------------------------
t
(1 row)
-- ============================================================
-- Penumbra exit is after penumbra entry
-- ============================================================
SELECT satellite_next_penumbra_exit(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) > '2024-01-01 12:00:00+00'::timestamptz
AS penumbra_exit_in_future;
penumbra_exit_in_future
-------------------------
t
(1 row)
-- ============================================================
-- Eclipse fraction still valid after cone upgrade
-- ============================================================
SELECT satellite_eclipse_fraction(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz,
'2024-01-01 14:00:00+00'::timestamptz
) BETWEEN 0.0 AND 1.0
AS eclipse_fraction_still_valid;
eclipse_fraction_still_valid
------------------------------
t
(1 row)
-- ============================================================
-- Sun rise/set events: mid-latitude 24h window returns events
-- ============================================================
SELECT count(*) >= 1 AS sun_events_exist
FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-06-21 00:00:00+00'::timestamptz,
'2024-06-22 00:00:00+00'::timestamptz
);
sun_events_exist
------------------
t
(1 row)
-- ============================================================
-- Sun rise/set events: events alternate rise/set
-- ============================================================
SELECT bool_and(event_type IN ('rise', 'set')) AS sun_event_types_valid
FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-06-21 00:00:00+00'::timestamptz,
'2024-06-22 00:00:00+00'::timestamptz
);
sun_event_types_valid
-----------------------
t
(1 row)
-- ============================================================
-- Sun rise/set events: refracted vs geometric
-- (refracted rise is earlier than geometric rise)
-- ============================================================
SELECT (SELECT min(event_time) FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-06-21 00:00:00+00'::timestamptz,
'2024-06-22 00:00:00+00'::timestamptz,
true
) WHERE event_type = 'rise')
<=
(SELECT min(event_time) FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-06-21 00:00:00+00'::timestamptz,
'2024-06-22 00:00:00+00'::timestamptz,
false
) WHERE event_type = 'rise')
AS refracted_rise_earlier;
refracted_rise_earlier
------------------------
t
(1 row)
-- ============================================================
-- Moon rise/set events: returns valid event types
-- ============================================================
SELECT bool_and(event_type IN ('rise', 'set')) AS moon_event_types_valid
FROM moon_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-01-15 00:00:00+00'::timestamptz,
'2024-01-16 00:00:00+00'::timestamptz
);
moon_event_types_valid
------------------------
t
(1 row)
-- ============================================================
-- Planet rise/set events: Jupiter over 24h
-- ============================================================
SELECT count(*) >= 1 AS jupiter_events_exist
FROM planet_rise_set_events(
5,
'(43.7,-116.4,800)'::observer,
'2024-01-15 00:00:00+00'::timestamptz,
'2024-01-16 00:00:00+00'::timestamptz
);
jupiter_events_exist
----------------------
t
(1 row)
-- ============================================================
-- Rise/set events: window > 366 days rejected
-- ============================================================
DO $$ BEGIN
PERFORM * FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-01-01 00:00:00+00'::timestamptz,
'2025-03-01 00:00:00+00'::timestamptz
);
EXCEPTION WHEN OTHERS THEN
RAISE NOTICE 'window overflow: %', SQLERRM;
END $$;
NOTICE: window overflow: window exceeds 366-day maximum
-- ============================================================
-- Rise/set events: stop before start rejected
-- ============================================================
DO $$ BEGIN
PERFORM * FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-06-22 00:00:00+00'::timestamptz,
'2024-06-21 00:00:00+00'::timestamptz
);
EXCEPTION WHEN OTHERS THEN
RAISE NOTICE 'stop before start: %', SQLERRM;
END $$;
NOTICE: stop before start: stop time must be after start time
-- ============================================================
-- eq_angular_rate: generic rate computation
-- Two positions that are 10 deg apart, then 9 deg apart after 1 hour
-- should give rate = -1.0 deg/hr (approaching)
-- ============================================================
SELECT abs(eq_angular_rate(
'(6.0, 45.0, 1.0)'::equatorial,
'(6.667, 45.0, 1.0)'::equatorial,
'(6.0, 45.0, 1.0)'::equatorial,
'(6.6, 45.0, 1.0)'::equatorial,
3600.0
)) > 0.0
AS angular_rate_nonzero;
angular_rate_nonzero
----------------------
t
(1 row)
-- ============================================================
-- eq_angular_rate: dt_seconds <= 0 rejected
-- ============================================================
DO $$ BEGIN
PERFORM eq_angular_rate(
'(6.0, 45.0, 1.0)'::equatorial,
'(7.0, 45.0, 1.0)'::equatorial,
'(6.0, 45.0, 1.0)'::equatorial,
'(7.0, 45.0, 1.0)'::equatorial,
0.0
);
EXCEPTION WHEN OTHERS THEN
RAISE NOTICE 'dt_seconds=0: %', SQLERRM;
END $$;
NOTICE: dt_seconds=0: eq_angular_rate: dt_seconds must be positive
-- ============================================================
-- planet_angular_rate: Moon rate ~0.5 deg/hr relative to Sun
-- ============================================================
SELECT abs(planet_angular_rate(0, 10, '2024-01-15 00:00:00+00'::timestamptz)) > 0.1
AS moon_sun_rate_nonzero;
moon_sun_rate_nonzero
-----------------------
t
(1 row)
-- ============================================================
-- planet_angular_rate: same body rejected
-- ============================================================
DO $$ BEGIN
PERFORM planet_angular_rate(5, 5, '2024-01-15 00:00:00+00'::timestamptz);
EXCEPTION WHEN OTHERS THEN
RAISE NOTICE 'same body: %', SQLERRM;
END $$;
NOTICE: same body: planet_angular_rate: body IDs must be different
-- ============================================================
-- planet_angular_rate: Jupiter-Saturn rate is small
-- (outer planets move slowly)
-- ============================================================
SELECT abs(planet_angular_rate(5, 6, '2024-01-15 00:00:00+00'::timestamptz)) < 1.0
AS outer_planet_rate_slow;
outer_planet_rate_slow
------------------------
t
(1 row)

259
test/sql/v018_features.sql Normal file
View File

@ -0,0 +1,259 @@
-- v018_features.sql -- Tests for v0.18.0: Saturn ring tilt, penumbral eclipse,
-- rise/set event windows, angular separation rate
--
-- Verifies all 10 new functions added in v0.18.0.
CREATE EXTENSION IF NOT EXISTS pg_orrery;
-- ============================================================
-- Saturn ring tilt: in [-27, +27] range
-- ============================================================
SELECT saturn_ring_tilt('2024-01-15 00:00:00+00'::timestamptz) BETWEEN -27.0 AND 27.0
AS ring_tilt_in_range;
-- ============================================================
-- Saturn ring tilt: near zero around 2025 ring crossing
-- (rings edge-on to Earth around March 2025)
-- ============================================================
SELECT abs(saturn_ring_tilt('2025-03-23 00:00:00+00'::timestamptz)) < 5.0
AS ring_tilt_near_edge_on;
-- ============================================================
-- Saturn ring tilt: varies over time (not constant)
-- ============================================================
SELECT saturn_ring_tilt('2024-01-01 00:00:00+00'::timestamptz)
!= saturn_ring_tilt('2024-07-01 00:00:00+00'::timestamptz)
AS ring_tilt_varies;
-- ============================================================
-- Saturn ring tilt: sign changes across ring plane crossing
-- (2017 was fully open, 2025 is edge-on, tilt changes sign)
-- ============================================================
SELECT abs(saturn_ring_tilt('2017-06-15 00:00:00+00'::timestamptz)) > 10.0
AS ring_tilt_open_2017;
-- ============================================================
-- Planet magnitude: Saturn now includes ring correction
-- (ring-corrected magnitude should differ from globe-only)
-- Saturn magnitude should be roughly between -0.5 and +1.5
-- ============================================================
SELECT planet_magnitude(6, '2024-01-15 00:00:00+00'::timestamptz) BETWEEN -1.0 AND 2.0
AS saturn_mag_valid_range;
-- ============================================================
-- Satellite shadow state: returns valid text values
-- ============================================================
SELECT satellite_shadow_state(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) IN ('sunlit', 'penumbra', 'umbra')
AS shadow_state_valid;
-- ============================================================
-- Satellite in penumbra: returns bool
-- ============================================================
SELECT satellite_in_penumbra(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) IS NOT NULL
AS penumbra_returns_bool;
-- ============================================================
-- Backward compatibility: satellite_is_eclipsed still works
-- (cone model upgrade is internal-only)
-- ============================================================
SELECT satellite_is_eclipsed(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) IS NOT NULL
AS eclipse_backward_compat;
-- ============================================================
-- Penumbra entry precedes umbra entry (penumbra is outer zone)
-- ============================================================
SELECT satellite_next_penumbra_entry(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) <= satellite_next_eclipse_entry(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) AS penumbra_precedes_umbra;
-- ============================================================
-- Penumbra exit is after penumbra entry
-- ============================================================
SELECT satellite_next_penumbra_exit(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz
) > '2024-01-01 12:00:00+00'::timestamptz
AS penumbra_exit_in_future;
-- ============================================================
-- Eclipse fraction still valid after cone upgrade
-- ============================================================
SELECT satellite_eclipse_fraction(
E'1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9025\n2 25544 51.6400 208.9163 0006703 30.1694 61.7520 15.50100486 00001'::tle,
'2024-01-01 12:00:00+00'::timestamptz,
'2024-01-01 14:00:00+00'::timestamptz
) BETWEEN 0.0 AND 1.0
AS eclipse_fraction_still_valid;
-- ============================================================
-- Sun rise/set events: mid-latitude 24h window returns events
-- ============================================================
SELECT count(*) >= 1 AS sun_events_exist
FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-06-21 00:00:00+00'::timestamptz,
'2024-06-22 00:00:00+00'::timestamptz
);
-- ============================================================
-- Sun rise/set events: events alternate rise/set
-- ============================================================
SELECT bool_and(event_type IN ('rise', 'set')) AS sun_event_types_valid
FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-06-21 00:00:00+00'::timestamptz,
'2024-06-22 00:00:00+00'::timestamptz
);
-- ============================================================
-- Sun rise/set events: refracted vs geometric
-- (refracted rise is earlier than geometric rise)
-- ============================================================
SELECT (SELECT min(event_time) FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-06-21 00:00:00+00'::timestamptz,
'2024-06-22 00:00:00+00'::timestamptz,
true
) WHERE event_type = 'rise')
<=
(SELECT min(event_time) FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-06-21 00:00:00+00'::timestamptz,
'2024-06-22 00:00:00+00'::timestamptz,
false
) WHERE event_type = 'rise')
AS refracted_rise_earlier;
-- ============================================================
-- Moon rise/set events: returns valid event types
-- ============================================================
SELECT bool_and(event_type IN ('rise', 'set')) AS moon_event_types_valid
FROM moon_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-01-15 00:00:00+00'::timestamptz,
'2024-01-16 00:00:00+00'::timestamptz
);
-- ============================================================
-- Planet rise/set events: Jupiter over 24h
-- ============================================================
SELECT count(*) >= 1 AS jupiter_events_exist
FROM planet_rise_set_events(
5,
'(43.7,-116.4,800)'::observer,
'2024-01-15 00:00:00+00'::timestamptz,
'2024-01-16 00:00:00+00'::timestamptz
);
-- ============================================================
-- Rise/set events: window > 366 days rejected
-- ============================================================
DO $$ BEGIN
PERFORM * FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-01-01 00:00:00+00'::timestamptz,
'2025-03-01 00:00:00+00'::timestamptz
);
EXCEPTION WHEN OTHERS THEN
RAISE NOTICE 'window overflow: %', SQLERRM;
END $$;
-- ============================================================
-- Rise/set events: stop before start rejected
-- ============================================================
DO $$ BEGIN
PERFORM * FROM sun_rise_set_events(
'(43.7,-116.4,800)'::observer,
'2024-06-22 00:00:00+00'::timestamptz,
'2024-06-21 00:00:00+00'::timestamptz
);
EXCEPTION WHEN OTHERS THEN
RAISE NOTICE 'stop before start: %', SQLERRM;
END $$;
-- ============================================================
-- eq_angular_rate: generic rate computation
-- Two positions that are 10 deg apart, then 9 deg apart after 1 hour
-- should give rate = -1.0 deg/hr (approaching)
-- ============================================================
SELECT abs(eq_angular_rate(
'(6.0, 45.0, 1.0)'::equatorial,
'(6.667, 45.0, 1.0)'::equatorial,
'(6.0, 45.0, 1.0)'::equatorial,
'(6.6, 45.0, 1.0)'::equatorial,
3600.0
)) > 0.0
AS angular_rate_nonzero;
-- ============================================================
-- eq_angular_rate: dt_seconds <= 0 rejected
-- ============================================================
DO $$ BEGIN
PERFORM eq_angular_rate(
'(6.0, 45.0, 1.0)'::equatorial,
'(7.0, 45.0, 1.0)'::equatorial,
'(6.0, 45.0, 1.0)'::equatorial,
'(7.0, 45.0, 1.0)'::equatorial,
0.0
);
EXCEPTION WHEN OTHERS THEN
RAISE NOTICE 'dt_seconds=0: %', SQLERRM;
END $$;
-- ============================================================
-- planet_angular_rate: Moon rate ~0.5 deg/hr relative to Sun
-- ============================================================
SELECT abs(planet_angular_rate(0, 10, '2024-01-15 00:00:00+00'::timestamptz)) > 0.1
AS moon_sun_rate_nonzero;
-- ============================================================
-- planet_angular_rate: same body rejected
-- ============================================================
DO $$ BEGIN
PERFORM planet_angular_rate(5, 5, '2024-01-15 00:00:00+00'::timestamptz);
EXCEPTION WHEN OTHERS THEN
RAISE NOTICE 'same body: %', SQLERRM;
END $$;
-- ============================================================
-- planet_angular_rate: Jupiter-Saturn rate is small
-- (outer planets move slowly)
-- ============================================================
SELECT abs(planet_angular_rate(5, 6, '2024-01-15 00:00:00+00'::timestamptz)) < 1.0
AS outer_planet_rate_slow;