solarmoonpy 1.0.7__tar.gz → 1.0.9__tar.gz

{solarmoonpy-1.0.7 → solarmoonpy-1.0.9}/PKG-INFO

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

{solarmoonpy-1.0.7 → solarmoonpy-1.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "solarmoonpy"
-version = "1.0.7"
+version = "1.0.9"
 description = "Precise solar and lunar calculations for astronomical applications"
 readme = "README.md"
 authors = [{ name = "figorr", email = "jdcuartero@yahoo.es" }]

{solarmoonpy-1.0.7 → solarmoonpy-1.0.9}/solarmoonpy/location.py

@@ -3,7 +3,7 @@ from datetime import date, datetime, timezone
 from zoneinfo import ZoneInfo
 from typing import Optional, Union, Literal, Dict
 
-from .sun import sunrise_sunset, noon, dawn, dusk, midnight  # Importar funciones de sun.py
+from .sun import sunrise_sunset, noon, dawn, dusk, midnight, sun_position  # Importar funciones de sun.py
 
 @dataclass
 class LocationInfo:
@@ -323,6 +323,39 @@ class Location:
             timezone=self.tzinfo if local else timezone.utc
         )
     
+    def sun_position(
+        self,
+        dt: Optional[datetime] = None,
+        local: bool = True,
+        elevation: Optional[float] = None
+    ) -> dict:
+        """
+        Calcula la posición actual del Sol.
+
+        Args:
+            dt: Momento exacto. Si None, usa ahora.
+            local: True para usar zona horaria local.
+            elevation: Elevación del observador.
+
+        Returns:
+            dict: elevation, azimuth, above_horizon, rising
+        """
+        if local and self.timezone is None:
+            raise ValueError("Se solicitó hora local pero no se definió una zona horaria.")
+
+        tz = self.tzinfo if local else timezone.utc
+        dt = dt or datetime.now(tz)
+        elevation = elevation if elevation is not None else self.elevation
+
+        return sun_position(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            dt=dt,
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True
+        )
+    
     def sun_events(
         self,
         date: Optional[date] = None,
@@ -356,7 +389,8 @@ class Location:
             raise ValueError("Se solicitó hora local pero no se definió una zona horaria.")
 
         tz = self.tzinfo if local else timezone.utc
-        date = date or datetime.now(tz).date()
+        now = datetime.now(tz)
+        date = date or now.date()
         elevation = elevation if elevation is not None else self.elevation
 
         # Calcular amanecer y atardecer
@@ -444,6 +478,9 @@ class Location:
             with_refraction=True,
         )
 
+        # Posición actual del Sol
+        pos = self.sun_position(dt=now, local=local, elevation=elevation)
+
         return {
             "dawn_civil": dawn_civil,
             "dawn_nautical": dawn_nautical,
@@ -456,4 +493,8 @@ class Location:
             "dusk_astronomical": dusk_astronomical,
             "midnight": midnight_time,
             "daylight_duration": daylight_duration,
+            "sun_elevation": pos["elevation"],
+            "sun_azimuth": pos["azimuth"],
+            "sun_horizon_position": pos["horizon_position"],
+            "sun_rising": pos["rising"],
         }

{solarmoonpy-1.0.7 → solarmoonpy-1.0.9}/solarmoonpy/moon.py

@@ -392,8 +392,6 @@ def get_moon_phase_name(d: date) -> str:
     last_new = find_last_phase_exact(d, 0.0)
     if last_new and last_new.date() == d:
         return "new_moon"
-    elif percentage < 1.0:  # Backup para luna nueva cercana
-        return "new_moon"
 
     last_first = find_last_phase_exact(d, 90.0)
     if last_first and last_first.date() == d:
@@ -402,8 +400,6 @@ def get_moon_phase_name(d: date) -> str:
     last_full = find_last_phase_exact(d, 180.0)
     if last_full and last_full.date() == d:
         return "full_moon"
-    elif percentage > 99.0:  # Backup para luna llena cercana
-        return "full_moon"
 
     last_last = find_last_phase_exact(d, 270.0)
     if last_last and last_last.date() == d:

