starplot 0.18.3__py2.py3-none-any.whl → 0.19.0__py2.py3-none-any.whl

starplot/__init__.py

@@ -1,36 +1,42 @@
+# ruff: noqa: F401,F403
+
 """Star charts and maps of the sky"""
 
-__version__ = "0.18.3"
+__version__ = "0.19.0"
 
-from .base import BasePlot  # noqa: F401
-from .map import MapPlot  # noqa: F401
-from .horizon import HorizonPlot  # noqa: F401
-from .optic import OpticPlot  # noqa: F401
-from .zenith import ZenithPlot  # noqa: F401
+from .plots import (
+    MapPlot,
+    HorizonPlot,
+    OpticPlot,
+    ZenithPlot,
+)
 from .models import (
-    DSO,  # noqa: F401
-    DsoType,  # noqa: F401
-    Star,  # noqa: F401
-    Constellation,  # noqa: F401
-    Comet,  # noqa: F401
-    Planet,  # noqa: F401
-    Moon,  # noqa: F401
-    Sun,  # noqa: F401
-    ObjectList,  # noqa: F401
-    Scope,  # noqa: F401
-    Binoculars,  # noqa: F401
-    Reflector,  # noqa: F401
-    Refractor,  # noqa: F401
-    Camera,  # noqa: F401
-    Satellite,  # noqa: F401
-    Observer,  # noqa: F401
+    DSO,
+    DsoType,
+    Star,
+    Constellation,
+    ConstellationBorder,
+    Comet,
+    Planet,
+    Moon,
+    Sun,
+    ObjectList,
+    Scope,
+    Binoculars,
+    Reflector,
+    Refractor,
+    Camera,
+    Satellite,
+    Observer,
+    MilkyWay,
 )
-from .data import Catalog  # noqa: F401 F403
-from .styles import *  # noqa: F401 F403
-from .projections import *  # noqa: F401 F403
-from .config import settings  # noqa: F401
+from .data import Catalog
+from .styles import *
+from .projections import *
+from .config import settings
+from .plotters.text import CollisionHandler
 
-from ibis import _  # noqa: F401 F403
+from ibis import _
 
 
 import contextlib

starplot/data/__init__.py

@@ -1,9 +1,11 @@
+# ruff: noqa: F401,F403
+
 from pathlib import Path
 
 from skyfield.api import Loader
 
 from starplot.config import settings
-from .catalogs import Catalog  # noqa: F401
+from .catalogs import Catalog
 
 load = Loader(settings.data_path)  # used for loading ephemeris
 
@@ -16,9 +18,5 @@ INTERNAL_DATA_PATH = HERE / "library"
 
 class DataFiles:
     STAR_DESIGNATIONS = INTERNAL_DATA_PATH / "star_designations.parquet"
-
     CONSTELLATION_NAMES = INTERNAL_DATA_PATH / "constellation_names.parquet"
-
     DSO_NAMES = INTERNAL_DATA_PATH / "dso_names.parquet"
-
-    DATABASE = INTERNAL_DATA_PATH / "sky.db"

starplot/data/catalogs.py

