solarmoonpy 1.0.5__py3-none-any.whl → 1.0.7__py3-none-any.whl

solarmoonpy/location.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from datetime import date, datetime, timezone
 from zoneinfo import ZoneInfo
-from typing import Optional, Union
+from typing import Optional, Union, Literal, Dict
 
-from .sun import sunrise_sunset, noon  # Importar funciones de sun.py
+from .sun import sunrise_sunset, noon, dawn, dusk, midnight  # Importar funciones de sun.py
 
 @dataclass
 class LocationInfo:
@@ -257,15 +257,80 @@ class Location:
             date=date,
             timezone=self.tzinfo if local else timezone.utc
         )
+    
+    def dawn(
+        self,
+        date: Optional[date] = None,
+        local: bool = True,
+        twilight_type: Literal["civil", "nautical", "astronomical"] = "civil",
+        elevation: Optional[float] = None
+    ) -> Optional[datetime]:
+        """🌅 Calcula amanecer (inicio crepúsculo)."""
+        if local and self.timezone is None:
+            raise ValueError("Se solicitó hora local pero no se definió una zona horaria.")
 
-    def sun_events(
+        date = date or datetime.now(self.tzinfo if local else timezone.utc).date()
+        elevation = elevation if elevation is not None else self.elevation
+        
+        return dawn(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type=twilight_type,
+            elevation=elevation,
+            timezone=self.tzinfo if local else timezone.utc,
+            with_refraction=True
+        )
+
+    def dusk(
         self,
         date: Optional[date] = None,
         local: bool = True,
+        twilight_type: Literal["civil", "nautical", "astronomical"] = "civil",
         elevation: Optional[float] = None
-    ) -> dict:
+    ) -> Optional[datetime]:
+        """🌙 Calcula anochecer (fin crepúsculo)."""
+        if local and self.timezone is None:
+            raise ValueError("Se solicitó hora local pero no se definió una zona horaria.")
+
+        date = date or datetime.now(self.tzinfo if local else timezone.utc).date()
+        elevation = elevation if elevation is not None else self.elevation
+        
+        return dusk(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type=twilight_type,
+            elevation=elevation,
+            timezone=self.tzinfo if local else timezone.utc,
+            with_refraction=True
+        )
+
+    def midnight(
+        self,
+        date: Optional[date] = None,
+        local: bool = True
+    ) -> datetime:
+        """🌑 Calcula medianoche solar."""
+        if local and self.timezone is None:
+            raise ValueError("Se solicitó hora local pero no se definió una zona horaria.")
+
+        date = date or datetime.now(self.tzinfo if local else timezone.utc).date()
+        
+        return midnight(
+            longitude=self.longitude,
+            date=date,
+            timezone=self.tzinfo if local else timezone.utc
+        )
+    
+    def sun_events(
+        self,
+        date: Optional[date] = None,
+        local: bool = True,
+        elevation: Optional[float] = None,
+    ) -> Dict:
         """
-        Devuelve un diccionario con sunrise, noon y sunset para una fecha dada.
+        Devuelve un diccionario con los eventos solares para una fecha dada, incluyendo todos los tipos de crepúsculo.
 
         Args:
             date: Fecha para la cual calcular los eventos solares. Si es None, usa la fecha actual.
@@ -274,9 +339,17 @@ class Location:
 
         Returns:
             dict: {
+                "dawn_civil": datetime | None,
+                "dawn_nautical": datetime | None,
+                "dawn_astronomical": datetime | None,
                 "sunrise": datetime,
                 "noon": datetime,
-                "sunset": datetime
+                "sunset": datetime,
+                "dusk_civil": datetime | None,
+                "dusk_nautical": datetime | None,
+                "dusk_astronomical": datetime | None,
+                "midnight": datetime,
+                "daylight_duration": float | None
             }
         """
         if local and self.timezone is None:
@@ -303,8 +376,84 @@ class Location:
             timezone=tz,
         )
 
