solarmoonpy 0.1.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

solarmoonpy/__init__.py

@@ -9,11 +9,12 @@ https://github.com/figorr/solarmoonpy
 
 # solarmoonpy/__init__.py
 from .version import __version__
-from .moon import moon_phase, moon_rise_set, illuminated_percentage, moon_distance, moon_angular_diameter
+from .moon import moon_phase, moon_day, moon_rise_set, illuminated_percentage, moon_distance, moon_angular_diameter
 from .location import Location, LocationInfo
 
 __all__ = [
-    "moon_phase", 
+    "moon_phase",
+    "moon_day", 
     "moon_rise_set", 
     "illuminated_percentage", 
     "moon_distance", 

solarmoonpy/moon.py

@@ -4,41 +4,43 @@ from typing import Optional, Tuple
 from .sun import julianday, julianday_to_juliancentury, sun_apparent_long, sun_distance
 
 _SYNODIC_MONTH = 29.530588853
-AU = 149597870.7  # km por unidad astronómica (valor estándar)
+AU = 149597870.7
+JD_REF_PHASE = 2423436.0          # para moon_phase
+JD_REF_LUNATION = 2423407.51818   # para lunation_number
 
 def moon_phase(date_utc: date) -> float:
     """
-    Devuelve la fase de la luna como valor fraccionario (0 a ~29.53, 0=nueva, ~14.77=llena).
-    Usa una luna nueva reciente (21 Sep 2025) para mayor precisión y opcionalmente elongación eclíptica.
-    Args:
-        date_utc (date): Fecha en UTC.
-    Returns:
-        float: Días desde la última luna nueva (0 a ~29.53).
+    Devuelve los días transcurridos desde la última Luna Nueva.
+    Basado en el algoritmo de Chapront-Touzé (usado por timeanddate/NASA).
     """
-    # Luna nueva de referencia: 21 de septiembre de 2025, 19:54 UTC
-    known_new_moon = datetime(2025, 9, 21, 19, 54, tzinfo=timezone.utc)
-    dt = datetime(date_utc.year, date_utc.month, date_utc.day, tzinfo=timezone.utc)
-    diff = dt - known_new_moon
-    days = diff.days + (diff.seconds / 86400.0)
-    
-    # Cálculo aproximado con mes sinódico
-    lunations = days / _SYNODIC_MONTH
-    approx_phase = (lunations % 1) * _SYNODIC_MONTH
-
-    # Cálculo preciso usando elongación eclíptica
-    jd = julianday(dt.date()) + 0.5  # Mediodía UTC
-    jc = julianday_to_juliancentury(jd)
-    lambda_m, _, _, _ = _moon_ecliptic_position(jd)
-    lambda_s = sun_apparent_long(jc)
-    elong = _normalize_angle(lambda_m - lambda_s)
-    
-    # Convertir elongación a fase (0°=nueva, 180°=llena, 360°=nueva)
-    precise_phase = (elong / 360.0) * _SYNODIC_MONTH
-    if precise_phase > _SYNODIC_MONTH:
-        precise_phase -= _SYNODIC_MONTH
+    from datetime import datetime, timezone
+
+    # Convertimos a datetime UTC (mediodía del día solicitado)
+    dt = datetime(date_utc.year, date_utc.month, date_utc.day, 12, 0, tzinfo=timezone.utc)
+    jd = julianday(dt)
 
-    # Promedio ponderado: favorece cálculo preciso, pero usa aproximado como respaldo
-    return round(0.9 * precise_phase + 0.1 * approx_phase, 6)
+    # Fracción del ciclo (0.0 = luna nueva, 0.5 = llena, 1.0 = nueva)
+    phase = ((jd - JD_REF_PHASE) / _SYNODIC_MONTH) % 1.0
+
+    # Días desde la última luna nueva
+    return phase * _SYNODIC_MONTH
+
+def moon_day(date_utc: date, tol_hours: float = 0.01) -> int:
+    """
+    Calcula el día lunar 0–29 usando la última luna nueva exacta calculada por elongación.
+    Usa el fin del día UTC para alinear con convenciones de timeanddate/NASA.
+    tol_hours: precisión en horas (mantenido en 0.01 para consistencia).
+    """
+    dt = datetime(date_utc.year, date_utc.month, date_utc.day, 23, 59, tzinfo=timezone.utc)
+    last_new_moon = find_last_phase_exact(date_utc, target=0.0)
+    age_days = (dt - last_new_moon).total_seconds() / 86400.0
+    if age_days < 0:
+        day = 0
+    else:
+        day = int(math.floor(age_days))
+        if day > 29:
+            day = 29
+    return day
 
 def illuminated_percentage(date_utc: date) -> float:
     """
@@ -49,8 +51,8 @@ def illuminated_percentage(date_utc: date) -> float:
     Returns:
         float: Porcentaje de superficie lunar iluminada (0–100).
     """
-    dt = datetime(date_utc.year, date_utc.month, date_utc.day, 12, 0, 0, tzinfo=timezone.utc)  # Mediodía UTC
-    jd = julianday(dt.date()) + (dt.hour + dt.minute / 60 + dt.second / 3600) / 24
+    dt = datetime(date_utc.year, date_utc.month, date_utc.day, 12, 0, 0, tzinfo=timezone.utc)
+    jd = julianday(dt)
     jc = julianday_to_juliancentury(jd)
     lambda_m, beta_m, R, delta_psi = _moon_ecliptic_position(jd)
     lambda_s = sun_apparent_long(jc)
@@ -72,130 +74,60 @@ def _normalize_angle(angle: float) -> float:
 
 # Tabla completa 47.A para sigma_l y sigma_r (de PyMeeus/Meeus)
 SIGMA_LR_TABLE = [
-    [0, 0, 1, 0, 6288774.0, -20905355.0],
-    [2, 0, -1, 0, 1274027.0, -3699111.0],
-    [2, 0, 0, 0, 658314.0, -2955968.0],
-    [0, 0, 2, 0, 213618.0, -569925.0],
-    [0, 1, 0, 0, -185116.0, 48888.0],
-    [0, 0, 0, 2, -114332.0, -3149.0],
-    [2, 0, -2, 0, 58793.0, 246158.0],
-    [2, -1, -1, 0, 57066.0, -152138.0],
-    [2, 0, 1, 0, 53322.0, -170733.0],
-    [2, -1, 0, 0, 45758.0, -204586.0],
-    [0, 1, -1, 0, -40923.0, -129620.0],
-    [1, 0, 0, 0, -34720.0, 108743.0],
-    [0, 1, 1, 0, -30383.0, 104755.0],
-    [2, 0, 0, -2, 15327.0, 10321.0],
-    [0, 0, 1, 2, -12528.0, 0.0],
-    [0, 0, 1, -2, 10980.0, 79661.0],
-    [4, 0, -1, 0, 10675.0, -34782.0],
-    [0, 0, 3, 0, 10034.0, -23210.0],
-    [4, 0, -2, 0, 8548.0, -21636.0],
-    [2, 1, -1, 0, -7888.0, 24208.0],
-    [2, 1, 0, 0, -6766.0, 30824.0],
-    [1, 0, -1, 0, -5163.0, -8379.0],
-    [1, 1, 0, 0, 4987.0, -16675.0],
-    [2, -1, 1, 0, 4036.0, -12831.0],
-    [2, 0, 2, 0, 3994.0, -10445.0],
-    [4, 0, 0, 0, 3861.0, -11650.0],
-    [2, 0, -3, 0, 3665.0, 14403.0],
-    [0, 1, -2, 0, -2689.0, -7003.0],
-    [2, 0, -1, 2, -2602.0, 0.0],
-    [2, -1, -2, 0, 2390.0, 10056.0],
-    [1, 0, 1, 0, -2348.0, 6322.0],
-    [2, -2, 0, 0, 2236.0, -9884.0],
-    [0, 1, 2, 0, -2120.0, 5751.0],
-    [0, 2, 0, 0, -2069.0, 0.0],
-    [2, -2, -1, 0, 2048.0, -4950.0],
-    [2, 0, 1, -2, -1773.0, 4130.0],
-    [2, 0, 0, 2, -1595.0, 0.0],
-    [4, -1, -1, 0, 1215.0, -3958.0],
-    [0, 0, 2, 2, -1110.0, 0.0],
-    [3, 0, -1, 0, -892.0, 3258.0],
-    [2, 1, 1, 0, -810.0, 2616.0],
-    [4, -1, -2, 0, 759.0, -1897.0],
-    [0, 2, -1, 0, -713.0, -2117.0],
-    [2, 2, -1, 0, -700.0, 2354.0],
-    [2, 1, -2, 0, 691.0, 0.0],
-    [2, -1, 0, -2, 596.0, 0.0],
-    [4, 0, 1, 0, 549.0, -1423.0],
-    [0, 0, 4, 0, 537.0, -1117.0],
-    [4, -1, 0, 0, 520.0, -1571.0],
-    [1, 0, -2, 0, -487.0, -1739.0],
-    [2, 1, 0, -2, -399.0, 0.0],
-    [0, 0, 2, -2, -381.0, -4421.0],
-    [1, 1, 1, 0, 351.0, 0.0],
-    [3, 0, -2, 0, -340.0, 0.0],
-    [4, 0, -3, 0, 330.0, 0.0],
-    [2, -1, 2, 0, 327.0, 0.0],
-    [0, 2, 1, 0, -323.0, 1165.0],
-    [1, 1, -1, 0, 299.0, 0.0],
-    [2, 0, 3, 0, 294.0, 0.0],
-    [2, 0, -1, -2, 0.0, 8752.0]
+    [0, 0, 1, 0, 6288774.0, -20905355.0], [2, 0, -1, 0, 1274027.0, -3699111.0],
+    [2, 0, 0, 0, 658314.0, -2955968.0], [0, 0, 2, 0, 213618.0, -569925.0],
+    [0, 1, 0, 0, -185116.0, 48888.0], [0, 0, 0, 2, -114332.0, -3149.0],
+    [2, 0, -2, 0, 58793.0, 246158.0], [2, -1, -1, 0, 57066.0, -152138.0],
+    [2, 0, 1, 0, 53322.0, -170733.0], [2, -1, 0, 0, 45758.0, -204586.0],
+    [0, 1, -1, 0, -40923.0, -129620.0], [1, 0, 0, 0, -34720.0, 108743.0],
+    [0, 1, 1, 0, -30383.0, 104755.0], [2, 0, 0, -2, 15327.0, 10321.0],
+    [0, 0, 1, 2, -12528.0, 0.0], [0, 0, 1, -2, 10980.0, 79661.0],
+    [4, 0, -1, 0, 10675.0, -34782.0], [0, 0, 3, 0, 10034.0, -23210.0],
+    [4, 0, -2, 0, 8548.0, -21636.0], [2, 1, -1, 0, -7888.0, 24208.0],
+    [2, 1, 0, 0, -6766.0, 30824.0], [1, 0, -1, 0, -5163.0, -8379.0],
+    [1, 1, 0, 0, 4987.0, -16675.0], [2, -1, 1, 0, 4036.0, -12831.0],
+    [2, 0, 2, 0, 3994.0, -10445.0], [4, 0, 0, 0, 3861.0, -11650.0],
+    [2, 0, -3, 0, 3665.0, 14403.0], [0, 1, -2, 0, -2689.0, -7003.0],
+    [2, 0, -1, 2, -2602.0, 0.0], [2, -1, -2, 0, 2390.0, 10056.0],
+    [1, 0, 1, 0, -2348.0, 6322.0], [2, -2, 0, 0, 2236.0, -9884.0],
+    [0, 1, 2, 0, -2120.0, 5751.0], [0, 2, 0, 0, -2069.0, 0.0],
+    [2, -2, -1, 0, 2048.0, -4950.0], [2, 0, 1, -2, -1773.0, 4130.0],
+    [2, 0, 0, 2, -1595.0, 0.0], [4, -1, -1, 0, 1215.0, -3958.0],
+    [0, 0, 2, 2, -1110.0, 0.0], [3, 0, -1, 0, -892.0, 3258.0],
+    [2, 1, 1, 0, -810.0, 2616.0], [4, -1, -2, 0, 759.0, -1897.0],
+    [0, 2, -1, 0, -713.0, -2117.0], [2, 2, -1, 0, -700.0, 2354.0],
+    [2, 1, -2, 0, 691.0, 0.0], [2, -1, 0, -2, 596.0, 0.0],
+    [4, 0, 1, 0, 549.0, -1423.0], [0, 0, 4, 0, 537.0, -1117.0],
+    [4, -1, 0, 0, 520.0, -1571.0], [1, 0, -2, 0, -487.0, -1739.0],
+    [2, 1, 0, -2, -399.0, 0.0], [0, 0, 2, -2, -381.0, -4421.0],
+    [1, 1, 1, 0, 351.0, 0.0], [3, 0, -2, 0, -340.0, 0.0],
+    [4, 0, -3, 0, 330.0, 0.0], [2, -1, 2, 0, 327.0, 0.0],
+    [0, 2, 1, 0, -323.0, 1165.0], [1, 1, -1, 0, 299.0, 0.0],
+    [2, 0, 3, 0, 294.0, 0.0], [2, 0, -1, -2, 0.0, 8752.0]
 ]
 
 # Tabla completa 47.B para sigma_b (de PyMeeus/Meeus)
 SIGMA_B_TABLE = [
-    [0, 0, 0, 1, 5128122.0],
-    [0, 0, 1, 1, 280602.0],
-    [0, 0, 1, -1, 277693.0],
-    [2, 0, 0, -1, 173237.0],
-    [2, 0, -1, 1, 55413.0],
-    [2, 0, -1, -1, 46271.0],
-    [2, 0, 0, 1, 32573.0],
-    [0, 0, 2, 1, 17198.0],
-    [2, 0, 1, -1, 9266.0],
-    [0, 0, 2, -1, 8822.0],
-    [2, -1, 0, -1, 8216.0],
-    [2, 0, -2, -1, 4324.0],
-    [2, 0, 1, 1, 4200.0],
-    [2, 1, 0, -1, -3359.0],
-    [2, -1, -1, 1, 2463.0],
-    [2, -1, 0, 1, 2211.0],
-    [2, -1, -1, -1, 2065.0],
-    [0, 1, -1, -1, -1870.0],
-    [4, 0, -1, -1, 1828.0],
-    [0, 1, 0, 1, -1794.0],
-    [0, 0, 0, 3, -1749.0],
-    [0, 1, -1, 1, -1565.0],
-    [1, 0, 0, 1, -1491.0],
-    [0, 1, 1, 1, -1475.0],
-    [0, 1, 1, -1, -1410.0],
-    [0, 1, 0, -1, -1344.0],
-    [1, 0, 0, -1, -1335.0],
-    [0, 0, 3, 1, 1107.0],
-    [4, 0, 0, -1, 1021.0],
-    [4, 0, -1, 1, 833.0],
-    [0, 0, 1, -3, 777.0],
-    [4, 0, -2, 1, 671.0],
-    [2, 0, 0, -3, 607.0],
-    [2, 0, 2, -1, 596.0],
-    [2, -1, 1, -1, 491.0],
-    [2, 0, -2, 1, -451.0],
-    [0, 0, 3, -1, 439.0],
-    [2, 0, 2, 1, 422.0],
-    [2, 0, -3, -1, 421.0],
-    [2, 1, -1, 1, -366.0],
-    [2, 1, 0, 1, -351.0],
-    [4, 0, 0, 1, 331.0],
-    [2, -1, 1, 1, 315.0],
-    [2, -2, 0, -1, 302.0],
-    [0, 0, 1, 3, -283.0],
-    [2, 1, 1, -1, -229.0],
-    [1, 1, 0, -1, 223.0],
-    [1, 1, 0, 1, 223.0],
-    [0, 1, -2, -1, -220.0],
-    [2, 1, -1, -1, -220.0],
-    [1, 0, 1, 1, -185.0],
-    [2, -1, -2, -1, 181.0],
-    [0, 1, 2, 1, -177.0],
-    [4, 0, -2, -1, 176.0],
-    [4, -1, -1, -1, 166.0],
-    [1, 0, 1, -1, -164.0],
-    [4, 0, 1, -1, 132.0],
-    [1, 0, -1, -1, -119.0],
-    [4, -1, 0, -1, 115.0],
-    [2, -2, 0, 1, 107.0]
+    [0, 0, 0, 1, 5128122.0], [0, 0, 1, 1, 280602.0], [0, 0, 1, -1, 277693.0],
+    [2, 0, 0, -1, 173237.0], [2, 0, -1, 1, 55413.0], [2, 0, -1, -1, 46271.0],
+    [2, 0, 0, 1, 32573.0], [0, 0, 2, 1, 17198.0], [2, 0, 1, -1, 9266.0],
+    [0, 0, 2, -1, 8822.0], [2, -1, 0, -1, 8216.0], [2, 0, -2, -1, 4324.0],
+    [2, 0, 1, 1, 4200.0], [2, 1, 0, -1, -3359.0], [2, -1, -1, 1, 2463.0],
+    [2, -1, 0, 1, 2211.0], [2, -1, -1, -1, 2065.0], [0, 1, -1, -1, -1870.0],
+    [4, 0, -1, -1, 1828.0], [0, 1, 0, 1, -1794.0], [0, 0, 0, 3, -1749.0],
+    [0, 1, -1, 1, -1565.0], [1, 0, 0, 1, -1491.0], [0, 1, 1, 1, -1475.0],
+    [0, 1, 1, -1, -1410.0], [0, 1, 0, -1, -1344.0], [1, 0, 0, -1, -1335.0],
+    [0, 0, 3, 1, 1107.0], [4, 0, 0, -1, 1021.0], [4, 0, -1, 1, 833.0],
+    [0, 0, 1, -3, 777.0], [4, 0, -2, 1, 671.0], [2, 0, 0, -3, 607.0],
+    [2, 0, 2, -1, 596.0], [2, -1, 1, -1, 491.0], [2, 0, -2, 1, -451.0],
+    [0, 0, 3, -1, 439.0], [2, 0, 2, 1, 422.0], [2, 0, -3, -1, 421.0],
+    [2, 1, -1, 1, -366.0], [2, 1, 0, 1, -351.0], [4, 0, 0, 1, 331.0],
+    [2, -1, 1, 1, 315.0], [2, -2, 0, -1, 302.0], [0, 0, 1, 3, -283.0],
+    [2, 1, 1, -1, -229.0], [1, 1, 0, -1, 223.0], [1, 1, 0, 1, 223.0],
+    [0, 1, -2, -1, -220.0], [2, 1, -1, -1, -220.0], [1, 0, 1, 1, -185.0],
+    [2, -1, -2, -1, 181.0], [0, 1, 2, 1, -177.0], [4, 0, -2, -1, 176.0],
+    [4, -1, -1, -1, 166.0], [1, 0, 1, -1, -164.0], [4, 0, 1, -1, 132.0],
+    [1, 0, -1, -1, -119.0], [4, -1, 0, -1, 115.0], [2, -2, 0, 1, 107.0]
 ]
 
 def _periodic_terms(D, M, Mp, F, T):
@@ -228,7 +160,6 @@ def _periodic_terms(D, M, Mp, F, T):
     sigma_l /= 1000000.0  # a grados
     sigma_r *= 0.001  # a km
     sigma_b /= 1000000.0  # a grados
-
     return sigma_l, sigma_r, sigma_b
 
 def _moon_ecliptic_position(jd: float) -> Tuple[float, float, float, float]:
@@ -248,7 +179,6 @@ def _moon_ecliptic_position(jd: float) -> Tuple[float, float, float, float]:
     R = 385000.529 + sigma_r
     delta_psi = (-17.20 * math.sin(math.radians(Omega)) - 1.32 * math.sin(math.radians(2 * (Lp - F))) + 0.23 * math.sin(math.radians(2 * Lp)) + 0.21 * math.sin(math.radians(2 * Omega))) / 3600.0
     lambda_ += delta_psi
-
     return lambda_, beta, R, delta_psi
 
 def _calculate_position_and_alt(t: datetime, lat_r: float, lon: float) -> tuple[float, float]:
@@ -272,7 +202,6 @@ def _calculate_position_and_alt(t: datetime, lat_r: float, lon: float) -> tuple[
     if ha < -math.pi: ha += 2 * math.pi
     elif ha > math.pi: ha -= 2 * math.pi
     alt = math.asin(math.sin(lat_r) * math.sin(dec) + math.cos(lat_r) * math.cos(dec) * math.cos(ha))
-
     return alt, h0
 
 def moon_rise_set(lat: float, lon: float, date_utc: date) -> Tuple[Optional[datetime], Optional[datetime]]:
@@ -324,7 +253,6 @@ def moon_rise_set(lat: float, lon: float, date_utc: date) -> Tuple[Optional[date
     if intervalos_set and set_ is None:
         start_t, end_t, start_alt, end_alt = intervalos_set[0]
         set_ = refine_event(start_t, end_t, start_alt, end_alt, False)
-
     return rise, set_
 
 def moon_distance(date_utc: date) -> float:
@@ -335,8 +263,8 @@ def moon_distance(date_utc: date) -> float:
     Returns:
         float: Distancia en kilómetros.
     """
-    dt = datetime(date_utc.year, date_utc.month, date_utc.day, 12, 0, 0, tzinfo=timezone.utc)  # Mediodía UTC
-    jd = julianday(dt.date()) + (dt.hour + dt.minute / 60 + dt.second / 3600) / 24
+    dt = datetime(date_utc.year, date_utc.month, date_utc.day, 12, 0, 0, tzinfo=timezone.utc)
+    jd = julianday(dt)
     _, _, R, _ = _moon_ecliptic_position(jd)
     return R
 
@@ -348,9 +276,102 @@ def moon_angular_diameter(date_utc: date) -> float:
     Returns:
         float: Diámetro angular en arcosegundos.
     """
-    dt = datetime(date_utc.year, date_utc.month, date_utc.day, 12, 0, 0, tzinfo=timezone.utc)  # Mediodía UTC
-    jd = julianday(dt.date()) + (dt.hour + dt.minute / 60 + dt.second / 3600) / 24
+    dt = datetime(date_utc.year, date_utc.month, date_utc.day, 12, 0, 0, tzinfo=timezone.utc)
+    jd = julianday(dt)
     _, _, R, _ = _moon_ecliptic_position(jd)
-    par = math.asin(6378.14 / R)  # Paralaje horizontal
-    sd = 0.2725076 * par  # Semi-diámetro
-    return 2 * math.degrees(sd) * 3600  # Diámetro angular en arcosegundos
+    par = math.asin(6378.14 / R)
+    sd = 0.2725076 * par
+    return 2 * math.degrees(sd) * 3600
+
+def lunation_number(date_utc: date) -> int:
+    """
+    Calcula el número de lunación según el sistema de TimeandDate/NASA.
+    """
+    last_new_moon = find_last_phase_exact(date_utc, target=0.0)
+    jd_new_moon = julianday(last_new_moon)
+
+    lun = (jd_new_moon - JD_REF_LUNATION) / _SYNODIC_MONTH
+    return round(lun)
+
+def find_last_phase_exact(date_utc: date, target: float = 0.0) -> datetime:
+    """
+    Devuelve la fase lunar exacta ANTERIOR o coincidente a date_utc.
+    target: 0.0 para new_moon, 90.0 para first_quarter, 180.0 para full_moon, 270.0 para last_quarter.
+    Método:
+      1) Usa moon_phase(date_utc) para estimar la fecha/hora aproximada desde la última Luna Nueva, luego ajusta para target.
+      2) Construye un intervalo alrededor de esa estimación y asegura que contiene un cruce
+         (elongation - target cambia de signo).
+      3) Refina con bisección hasta ~1 segundo de precisión.
+    Este método evita saltos de ciclo porque la estimación inicial está basada en la elongación.
+    """
+    # punto central (mediodía UTC) y estimación inicial usando moon_phase para new_moon
+    dt_mid = datetime(date_utc.year, date_utc.month, date_utc.day, 12, 0, tzinfo=timezone.utc)
+    # phase_days es el número de días desde la última Luna Nueva (según moon_phase)
+    phase_days = moon_phase(date_utc)
+    approx_from_new = (target / 360.0) * _SYNODIC_MONTH  # Días aproximados desde new_moon al target
+    approx_dt = dt_mid - timedelta(days=phase_days) + timedelta(days=approx_from_new)
+
+    def elongation_dt(t: datetime) -> float:
+        jd = julianday(t)
+        jc = julianday_to_juliancentury(jd)
+        lambda_m, _, _, _ = _moon_ecliptic_position(jd)
+        lambda_s = sun_apparent_long(jc)
+        # normalizamos a -180..+180 alrededor de target
+        diff = (lambda_m - lambda_s - target + 180.0) % 360.0 - 180.0
+        return diff
+
+    # bracket inicial ±2 días alrededor de la estimación
+    low = approx_dt - timedelta(days=2)
+    high = approx_dt + timedelta(days=2)
+
+    # Intentamos asegurar que low..high contiene un cambio de signo.
+    # Si no, expandimos gradualmente hasta un máximo razonable (p.ej. ±60 días).
+    max_expand_days = 60
+    step_expand_days = 2
+    el_low = elongation_dt(low)
+    el_high = elongation_dt(high)
+
+    expand_attempts = 0
+    while el_low * el_high > 0:  # mismo signo -> no hay cruce dentro del intervalo
+        expand_attempts += 1
+        if (high - low).days >= max_expand_days:
+            raise RuntimeError(f"No se encontró fase con target {target} en el rango de búsqueda (±60 días).")
+        low -= timedelta(days=step_expand_days)
+        high += timedelta(days=step_expand_days)
+        el_low = elongation_dt(low)
+        el_high = elongation_dt(high)
+
+    # Si exactamente en un extremo es cero, devuelvo ese instante
+    if abs(el_low) < 1e-12:
+        return low
+    if abs(el_high) < 1e-12:
+        return high
+
+    # Bisección: refinamos hasta ~1 segundo de precisión
+    # (puedes relajar a 30-60 s si prefieres).
+    while (high - low).total_seconds() > 1:
+        mid = low + (high - low) / 2
+        el_mid = elongation_dt(mid)
+        # si mid es exactamente 0 (raro), lo devolvemos
+        if abs(el_mid) < 1e-12:
+            return mid
+        # si el signo de low y mid difiere, el cruce está en low..mid; si no, en mid..high
+        if el_low * el_mid <= 0:
+            high = mid
+            el_high = el_mid
+        else:
+            low = mid
+            el_low = el_mid
+
+    return low + (high - low) / 2
+
+def moon_elongation(date_utc: date) -> float:
+    """
+    Devuelve la elongación lunar (0-360°) para la fecha UTC al mediodía.
+    """
+    dt = datetime(date_utc.year, date_utc.month, date_utc.day, 12, 0, 0, tzinfo=timezone.utc)
+    jd = julianday(dt)
+    jc = julianday_to_juliancentury(jd)
+    lambda_m, _, _, _ = _moon_ecliptic_position(jd)
+    lambda_s = sun_apparent_long(jc)
+    return _normalize_angle(lambda_m - lambda_s)

solarmoonpy/sun.py

@@ -1,11 +1,23 @@
 import datetime
 from math import acos, asin, atan2, cos, degrees, radians, sin, tan, sqrt
 
-def julianday(date: datetime.date) -> float:
-    """Calculate the Julian Day number for the specified date."""
-    year = date.year
-    month = date.month
-    day = date.day
+def julianday(date_or_dt: datetime.date | datetime.datetime) -> float:
+    """
+    Calculate the Julian Day number for a date or datetime (UTC).
+    Handles both date (midnight UTC) and datetime (exact time).
+    """
+    if isinstance(date_or_dt, datetime.datetime):
+        year = date_or_dt.year
+        month = date_or_dt.month
+        day = date_or_dt.day
+        hour = date_or_dt.hour
+        minute = date_or_dt.minute
+        second = date_or_dt.second
+    else:
+        year = date_or_dt.year
+        month = date_or_dt.month
+        day = date_or_dt.day
+        hour = minute = second = 0
 
     if month <= 2:
         year -= 1
@@ -14,7 +26,7 @@ def julianday(date: datetime.date) -> float:
     a = year // 100
     b = 2 - a + (a // 4)
     jd = int(365.25 * (year + 4716)) + int(30.6001 * (month + 1)) + day + b - 1524.5
-    return jd
+    return jd + (hour + minute/60 + second/3600) / 24.0
 
 def julianday_to_juliancentury(jd: float) -> float:
     """Convert a Julian Day number to a Julian Century."""
@@ -52,10 +64,14 @@ def sun_true_long(jc: float) -> float:
     return l0 + c
 
 def sun_apparent_long(jc: float) -> float:
-    """Calculate the sun's apparent longitude."""
-    true_long = sun_true_long(jc)
+    """Calculate the sun's apparent longitude with nutation correction (Meeus Ch. 25)."""
+    l0 = geom_mean_long_sun(jc)
+    m = geom_mean_anomaly_sun(jc)
+    c = sun_eq_of_center(jc)
+    lambda_geo = l0 + c
     omega = 125.04 - 1934.136 * jc
-    return true_long - 0.00569 - 0.00478 * sin(radians(omega))
+    nutation_long = -0.0048 * sin(radians(2 * omega))  # Nutation correction
+    return (lambda_geo + nutation_long - 0.00569) % 360.0
 
 def sun_distance(jc: float) -> float:
     """Calculate the distance to the Sun in astronomical units (AU)."""
@@ -108,10 +124,8 @@ def refraction_at_zenith(zenith: float) -> float:
     """Calculate the atmospheric refraction correction for the given zenith angle (in degrees)."""
     if zenith < 0 or zenith > 90:
         return 0.0
-
     # Convert zenith to radians
     zenith_rad = radians(zenith)
-
     # Refraction formula (Bennett 1982, used in Astral)
     tan_zenith = tan(zenith_rad)
     if zenith > 85.0:
@@ -123,14 +137,12 @@ def refraction_at_zenith(zenith: float) -> float:
         ) / 3600.0
     else:
         refraction = (58.276 / tan_zenith) / 3600.0
-
     return refraction
 
 def adjust_to_horizon(elevation: float) -> float:
     """Calculate the extra degrees of depression due to the observer's elevation."""
     if elevation <= 0:
         return 0.0
-
     r = 6356900  # Radius of the Earth in meters
     a1 = r
     h1 = r + elevation
@@ -213,11 +225,9 @@ def sunrise_sunset(
     # Convert to local timezone
     sunrise_local = sunrise_utc.astimezone(timezone)
     sunset_local = sunset_utc.astimezone(timezone)
-
     return sunrise_local, sunset_local
 
 def noon(
-    latitude: float,
     longitude: float,
     date: datetime.date,
     timezone: datetime.timezone = datetime.timezone.utc,

solarmoonpy/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "0.1.0"
+__version__ = "1.0.1"

{solarmoonpy-0.1.0.dist-info → solarmoonpy-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solarmoonpy
-Version: 0.1.0
+Version: 1.0.1
 Summary: Precise solar and lunar calculations for astronomical applications
 Author-email: figorr <jdcuartero@yahoo.es>
 License:                                  Apache License
@@ -220,5 +220,18 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
-# solarmoonpy
-solar and moon calculations
+# ☀️🌙 solarmoonpy
+Solar and moon calculations for Meteocat Home Assistant integration.
+
+**solarmoonpy** is a Python library that provides accurate calculations of solar and lunar positions, specifically designed to integrate with Home Assistant and Meteocat data. 
+
+This project enables you to obtain information such as sunrise, sunset, moon phases, and more, for advanced automations in your home automation system.
+
+## 🚀 Features
+
+- ☀️ Solar position calculations (sunrise, sunset, zenith, etc.).
+- 🌙 Moon phase and position calculations.
+- Integration with meteorological data from Meteocat.
+- Compatible with Home Assistant for automations based on solar and lunar events.
+- Lightweight, easy to use, and well-documented.
+- Configurable for different geographic locations.

solarmoonpy-1.0.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+solarmoonpy/__init__.py,sha256=cS0ZjePNX75usK8mgvbk_uguVpXRixqZU4zjrEtg42c,722
+solarmoonpy/location.py,sha256=ELx1BVGMRwMPW6uhtyz2LUjxMyBNQM_RXgwRuLo1J7s,10386
+solarmoonpy/moon.py,sha256=SSa4pwUX-r70NSg2Fv3TSAnoyMAdTq2vQ8JRZqDBONo,17587
+solarmoonpy/sun.py,sha256=dleHQWXzjnqtPAZr9ONdXiZvTVWvdW6gW775A2ASsNk,8937
+solarmoonpy/version.py,sha256=Pk3OGNvW6xVheWgr6AQzYbPTYigdhML663W3JHGsF6U,35
+solarmoonpy-1.0.1.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+solarmoonpy-1.0.1.dist-info/METADATA,sha256=7Xwsrseo2d_crVrBPp7iya7m71r2ULM3-onQlewxgU8,14850
+solarmoonpy-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+solarmoonpy-1.0.1.dist-info/top_level.txt,sha256=egsoDe9E0QEu5GfAA5jSvy_3qTCWMLMe_Kh3gnM6-dY,12
+solarmoonpy-1.0.1.dist-info/RECORD,,

solarmoonpy-0.1.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-solarmoonpy/__init__.py,sha256=6oTXMLEtrwgFemMgPxNTrWSebn3_pZjBkFmyVGol6d0,695
-solarmoonpy/location.py,sha256=ELx1BVGMRwMPW6uhtyz2LUjxMyBNQM_RXgwRuLo1J7s,10386
-solarmoonpy/moon.py,sha256=eyrh1CHDjMAI1gFGoW4Ig_RYP5hAsHbQklKLjLGvqLc,14266
-solarmoonpy/sun.py,sha256=ai53vZEJ6k9fvb8JyaZNxKueqHXLnKZxFBz-QAAAHjc,8289
-solarmoonpy/version.py,sha256=XJYgmMWwwuGBlSVGAS1tn_sPe0VvcX2XS3T-VPrSZ4I,35
-solarmoonpy-0.1.0.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-solarmoonpy-0.1.0.dist-info/METADATA,sha256=fyCsilbXyW-t99jPC1u9JdgSR_QOLYEIph1kdgQXcts,14084
-solarmoonpy-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-solarmoonpy-0.1.0.dist-info/top_level.txt,sha256=egsoDe9E0QEu5GfAA5jSvy_3qTCWMLMe_Kh3gnM6-dY,12
-solarmoonpy-0.1.0.dist-info/RECORD,,