@@ -290,31 +290,31 @@ class Catalog:
 # --------------------------------------------------------
 
 BIG_SKY = Catalog(
-    path=settings.data_path / "stars.bigksy.0.1.2.mag16.parquet",
-    url="https://github.com/steveberardi/starplot-bigsky/releases/download/v0.1.1/stars.bigksy.0.1.1.mag16.parquet",
+    path=settings.data_path / "stars.bigksy.0.1.3.mag16.parquet",
+    url="https://github.com/steveberardi/starplot-bigsky/releases/download/v0.1.3/stars.bigksy.0.1.3.mag16.parquet",
 )
 """
 [Big Sky Catalog](https://github.com/steveberardi/bigsky) ~ 2.5M stars
 
-This is the full version of the Big Sky Catalog, which includes 2,557,500 stars from Hipparcos, Tycho-1, and Tycho-2.
+This is the full version of the Big Sky Catalog, which includes 2,557,501 stars from Hipparcos, Tycho-1, and Tycho-2.
 """
 
 BIG_SKY_MAG11 = Catalog(
-    path=settings.data_path / "stars.bigksy.0.1.2.mag11.parquet",
-    url="https://github.com/steveberardi/starplot-bigsky/releases/download/v0.1.1/stars.bigksy.0.1.1.mag11.parquet",
+    path=settings.data_path / "stars.bigksy.0.1.3.mag11.parquet",
+    url="https://github.com/steveberardi/starplot-bigsky/releases/download/v0.1.3/stars.bigksy.0.1.3.mag11.parquet",
 )
 """
-[Big Sky Catalog](https://github.com/steveberardi/bigsky) ~ 983,822 stars with limiting magnitude 11
+[Big Sky Catalog](https://github.com/steveberardi/bigsky) ~ 983,823 stars with limiting magnitude 11
 
 This is an _abridged_ version of the Big Sky Catalog.
 """
 
 BIG_SKY_MAG9 = Catalog(
-    path=settings.data_path / "stars.bigksy.0.1.2.mag9.parquet",
-    url="https://github.com/steveberardi/starplot-bigsky/releases/download/v0.1.1/stars.bigksy.0.1.1.mag9.parquet",
+    path=settings.data_path / "stars.bigksy.0.1.3.mag9.parquet",
+    url="https://github.com/steveberardi/starplot-bigsky/releases/download/v0.1.3/stars.bigksy.0.1.3.mag9.parquet",
 )
 """
-[Big Sky Catalog](https://github.com/steveberardi/bigsky) ~ 136,125 stars with limiting magnitude 9
+[Big Sky Catalog](https://github.com/steveberardi/bigsky) ~ 136,126 stars with limiting magnitude 9
 
 This is an _abridged_ version of the Big Sky Catalog.
 """