+        # Calcular medianoche solar
+        midnight_time = midnight(
+            longitude=self.longitude,
+            date=date,
+            timezone=tz,
+        )
+
+        # Calcular duración del día (en horas)
+        daylight_duration = None
+        if sunrise and sunset:
+            daylight_duration = (sunset - sunrise).total_seconds() / 3600
+
+        # Calcular dawn y dusk para cada tipo de crepúsculo
+        dawn_civil = dawn(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="civil",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+        dusk_civil = dusk(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="civil",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+        dawn_nautical = dawn(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="nautical",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+        dusk_nautical = dusk(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="nautical",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+        dawn_astronomical = dawn(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="astronomical",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+        dusk_astronomical = dusk(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="astronomical",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+
         return {
+            "dawn_civil": dawn_civil,
+            "dawn_nautical": dawn_nautical,
+            "dawn_astronomical": dawn_astronomical,
             "sunrise": sunrise,
             "noon": noon_time,
             "sunset": sunset,
-        }
+            "dusk_civil": dusk_civil,
+            "dusk_nautical": dusk_nautical,
+            "dusk_astronomical": dusk_astronomical,
+            "midnight": midnight_time,
+            "daylight_duration": daylight_duration,
+        }

solarmoonpy/sun.py

@@ -1,5 +1,15 @@
 import datetime
 from math import acos, asin, atan2, cos, degrees, radians, sin, tan, sqrt
+from typing import Optional, Tuple, Literal
+
+# Constantes estándar para diferentes eventos solares
+SUN_APPARENT_RADIUS = 959.63 / 3600.0  # ≈ 0.2666° (radio aparente del Sol)
+
+# Zenith angles estándar (90° = horizonte)
+ZENITH_SUNRISE_SUNSET = 90.0 + SUN_APPARENT_RADIUS
+ZENITH_CIVIL_DAWN_DUSK = 96.0
+ZENITH_NAUTICAL_DAWN_DUSK = 102.0
+ZENITH_ASTRONOMICAL_DAWN_DUSK = 108.0
 
 def julianday(date_or_dt: datetime.date | datetime.datetime) -> float:
     """
@@ -239,4 +249,105 @@ def noon(
     time_utc = (720.0 - (4 * longitude) - eqtime)  # minutos
     noon_utc = datetime.datetime(date.year, date.month, date.day, tzinfo=datetime.timezone.utc) \
         + datetime.timedelta(minutes=time_utc)
-    return noon_utc.astimezone(timezone)
+    return noon_utc.astimezone(timezone)
+
+def dawn(
+    latitude: float, longitude: float, date: datetime.date,
+    twilight_type: Literal["civil", "nautical", "astronomical"] = "civil",
+    elevation: float = 0.0,
+    timezone: datetime.timezone = datetime.timezone.utc,
+    with_refraction: bool = True
+) -> Optional[datetime.datetime]:
+    """🌅 Calcula amanecer (inicio crepúsculo)."""
+    zeniths = {"civil": 96.0, "nautical": 102.0, "astronomical": 108.0}
+    zenith = zeniths[twilight_type]
+    
+    # Reutiliza la misma lógica que sunrise_sunset pero para un zenith específico
+    adjustment_for_elevation = adjust_to_horizon(elevation)
+    adjusted_zenith = zenith + adjustment_for_elevation
+    if with_refraction:
+        adjusted_zenith += refraction_at_zenith(adjusted_zenith)
+
+    latitude = max(min(latitude, 89.8), -89.8)
+    jd = julianday(date)
+    jc = julianday_to_juliancentury(jd)
+    declination = sun_declination(jc)
+    eqtime = eq_of_time(jc)
+
+    try:
+        ha_rising = hour_angle(latitude, declination, adjusted_zenith, "rising")
+    except ValueError:
+        return None
+
+    delta = -longitude - degrees(ha_rising)
+    time_utc_minutes = 720.0 + (delta * 4.0) - eqtime
+    if time_utc_minutes < -720.0:
+        time_utc_minutes += 1440
+
+    base_dt = datetime.datetime(date.year, date.month, date.day, tzinfo=datetime.timezone.utc)
+    result_utc = base_dt + datetime.timedelta(minutes=time_utc_minutes)
+    return result_utc.astimezone(timezone)
+
+def dusk(
+    latitude: float, longitude: float, date: datetime.date,
+    twilight_type: Literal["civil", "nautical", "astronomical"] = "civil",
+    elevation: float = 0.0,
+    timezone: datetime.timezone = datetime.timezone.utc,
+    with_refraction: bool = True
+) -> Optional[datetime.datetime]:
+    """🌙 Calcula anochecer (fin crepúsculo)."""
+    zeniths = {"civil": 96.0, "nautical": 102.0, "astronomical": 108.0}
+    zenith = zeniths[twilight_type]
+    
+    adjustment_for_elevation = adjust_to_horizon(elevation)
+    adjusted_zenith = zenith + adjustment_for_elevation
+    if with_refraction:
+        adjusted_zenith += refraction_at_zenith(adjusted_zenith)
+
+    latitude = max(min(latitude, 89.8), -89.8)
+    jd = julianday(date)
+    jc = julianday_to_juliancentury(jd)
+    declination = sun_declination(jc)
+    eqtime = eq_of_time(jc)
+
+    try:
+        ha_setting = hour_angle(latitude, declination, adjusted_zenith, "setting")
+    except ValueError:
+        return None
+
+    delta = -longitude - degrees(ha_setting)
+    time_utc_minutes = 720.0 + (delta * 4.0) - eqtime
+    if time_utc_minutes < -720.0:
+        time_utc_minutes += 1440
+
+    base_dt = datetime.datetime(date.year, date.month, date.day, tzinfo=datetime.timezone.utc)
+    result_utc = base_dt + datetime.timedelta(minutes=time_utc_minutes)
+    return result_utc.astimezone(timezone)
+
+def midnight(
+    longitude: float,
+    date: datetime.date,
+    timezone: datetime.timezone = datetime.timezone.utc
+) -> datetime.datetime:
+    """🌑 Medianoche solar (12h después del mediodía solar)."""
+    noon_time = noon(longitude, date, timezone)
+    return noon_time + datetime.timedelta(hours=12)
+
+# 🎁 FUNCIÓN BONUS: Todo junto (opcional)
+def all_sun_events(
+    latitude: float, longitude: float, date: datetime.date,
+    twilight_type: Literal["civil", "nautical", "astronomical"] = "civil",
+    elevation: float = 0.0,
+    timezone: datetime.timezone = datetime.timezone.utc,
+    with_refraction: bool = True
+) -> dict:
+    """🔥 Calcula TODOS los eventos solares del día."""
+    sr, ss = sunrise_sunset(latitude, longitude, date, elevation, timezone, with_refraction)
+    return {
+        "dawn": dawn(latitude, longitude, date, twilight_type, elevation, timezone, with_refraction),
+        "sunrise": sr,
+        "noon": noon(longitude, date, timezone),
+        "sunset": ss,
+        "dusk": dusk(latitude, longitude, date, twilight_type, elevation, timezone, with_refraction),
+        "midnight": midnight(longitude, date, timezone)
+    }

solarmoonpy/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "1.0.5"
+__version__ = "1.0.7"

{solarmoonpy-1.0.5.dist-info → solarmoonpy-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solarmoonpy
-Version: 1.0.5
+Version: 1.0.7
 Summary: Precise solar and lunar calculations for astronomical applications
 Author-email: figorr <jdcuartero@yahoo.es>
 License:                                  Apache License

solarmoonpy-1.0.7.dist-info/RECORD

@@ -0,0 +1,10 @@
+solarmoonpy/__init__.py,sha256=cS0ZjePNX75usK8mgvbk_uguVpXRixqZU4zjrEtg42c,722
+solarmoonpy/location.py,sha256=vO39N1IWWchztZAkPh1QAG65bVa06vWYKjUoGOchxtY,15672
+solarmoonpy/moon.py,sha256=yhJSsED7AWK3nF79fjqFlCeqYjiXXFhqGE36Nyfp0qk,19699
+solarmoonpy/sun.py,sha256=K31_btucloC5WYnltFb_X_3hF1Xk0_5aQ1hRSrYP7C8,13396
+solarmoonpy/version.py,sha256=1WAI3HCLSBsNOYFDrx3iybB2BK0q9VjsVmNPgtn8gxw,35
+solarmoonpy-1.0.7.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+solarmoonpy-1.0.7.dist-info/METADATA,sha256=2-EtubwWPbvTXa3Fpz5daf9FxHqIAHNd8aaPa_hTzDI,15023
+solarmoonpy-1.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+solarmoonpy-1.0.7.dist-info/top_level.txt,sha256=egsoDe9E0QEu5GfAA5jSvy_3qTCWMLMe_Kh3gnM6-dY,12
+solarmoonpy-1.0.7.dist-info/RECORD,,

solarmoonpy-1.0.5.dist-info/RECORD

@@ -1,10 +0,0 @@
-solarmoonpy/__init__.py,sha256=cS0ZjePNX75usK8mgvbk_uguVpXRixqZU4zjrEtg42c,722
-solarmoonpy/location.py,sha256=CcIAlghZ6QQKiQXygfaAs4aBN_7ANfoszabZycIPY30,10312
-solarmoonpy/moon.py,sha256=yhJSsED7AWK3nF79fjqFlCeqYjiXXFhqGE36Nyfp0qk,19699
-solarmoonpy/sun.py,sha256=dleHQWXzjnqtPAZr9ONdXiZvTVWvdW6gW775A2ASsNk,8937
-solarmoonpy/version.py,sha256=l3Zi-Xuhc76_pomaTnxWfoGjGfeI-KyhHlKy8KJdeOA,35
-solarmoonpy-1.0.5.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-solarmoonpy-1.0.5.dist-info/METADATA,sha256=aXlHhlDVG5xxhH0DwMP-1oojRDsjtZgI2he9rIOA9xM,15023
-solarmoonpy-1.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-solarmoonpy-1.0.5.dist-info/top_level.txt,sha256=egsoDe9E0QEu5GfAA5jSvy_3qTCWMLMe_Kh3gnM6-dY,12
-solarmoonpy-1.0.5.dist-info/RECORD,,