{solarmoonpy-1.0.7 → solarmoonpy-1.0.9}/solarmoonpy/sun.py

@@ -333,6 +333,86 @@ def midnight(
     noon_time = noon(longitude, date, timezone)
     return noon_time + datetime.timedelta(hours=12)
 
+def sun_position(
+    latitude: float,
+    longitude: float,
+    dt: datetime.datetime,
+    elevation: float = 0.0,
+    timezone: datetime.timezone = datetime.timezone.utc,
+    with_refraction: bool = True
+) -> dict:
+    """
+    Calcula la posición del Sol con alta precisión.
+    """
+    if dt.tzinfo is None:
+        dt = dt.replace(tzinfo=timezone)
+    dt_utc = dt.astimezone(datetime.timezone.utc)
+
+    jd = julianday(dt_utc)
+    jc = julianday_to_juliancentury(jd)
+    declination = sun_declination(jc)
+    eqtime = eq_of_time(jc)
+
+    # Tiempo solar verdadero en minutos desde medianoche
+    true_solar_time = (
+        dt_utc.hour * 60 + dt_utc.minute + dt_utc.second / 60.0
+        + eqtime + 4.0 * longitude
+    )
+
+    # Ángulo horario
+    hour_angle = (true_solar_time / 4.0) - 180.0
+    if hour_angle < -180:
+        hour_angle += 360
+    elif hour_angle > 180:
+        hour_angle -= 360
+
+    # Convertir a radianes
+    ha_rad = radians(hour_angle)
+    lat_rad = radians(latitude)
+    dec_rad = radians(declination)
+
+    # Elevación geométrica
+    sin_elev = sin(lat_rad) * sin(dec_rad) + cos(lat_rad) * cos(dec_rad) * cos(ha_rad)
+    elevation_geom = degrees(asin(max(min(sin_elev, 1.0), -1.0)))
+
+    # Corrección por altura del observador
+    elevation_adj = elevation_geom + adjust_to_horizon(elevation)
+
+    # Refracción atmosférica
+    if with_refraction and -10 <= elevation_adj <= 90:
+        refraction = refraction_at_zenith(90.0 - elevation_adj)
+        elevation_final = elevation_adj + refraction
+    else:
+        elevation_final = elevation_adj
+
+    # Azimut (0° = Norte)
+    sin_elev_final = sin(radians(elevation_final))
+    cos_elev_final = cos(radians(elevation_final))
+    cos_lat = cos(lat_rad)
+    sin_lat = sin(lat_rad)
+    sin_dec = sin(dec_rad)
+
+    if abs(cos_elev_final * cos_lat) < 1e-12:
+        azimuth = 180.0 if ha_rad < 0 else 0.0
+    else:
+        cos_az = (sin_dec - sin_elev_final * sin_lat) / (cos_elev_final * cos_lat)
+        cos_az = max(min(cos_az, 1.0), -1.0)
+        azimuth = degrees(acos(cos_az))
+        if hour_angle > 0:  # PM
+            azimuth = 360.0 - azimuth
+
+    horizon_position: Literal["above_horizon", "below_horizon"] = (
+        "above_horizon" if elevation_final > 0 else "below_horizon"
+    )
+    rising = elevation_final > 0 and hour_angle < 0
+
+    return {
+        "elevation": round(elevation_final, 2),
+        "azimuth": round(azimuth, 2),
+        "horizon_position": horizon_position,
+        "rising": rising
+    }
+
 # 🎁 FUNCIÓN BONUS: Todo junto (opcional)
 def all_sun_events(
     latitude: float, longitude: float, date: datetime.date,

solarmoonpy-1.0.9/solarmoonpy/version.py

@@ -0,0 +1,2 @@
+# version.py
+__version__ = "1.0.9"

{solarmoonpy-1.0.7 → solarmoonpy-1.0.9}/solarmoonpy.egg-info/PKG-INFO

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

solarmoonpy-1.0.7/solarmoonpy/version.py

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