@@ -328,13 +328,23 @@ OPEN_NGC = Catalog(
 """
 
 CONSTELLATIONS_IAU = Catalog(
-    path=settings.data_path / "constellations-iau-0.1.2.parquet",
-    url="https://github.com/steveberardi/starplot-constellations/releases/download/v0.1.1/constellations.0.1.1.parquet",
+    path=settings.data_path / "constellations-iau-0.2.0.parquet",
+    url="https://github.com/steveberardi/starplot-constellations/releases/download/v0.2.0/constellations.0.2.0.parquet",
 )
 """
 Constellations recognized by IAU, with lines by Sky & Telescope.
 """
 
+CONSTELLATION_BORDERS = Catalog(
+    path=settings.data_path / "constellations-borders-0.2.0.parquet",
+    url="https://github.com/steveberardi/starplot-constellations/releases/download/v0.2.0/constellations-borders.0.2.0.parquet",
+)
+
+MILKY_WAY = Catalog(
+    path=settings.data_path / "milky_way-0.1.0.parquet",
+    url="https://github.com/steveberardi/starplot-milkyway/releases/download/v0.1.0/milky_way.parquet",
+)
+
 
 def download_all_catalogs(silent=False):
     BIG_SKY.download_if_not_exists(silent=silent)
@@ -342,3 +352,5 @@ def download_all_catalogs(silent=False):
     BIG_SKY_MAG11.download_if_not_exists(silent=silent)
     OPEN_NGC.download_if_not_exists(silent=silent)
     CONSTELLATIONS_IAU.download_if_not_exists(silent=silent)
+    CONSTELLATION_BORDERS.download_if_not_exists(silent=silent)
+    MILKY_WAY.download_if_not_exists(silent=silent)

starplot/data/db.py

@@ -12,13 +12,7 @@ NAME_TABLES = {
 
 
 def connect():
-    connection = duckdb.connect(
-        DataFiles.DATABASE,
-        read_only=True,
-        # threads=4,
-        # memory_limit="1GB",
-    )
-
+    connection = duckdb.connect()
     path = settings.data_path / "duckdb-extensions"
     connection.raw_sql(f"SET extension_directory = '{str(path)}';")
 

starplot/models/__init__.py

@@ -1,5 +1,6 @@
 # ruff: noqa: F401,F403
-from .constellation import Constellation
+
+from .constellation import Constellation, ConstellationBorder
 from .comet import Comet
 from .dso import DSO, DsoType
 from .star import Star
@@ -17,3 +18,4 @@ from .optics import (
 from .objects import ObjectList
 from .satellite import Satellite
 from .observer import Observer
+from .milky_way import MilkyWay

starplot/models/constellation.py

@@ -2,7 +2,7 @@ from typing import Iterator
 from dataclasses import dataclass
 
 from ibis import _
-from shapely import Polygon, MultiPolygon
+from shapely import Polygon, MultiPolygon, LineString
 
 from starplot.models.base import SkyObject, CatalogObject
 from starplot.data.catalogs import Catalog, CONSTELLATIONS_IAU
@@ -132,3 +132,9 @@ def from_tuple(c: tuple) -> Constellation:
     kwargs = {f: getattr(c, f) for f in Constellation._fields() if hasattr(c, f)}
     c = Constellation(**kwargs)
     return c
+
+
+@dataclass(slots=True, kw_only=True)
+class ConstellationBorder(CatalogObject, SkyObject):
+    geometry: LineString
+    """Shapely LineString of the border. Right ascension coordinates are in degrees (0...360)."""

starplot/models/milky_way.py

@@ -0,0 +1,30 @@
+from dataclasses import dataclass
+
+import pyarrow as pa
+from shapely import Polygon, MultiPolygon
+
+from starplot.models.base import SkyObject, CatalogObject
+
+
+@dataclass(slots=True, kw_only=True)
+class MilkyWay(CatalogObject, SkyObject):
+    """
+    Milky Way model.
+    """
+
+    geometry: Polygon | MultiPolygon
+    """Shapely Polygon of the Milky Way's extent. Right ascension coordinates are in degrees (0...360)."""
+
+    @classmethod
+    def _pyarrow_schema(cls):
+        base_schema = super(MilkyWay, cls)._pyarrow_schema()
+        extra_fields = [
+            pa.field("pk", pa.int64(), nullable=False),
+            pa.field("geometry", pa.binary(), nullable=False),
+        ]
+        return pa.schema(list(base_schema) + extra_fields)
+
+
+def from_tuple(d: tuple) -> MilkyWay:
+    kwargs = {f: getattr(d, f) for f in MilkyWay._fields() if hasattr(d, f)}
+    return MilkyWay(**kwargs)

starplot/models/observer.py

@@ -6,6 +6,8 @@ from skyfield.timelib import Timescale
 
 from starplot.data import load
 
+ts = load.timescale()
+
 
 class Observer(BaseModel):
     """
@@ -19,8 +21,8 @@ class Observer(BaseModel):
         lat=33.363484,
         lon=-116.836394,
     )
-
     ```
+
     """
 
     dt: AwareDatetime = Field(default_factory=lambda: datetime.now(timezone.utc))
@@ -47,7 +49,7 @@ class Observer(BaseModel):
 
         Timescale instance of the specified datetime (used by Skyfield)
         """
-        return load.timescale().from_datetime(self.dt)
+        return ts.from_datetime(self.dt)
 
     @computed_field
     @cached_property
@@ -59,6 +61,13 @@ class Observer(BaseModel):
         """
         return float(360.0 * self.timescale.gmst / 24.0 + self.lon) % 360.0
 
+    @classmethod
+    def at_epoch(cls, epoch: float) -> "Observer":
+        """
+        Returns an Observer for the specified epoch (Julian year)
+        """
+        return Observer(dt=ts.J(epoch).utc_datetime())
+
     # @computed_field
     # @cached_property
     # def location(self):

starplot/plots/__init__.py

@@ -0,0 +1,6 @@
+# ruff: noqa: F401,F403
+
+from .map import MapPlot
+from .horizon import HorizonPlot
+from .zenith import ZenithPlot
+from .optic import OpticPlot