Timezone fixes.

Author: theriftlab

docs/3-examples.md

@@ -24,6 +24,8 @@ native = charts.Subject(
 
 The optional `time_is_dst` parameter is a boolean to clarify ambiguous times - for example 1:30am on a night when switching to US daylight savings could be in either the standard or the DST timezone. To specify which one, pass either `True` or `False` to this argument. For all other non-ambiguous times, `time_is_dst` can safely be omitted.
 
+You may provide a string argument to the optional `timezone` parameter if you'd like to bypass the coordinate lookup. This will speed up chart generation and could potentially be more accurate if your own timezone data is more up to date than Immanuel's offline lookup.
+
 There is also an optional `timezone_offset` parameter. This is a float which explicitly sets the UTC offset in hours for the location specified by the passed coordinates. While Immanuel will do its best to look up the correct timezone for the coordinates, it might not always be accurate, especially when boundaries or offsets have changed since the given birth date. This parameter can safely be ignored for most use cases.
 
 To generate one of each type of supported chart, you could do the following:
@@ -117,7 +119,7 @@ print(natal.native.coordinates.latitude.raw)
 Will look like this:
 
 ```
-Sat Jan 01 2000 10:00:00 AM PST at 32N43.0, 117W9.0
+Sat Jan 01 2000 10:00:00 AM America/Los_Angeles at 32N43.0, 117W9.0
 32N43.0, 117W9.0
 32N43.0
 32.71666666666667
@@ -145,7 +147,7 @@ This will output the following JSON:
 {
     "date_time": {
         "datetime": "2000-01-01 10:00:00-08:00",
-        "timezone": "PST",
+        "timezone": "America/Los_Angeles",
         "ambiguous": false,
         "julian": 2451545.25,
         "deltat": 0.0007387629899254968,

docs/4-data.md

@@ -16,7 +16,7 @@ The chart native, based on the date and coordinates you will have passed in when
 {
     "date_time": {
         "datetime": "2000-01-01 10:00:00-08:00",
-        "timezone": "PST",
+        "timezone": "America/Los_Angeles",
         "ambiguous": false,
         "julian": 2451545.25,
         "deltat": 0.0007387629899254968,

immanuel/charts.py

@@ -46,17 +46,19 @@ def __init__(
         latitude: float | list | tuple | str,
         longitude: float | list | tuple | str,
         timezone_offset: float | None = None,
+        timezone: str | None = None,
         time_is_dst: bool | None = None,
     ) -> None:
-        self.latitude, self.longitude = (
-            convert.to_dec(v) for v in (latitude, longitude)
-        )
+        self.latitude, self.longitude = convert.coordinates(latitude, longitude)
+        self.timezone_offset = timezone_offset
+        self.timezone = timezone
         self.time_is_dst = time_is_dst
         self.date_time = date.to_datetime(
             dt=date_time,
             lat=self.latitude,
             lon=self.longitude,
             offset=timezone_offset,
+            time_zone=timezone,
             is_dst=time_is_dst,
         )
         self.date_time_ambiguous = (
@@ -169,6 +171,8 @@ def set_wrapped_objects(self) -> None:
                     dt=object["jd"],
                     lat=self._native.latitude,
                     lon=self._native.longitude,
+                    offset=self._native.timezone_offset,
+                    time_zone=self._native.timezone,
                 )
                 if "jd" in object
                 else None
@@ -326,6 +330,8 @@ def set_wrapped_solar_return_date_time(self) -> None:
             armc=self._solar_return_armc,
             latitude=self._native.latitude,
             longitude=self._native.longitude,
+            offset=self._native.timezone_offset,
+            timezone=self._native.timezone,
         )
 
 
@@ -348,6 +354,8 @@ def generate(self) -> None:
             dt=self._date_time,
             lat=self._native.latitude,
             lon=self._native.longitude,
+            offset=self._native.timezone_offset,
+            time_zone=self._native.timezone,
         )
         progression_jd = date.to_jd(self._progression_date_time)
         progression_armc = ephemeris.get_angle(
@@ -414,6 +422,8 @@ def set_wrapped_progressed_date_time(self) -> None:
             armc=self._progressed_armc_longitude,
             latitude=self._native.latitude,
             longitude=self._native.longitude,
+            offset=self._native.timezone_offset,
+            timezone=self._native.timezone,
         )
 
     def set_wrapped_progression_method(self) -> None:
@@ -560,13 +570,14 @@ def __init__(
         self,
         latitude: float | list | tuple | str = settings.default_latitude,
         longitude: float | list | tuple | str = settings.default_longitude,
+        offset: float | None = None,
+        timezone: str | None = None,
         aspects_to: Chart | None = None,
         houses_for_aspected: bool = False,
     ) -> None:
-        lat, lon = (convert.to_dec(v) for v in (latitude, longitude))
-        timezone = date.timezone_name(lat, lon)
-        date_time = datetime.now(tz=ZoneInfo(timezone))
-        self._native = Subject(date_time, lat, lon)
+        lat, lon = convert.coordinates(latitude, longitude)
+        date_time = date.localize(datetime.now(), lat, lon, offset, timezone)
+        self._native = Subject(date_time, lat, lon, offset, timezone)
         self._houses_for_aspected = houses_for_aspected
         super().__init__(chart.TRANSITS, aspects_to)
 

immanuel/classes/wrap.py

@@ -120,10 +120,12 @@ def __init__(
         armc: dict | float = None,
         latitude: float | None = None,
         longitude: float | None = None,
+        offset: float | None = None,
+        timezone: str | None = None,
         time_is_dst: bool | None = None,
     ) -> None:
-        self.datetime = date.to_datetime(dt, latitude, longitude)
-        self.timezone = self.datetime.tzname()
+        self.datetime = date.to_datetime(dt, latitude, longitude, offset, timezone)
+        self.timezone = date.timezone_name(self.datetime)
         self.ambiguous = date.ambiguous(self.datetime) and time_is_dst is None
         self.julian = date.to_jd(dt)
         self.deltat = ephemeris.get_deltat(self.julian)
@@ -351,6 +353,8 @@ def __init__(self, subject: "Subject") -> None:
             armc=armc,
             latitude=subject.latitude,
             longitude=subject.longitude,
+            offset=subject.timezone_offset,
+            timezone=subject.timezone,
             time_is_dst=subject.time_is_dst,
         )
         self.coordinates = Coordinates(

immanuel/locales/de_DE/LC_MESSAGES/immanuel.po

@@ -544,7 +544,7 @@ msgstr "Tägliche Häuser"
 
 # Formatted sentences & words
 
-# For datetimes, eg. Sun Nov 06 2022 01:30:00 AM PDT (ambiguous)
+# For datetimes, eg. Sun Nov 06 2022 01:30:00 AM America/Los_Angeles (ambiguous)
 msgid "ambiguous"
 msgstr "mehrdeutig"
 
@@ -557,7 +557,7 @@ msgstr "{active} {passive} {type} innerhalb von {difference} ({movement}, {condi
 msgid "{name} {longitude} in {sign}"
 msgstr "{name} {longitude} in {sign}"
 
-# For chart subjects, eg. Sat Jan 01 2000 10:00:00 AM PST at 32N43.0, 117W9.0
+# For chart subjects, eg. Sat Jan 01 2000 10:00:00 AM America/Los_Angeles at 32N43.0, 117W9.0
 msgid "{date_time} at {lat}, {lon}"
 msgstr "{date_time} um {lat}, {lon}" ""
 

immanuel/locales/es_ES/LC_MESSAGES/immanuel.po

@@ -603,7 +603,7 @@ msgstr "Casas Diarias"
 
 # Formatted sentences & words
 
-# For datetimes, eg. Sun Nov 06 2022 01:30:00 AM PDT (ambiguous)
+# For datetimes, eg. Sun Nov 06 2022 01:30:00 AM America/Los_Angeles (ambiguous)
 msgid "ambiguous"
 msgstr "ambíguo"
 
@@ -615,7 +615,7 @@ msgstr "{type} entre {active} y {passive} dentro de {difference} ({movement}, {c
 msgid "{name} {longitude} in {sign}"
 msgstr "{name} {longitude} en {sign}"
 
-# For chart subjects, eg. Sat Jan 01 2000 10:00:00 AM PST at 32N43.0, 117W9.0
+# For chart subjects, eg. Sat Jan 01 2000 10:00:00 AM America/Los_Angeles at 32N43.0, 117W9.0
 msgid "{date_time} at {lat}, {lon}"
 msgstr "{date_time} en {lat}, {lon}"
 

immanuel/locales/immanuel.pot

@@ -536,7 +536,7 @@ msgstr ""
 
 # Formatted sentences & words
 
-# For datetimes, eg. Sun Nov 06 2022 01:30:00 AM PDT (ambiguous)
+# For datetimes, eg. Sun Nov 06 2022 01:30:00 AM America/Los_Angeles (ambiguous)
 msgid "ambiguous"
 msgstr ""
 
@@ -548,7 +548,7 @@ msgstr ""
 msgid "{name} {longitude} in {sign}"
 msgstr ""
 
-# For chart subjects, eg. Sat Jan 01 2000 10:00:00 AM PST at 32N43.0, 117W9.0
+# For chart subjects, eg. Sat Jan 01 2000 10:00:00 AM America/Los_Angeles at 32N43.0, 117W9.0
 msgid "{date_time} at {lat}, {lon}"
 msgstr ""
 

immanuel/locales/pt_BR/LC_MESSAGES/immanuel.po

@@ -603,7 +603,7 @@ msgstr "Casas Diárias"
 
 # Formatted sentences & words
 
-# For datetimes, eg. Sun Nov 06 2022 01:30:00 AM PDT (ambiguous)
+# For datetimes, eg. Sun Nov 06 2022 01:30:00 AM America/Los_Angeles (ambiguous)
 msgid "ambiguous"
 msgstr "ambíguo"
 
@@ -615,7 +615,7 @@ msgstr "{type} entre {active} e {passive} dentro de {difference} ({movement}, {c
 msgid "{name} {longitude} in {sign}"
 msgstr "{name} {longitude} em {sign}"
 
-# For chart subjects, eg. Sat Jan 01 2000 10:00:00 AM PST at 32N43.0, 117W9.0
+# For chart subjects, eg. Sat Jan 01 2000 10:00:00 AM America/Los_Angeles at 32N43.0, 117W9.0
 msgid "{date_time} at {lat}, {lon}"
 msgstr "{date_time} em {lat}, {lon}"
 

immanuel/tools/convert.py

@@ -99,7 +99,7 @@ def string_to_dec(string: str) -> float:
     return dms_to_dec(["-" if char in "SW" or floats[0] < 0 else "+", *floats])
 
 
-def to_dec(value: float | list | tuple | str) -> float:
+def to_dec(value: float | list | tuple | str) -> float | None:
     """If the input type is unknown, this will guess and convert."""
     if isinstance(value, float):
         return value
@@ -115,7 +115,7 @@ def to_dec(value: float | list | tuple | str) -> float:
 
 def to_dms(
     value: float | list | tuple | str, round_to: tuple = ROUND_SECOND, pad_rounded=False
-) -> tuple:
+) -> tuple | None:
     """If the input type is unknown, this will guess and convert."""
     if isinstance(value, float):
         return dec_to_dms(value, round_to, pad_rounded)
@@ -134,7 +134,7 @@ def to_string(
     format: int = FORMAT_DMS,
     round_to: tuple = ROUND_SECOND,
     pad_rounded: bool | None = None,
-) -> str:
+) -> str | None:
     """If the input type is unknown, this will guess and convert."""
     if isinstance(value, float):
         return dec_to_string(value, format, round_to, pad_rounded)
@@ -148,6 +148,13 @@ def to_string(
     return None
 
 
+def coordinates(
+    lat: float | list | tuple | str, lon: float | list | tuple | str
+) -> tuple | None:
+    """Shortcut function to convert latitude and longitude to decimal."""
+    return to_dec(lat), to_dec(lon)
+
+
 def _dms_to_string_format_dms(dms: list | tuple) -> str:
     """Returns DMS in degree/minute/second format."""
     symbols = ("\N{DEGREE SIGN}", "'", '"')

immanuel/tools/date.py

@@ -14,7 +14,7 @@
 
 """
 
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta, timezone, tzinfo
 from zoneinfo import ZoneInfo
 
 import swisseph as swe
@@ -23,44 +23,6 @@
 from immanuel.tools import convert
 
 
-def ambiguous(dt: datetime) -> bool:
-    """Returns whether an aware datetime is ambiguous."""
-    return tz.datetime_ambiguous(dt)
-
-
-def timezone_name(lat: float, lon: float) -> str:
-    """Returns a timezone string based on decimal lat/lon coordinates."""
-    from timezonefinder import TimezoneFinder
-    return TimezoneFinder().timezone_at(lat=lat, lng=lon)
-
-
-def get_timezone(lat: float | None, lon: float | None, offset: float | None, time_zone: str | None) -> ZoneInfo | timezone | None:
-    """Returns a timezone object based on either decimal lat/lon
-    coordinates or an explicit UTC offset."""
-    if time_zone is not None:
-        return ZoneInfo(time_zone)
-    if offset is not None:
-        return timezone(timedelta(hours=offset))
-    if lat is not None and lon is not None:
-        return ZoneInfo(timezone_name(lat, lon))
-    return None
-
-
-def localize(
-    dt: datetime,
-    lat: float | None = None,
-    lon: float | None = None,
-    offset: float | None = None,
-    time_zone: str | None = None,
-    is_dst: bool | None = None,
-) -> datetime:
-    """Localizes a naive datetime based on either decimal lat/lon
-    coordinates or an explicit UTC offset."""
-    return dt.replace(
-        tzinfo=get_timezone(lat, lon, offset, time_zone), fold=1 if is_dst is False else 0
-    )
-
-
 def to_datetime(
     dt: str | float | datetime,
     lat: float | None = None,
@@ -84,7 +46,9 @@ def to_datetime(
         time = convert.dec_to_dms(ut[3])[1:]
         date_time = datetime(*ut[:3], *time, tzinfo=ZoneInfo("UTC"))
         return (
-            date_time if no_tz else date_time.astimezone(get_timezone(lat, lon, offset, time_zone))
+            date_time
+            if no_tz
+            else date_time.astimezone(get_timezone(lat, lon, offset, time_zone))
         )
     if isinstance(dt, datetime):
         if no_tz:
@@ -123,3 +87,51 @@ def to_jd(
         ("+", date_time_utc.hour, date_time_utc.minute, date_time_utc.second)
     )
     return swe.julday(*date_time_utc.timetuple()[0:3], hour)
+
+
+def localize(
+    dt: datetime,
+    lat: float | None = None,
+    lon: float | None = None,
+    offset: float | None = None,
+    time_zone: str | None = None,
+    is_dst: bool | None = None,
+) -> datetime:
+    """Localizes a naive datetime based on either decimal lat/lon
+    coordinates or an explicit UTC offset."""
+    return dt.replace(
+        tzinfo=get_timezone(lat, lon, offset, time_zone),
+        fold=1 if is_dst is False else 0,
+    )
+
+
+def get_timezone(
+    lat: float | None, lon: float | None, offset: float | None, time_zone: str | None
+) -> tzinfo | None:
+    """Returns a timezone object based on either decimal lat/lon
+    coordinates or an explicit UTC offset."""
+    if time_zone is not None:
+        return ZoneInfo(time_zone)
+    if offset is not None:
+        return timezone(timedelta(hours=offset))
+    if lat is not None and lon is not None:
+        return ZoneInfo(timezone_lookup(lat, lon))
+    return None
+
+
+def timezone_lookup(lat: float, lon: float) -> str:
+    """Returns a timezone string based on decimal lat/lon coordinates."""
+    print("Looking up timezone")
+    from timezonefinder import TimezoneFinder
+
+    return TimezoneFinder().timezone_at(lat=lat, lng=lon)
+
+
+def timezone_name(dt: datetime) -> str | None:
+    """Returns a timezone name based on a datetime object."""
+    return str(dt.tzinfo) if dt.tzinfo is not None else None
+
+
+def ambiguous(dt: datetime) -> bool:
+    """Returns whether an aware datetime is ambiguous."""
+    return tz.datetime_ambiguous(dt)