starplot 0.15.4__py2.py3-none-any.whl → 0.15.6__py2.py3-none-any.whl

starplot/__init__.py

@@ -1,6 +1,6 @@
 """Star charts and maps of the sky"""
 
-__version__ = "0.15.4"
+__version__ = "0.15.6"
 
 from .base import BasePlot  # noqa: F401
 from .map import MapPlot, Projection  # noqa: F401

starplot/base.py

@@ -360,6 +360,9 @@ class BasePlot(ABC):
 
         x, y = self._prepare_coords(ra, dec)
         kwargs["path_effects"] = kwargs.get("path_effects", [self.text_border])
+        remove_on_constellation_collision = kwargs.pop(
+            "remove_on_constellation_collision", True
+        )
 
         original_va = kwargs.pop("va", None)
         original_ha = kwargs.pop("ha", None)
@@ -386,7 +389,10 @@ class BasePlot(ABC):
                 x, y, text, **kwargs, va=va, ha=ha, xytext=(offset_x, offset_y)
             )
             removed = self._maybe_remove_label(
-                label, remove_on_collision=hide_on_collision, remove_on_clipped=clip_on
+                label,
+                remove_on_collision=hide_on_collision,
+                remove_on_clipped=clip_on,
+                remove_on_constellation_collision=remove_on_constellation_collision,
             )
 
             if force or not removed:
@@ -868,10 +874,13 @@ class BasePlot(ABC):
             # closed=False, # needs to be false for circles at poles?
             **style.matplot_kwargs(self.scale),
             **kwargs,
-            clip_on=True,
-            clip_path=self._background_clip_path,
+            # clip_on=True,
+            # clip_path=self._background_clip_path,
         )
         self.ax.add_patch(patch)
+        # Need to set clip path AFTER adding patch
+        patch.set_clip_on(True)
+        patch.set_clip_path(self._background_clip_path)
 
     @use_style(PolygonStyle)
     def polygon(

starplot/data/stars.py

@@ -463,10 +463,10 @@ def read_catalog(catalog: StarCatalog = StarCatalog.BIG_SKY_MAG11, table_name="s
     con = db.connect()
 
     if catalog == StarCatalog.BIG_SKY_MAG11:
-        stars = con.read_parquet(DataFiles.BIG_SKY_MAG11, table_name)
+        stars = con.read_parquet(DataFiles.BIG_SKY_MAG11, table_name=table_name)
     elif catalog == StarCatalog.BIG_SKY:
         bigsky.download_if_not_exists()
-        stars = con.read_parquet(DataFiles.BIG_SKY, table_name)
+        stars = con.read_parquet(DataFiles.BIG_SKY, table_name=table_name)
     else:
         raise ValueError("Unrecognized star catalog.")
 
@@ -487,7 +487,7 @@ def read_catalog(catalog: StarCatalog = StarCatalog.BIG_SKY_MAG11, table_name="s
         designations,
         [
             stars.hip == designations.hip,
-            (stars.ccdm == "A") | (stars.ccdm == "") | (stars.ccdm.isnull()),
+            (stars.ccdm.startswith("A")) | (stars.ccdm == "") | (stars.ccdm.isnull()),
         ],
         how="left",
     )

starplot/optic.py

@@ -229,7 +229,7 @@ class OpticPlot(BasePlot, ExtentMaskMixin, StarPlotterMixin, DsoPlotterMixin):
         Args:
             where: A list of expressions that determine which stars to plot. See [Selecting Objects](/reference-selecting-objects/) for details.
             where_labels: A list of expressions that determine which stars are labeled on the plot. See [Selecting Objects](/reference-selecting-objects/) for details.
-            catalog: The catalog of stars to use
+            catalog: The catalog of stars to use: "big-sky-mag11", or "big-sky" -- see [star catalogs](/data/star-catalogs/) for details
             style: If `None`, then the plot's style for stars will be used
             rasterize: If True, then the stars will be rasterized when plotted, which can speed up exporting to SVG and reduce the file size but with a loss of image quality
             size_fn: Callable for calculating the marker size of each star. If `None`, then the marker style's size will be used.

starplot/plotters/constellations.py

@@ -12,9 +12,9 @@ from starplot.data import constellations as condata, constellation_lines as conl
 from starplot.data.stars import load as load_stars, StarCatalog
 from starplot.data.constellations import (
     CONSTELLATIONS_FULL_NAMES,
-    CONSTELLATION_HIP_IDS,
 )
 from starplot.data.constellation_stars import CONSTELLATION_HIPS
+from starplot.models import Star
 from starplot.models.constellation import from_tuple as constellation_from_tuple
 from starplot.projections import Projection
 from starplot.profile import profile
@@ -262,11 +262,17 @@ class ConstellationPlotterMixin:
         self.ax.add_collection(line_collection)
 
     def _constellation_labels_auto(self, style, labels, settings):
+        hips = []
+        for c in self.objects.constellations:
+            hips.extend(c.star_hip_ids)
+
+        all_constellation_stars = Star.find(where=[_.hip.isin(hips)])
+
         for constellation in self.objects.constellations:
             constellation_line_stars = [
                 s
-                for s in self.objects.stars
-                if s.hip in CONSTELLATION_HIP_IDS[constellation.iau_id]
+                for s in all_constellation_stars
+                if s.hip in constellation.star_hip_ids
             ]
             if not constellation_line_stars:
                 continue
@@ -302,10 +308,11 @@ class ConstellationPlotterMixin:
             text = labels.get(con.lower())
             self.text(
                 text,
-                ra,
+                ra * 15,
                 dec,
                 style,
                 hide_on_collision=self.hide_colliding_labels,
+                remove_on_constellation_collision=False,
                 gid="constellations-label-name",
             )
 
@@ -319,7 +326,7 @@ class ConstellationPlotterMixin:
         auto_adjust_settings: dict = DEFAULT_AUTO_ADJUST_SETTINGS,
     ):
         """
-        Plots constellation labels.
+        Plots constellation labels for all constellations that have been plotted. This means you must plot the constellations before plotting their labels.
 
         It's good to plot these last because they're area-based labels (vs point-based, like for star names), and area-based labels have more freedom to move around. If you plot area-based labels first, then it would limit the available space for point-based labels.
 
@@ -328,10 +335,6 @@ class ConstellationPlotterMixin:
             labels: A dictionary where the keys are each constellation's 3-letter IAU abbreviation, and the values are how the constellation will be labeled on the plot.
             auto_adjust: If True (the default), then labels will be automatically adjusted to avoid collisions with other labels and stars **Important: you must plot stars and constellations first for this to work**. This uses a fairly simple method: for each constellation it finds the centroid of all plotted constellation stars with lines and then generates random points in the constellation boundary starting at the centroid and then progressively increasing the distance from the centroid.
             auto_adjust_settings: Optional settings for the auto adjustment algorithm.
-
-        TODO:
-            make this work without plotting constellations first
-
         """
 
         if auto_adjust:

starplot/plotters/dsos.py

@@ -85,6 +85,9 @@ class DsoPlotterMixin:
         - Emission Nebula
         - Star Cluster Nebula
         - Reflection Nebula
+        - HII Ionized Regions
+
+        * Note that this does NOT plot dark nebulae
 
         This is just a small wrapper around the `dsos()` function, so any `kwargs` will be passed through.
         """
@@ -94,6 +97,7 @@ class DsoPlotterMixin:
             DsoType.EMISSION_NEBULA,
             DsoType.STAR_CLUSTER_NEBULA,
             DsoType.REFLECTION_NEBULA,
+            DsoType.HII_IONIZED_REGION,
         ]
         where = kwargs.pop("where", [])
         where.append(_.type.isin(nebula_types))

starplot/plotters/stars.py

@@ -180,7 +180,7 @@ class StarPlotterMixin:
         Args:
             where: A list of expressions that determine which stars to plot. See [Selecting Objects](/reference-selecting-objects/) for details.
             where_labels: A list of expressions that determine which stars are labeled on the plot (this includes all labels: name, Bayer, and Flamsteed). If you want to hide **all** labels, then set this arg to `[False]`. See [Selecting Objects](/reference-selecting-objects/) for details.
-            catalog: The catalog of stars to use: "big-sky-mag11", or "big-sky" -- see [`StarCatalog`](/reference-data/#starplot.data.stars.StarCatalog) for details
+            catalog: The catalog of stars to use: "big-sky-mag11", or "big-sky" -- see [star catalogs](/data/star-catalogs/) for details
             style: If `None`, then the plot's style for stars will be used
             size_fn: Callable for calculating the marker size of each star. If `None`, then the marker style's size will be used.
             alpha_fn: Callable for calculating the alpha value (aka "opacity") of each star. If `None`, then the marker style's alpha will be used.

{starplot-0.15.4.dist-info → starplot-0.15.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: starplot
-Version: 0.15.4
+Version: 0.15.6
 Summary: Star charts and maps of the sky
 Keywords: astronomy,stars,charts,maps,constellations,sky,plotting
 Author-email: Steve Berardi <hello@steveberardi.com>
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+License-File: LICENSE
 Requires-Dist: matplotlib >= 3.8.0
 Requires-Dist: numpy >= 1.26.2
 Requires-Dist: pandas >= 1.4.0
@@ -25,7 +26,7 @@ Requires-Dist: pyogrio >= 0.10.0
 Requires-Dist: rtree >= 1.2.0
 Requires-Dist: requests >= 2.31.0
 Requires-Dist: duckdb ~= 1.1.3
-Requires-Dist: ibis-framework[duckdb, geospatial] ~= 9.5.0
+Requires-Dist: ibis-framework[duckdb, geospatial] < 11
 Project-URL: Documentation, https://starplot.dev
 Project-URL: Home, https://starplot.dev
 Project-URL: Source, https://github.com/steveberardi/starplot

{starplot-0.15.4.dist-info → starplot-0.15.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
-starplot/__init__.py,sha256=zQ2JDEfSJixS0dULL0hIuq1yaqhzGjTkeDyvFeHU0FE,558
-starplot/base.py,sha256=JjBqM96gPoBFngbxZ5dsHDKwbsBsrviEipAlljtl8YU,42842
+starplot/__init__.py,sha256=HcBm5p7wfCcnsDaBPmpDAwcunStcLJSiZPoKfHZ2qUI,558
+starplot/base.py,sha256=s-mixdIBeT5QcKYuGXy52oBrg7wJO2rpmHmXqorex1c,43223
 starplot/callables.py,sha256=_zDGCAJTqqNLvCtcIt4PVEe2L0Ggvl6pj-7ZFI-0zqI,4043
 starplot/cli.py,sha256=W-V-h1DeD8zwzdhYuQ-i26LSZWYcS_NJ0zRXa-dmy1o,711
 starplot/coordinates.py,sha256=7LDz32VTKa8H-4F67-XvzmjpcTVojZwYVJzXZkBaZ3U,136
@@ -8,7 +8,7 @@ starplot/geometry.py,sha256=wr1vJo-WWP51bfblVC2CAR7288yWrG31dZg9ks9vfYg,4359
 starplot/horizon.py,sha256=vsJCsJE5VJEe0vlx6A-L70LAGjbey9xMjgUcRSj1F4Y,15808
 starplot/map.py,sha256=CIJC2CoAhH4SlV-dgLC4xDqCoyqXl7DOGegZafRIoqU,23441
 starplot/mixins.py,sha256=8X-LhFbsVNBZN1PKIjlftknppRpcQMOMYE15gdNC-sE,4857
-starplot/optic.py,sha256=7lGUOJf7z-xCu84zlsALF154Jm2riiHO3JzVPAfptKY,15318
+starplot/optic.py,sha256=NlZZBHRX13KHingNiofv6XDXWUZ4yKH7StBUHuSX_vc,15406
 starplot/optics.py,sha256=JfSzfrCx_g8r3upyukgJUtXekwyVkCJ3dZxdOclfzU4,8624
 starplot/profile.py,sha256=V5LOZFDdnGo-P8ikWvV3jmUVJIKO3gd4H2bjBlk7aUM,300
 starplot/projections.py,sha256=o5wHLoaU8o0s0Z2kkWKxeNbOrskvWG88ULAXDoLOGeA,3423
@@ -23,11 +23,11 @@ starplot/data/constellations.py,sha256=E-wEyZ4W5lcUS_StH26F9NMRsFyFs-utGxGcfRK7z
 starplot/data/db.py,sha256=77oWr2HkZ95K_mG4vLc-ivP_SOFIiFYwoqrtTw-YWtk,384
 starplot/data/dsos.py,sha256=tx-6oDzKPthg-nxfda2ah5t10USdyrckP4UjM5k-e10,1237
 starplot/data/ecliptic.py,sha256=Qre9YdFbTC9mAx-vd2C0Ou4CsnRehIScnTpmEUDDYcM,4638
-starplot/data/stars.py,sha256=qYhP8Cr2zDR1vke7AJznTcVMtD6w92jW97XnGCAqdsw,12046
+starplot/data/stars.py,sha256=iM0zWqjQe8L8rAekFY0FtPXRutnK6Nv4jhoV6m8983g,12077
 starplot/data/utils.py,sha256=RPk3bnfL-KtjMk1VQygDD27INz_gEya_B1hu7X4K8hU,772
 starplot/data/library/bigsky.0.4.0.stars.mag11.parquet,sha256=-_D6bghArUh1cmOKktxmmBFQNThiCWjVleI0wduP1GI,38884673
 starplot/data/library/de421_2001.bsp,sha256=ymkZigAd8Vgscq_DYkdR4nZ1VGD5wwPd-sxe6HiiTns,5341104
-starplot/data/library/sky.db,sha256=qZg6jHG6XbgndpEn_sB4oHloccvEZRuSLER9idQQ6fU,38023168
+starplot/data/library/sky.db,sha256=gbige0EAs5meX_x3DWPuKO23KiKeujGfIh61pfh_OG4,38023168
 starplot/models/__init__.py,sha256=qi4arVatzEcR9TAbHadSbhq8xRhSb1_Br3UKNv4FP7o,330
 starplot/models/base.py,sha256=zuHcRSs4eSyIwtyUTsAk9a73bnIW2gfWh7Ze_zt8Tq0,1623
 starplot/models/constellation.py,sha256=qfBcWyQRL2m83wNIKiPk-4bGRblYvabxymW6TJ0nXFI,3355
@@ -38,11 +38,11 @@ starplot/models/planet.py,sha256=QekNlSRw6tv5-TY8qUFvtLKxmz7ao6nv3Iwl7FiGeHY,501
 starplot/models/star.py,sha256=7LPlqZInBdu4D5XH2sJDiM6IJvtyVDAZvijMMH5hGAY,4693
 starplot/models/sun.py,sha256=iUforZSmzw-o_tOKHgYslhFHUQTQxllDKMG1HdzlI98,2695
 starplot/plotters/__init__.py,sha256=p2wpyY_jK5_zOWWbGtokw4tcHBTuILjAhuobghDvdvM,223
-starplot/plotters/constellations.py,sha256=udfyx4_hCQ3cV_Ldr_kEY1p3E-MhR2o4oJBTPikaSxo,12823
-starplot/plotters/dsos.py,sha256=rmLV5bpC1t-TkbKeDy57at07-9xN63oYbdt0jn6Im5s,8283
+starplot/plotters/constellations.py,sha256=IDVVfEsNPbPC4E692bgr-bQqiV8mQuu18BFZKYHMV_k,13094
+starplot/plotters/dsos.py,sha256=AtqhphVOfjuYZtxmgF18d3jzTYaIv2j6xnZCO9anpds,8406
 starplot/plotters/experimental.py,sha256=P4T9jJyAnViv6k2RJpmYEY8uI-0dyd-E6NeIRUWbu6c,5909
 starplot/plotters/milkyway.py,sha256=ofenSqpqeeg7_LlWnH1PJiiHstzD-qQL7Lk6-WlEv2M,1122
-starplot/plotters/stars.py,sha256=npIghOtFChA6RRDffyc1el1_YwEFN4jKmTixLynqJTA,11738
+starplot/plotters/stars.py,sha256=AB3O16Ql38z3_ityAJJljzRtnVixvZ22kaJAXqj4hNs,11710
 starplot/styles/__init__.py,sha256=rtwzAylENUGIYGDPl106RGjU6e89yNURoxmPD3I_HM0,193
 starplot/styles/base.py,sha256=fuj_hWqF5xViJMhisyRCh88YRNHCcvxIqGeBlBIm6cw,36405
 starplot/styles/extensions.py,sha256=Mv9FTSbwEtB4IFuo_5MFDlHRYQsKdC-19uLYtmJSUuE,649
@@ -92,8 +92,8 @@ starplot/styles/fonts-library/inter/Inter-SemiBoldItalic.ttf,sha256=HhKJRT16iVz7
 starplot/styles/fonts-library/inter/Inter-Thin.ttf,sha256=TDktzIrZFvD533VZq1VjsB3ZT587LbNGF_45LgAGAzk,403404
 starplot/styles/fonts-library/inter/Inter-ThinItalic.ttf,sha256=X8Ca-UpEf65vgsAPFd-u-ernxWDmy-RtPoRSQBmldKo,410232
 starplot/styles/fonts-library/inter/LICENSE.txt,sha256=JiSB6ERSGzJvXs0FPlm5jIstp4yO4b27boF0MF5Uk1o,4380
-starplot-0.15.4.dist-info/entry_points.txt,sha256=Sm6jC6h_RcaMGC8saLnYmT0SdhcF9_rMeQIiHneLHyc,46
-starplot-0.15.4.dist-info/LICENSE,sha256=jcjClHF4BQwhz-kDgia-KphO9Zxu0rCa2BbiA7j1jeU,1070
-starplot-0.15.4.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
-starplot-0.15.4.dist-info/METADATA,sha256=SwrPxIPfGOWHxstYJBPiioWIno_L1_ONfbGqM6xfxhY,4258
-starplot-0.15.4.dist-info/RECORD,,
+starplot-0.15.6.dist-info/entry_points.txt,sha256=Sm6jC6h_RcaMGC8saLnYmT0SdhcF9_rMeQIiHneLHyc,46
+starplot-0.15.6.dist-info/licenses/LICENSE,sha256=jcjClHF4BQwhz-kDgia-KphO9Zxu0rCa2BbiA7j1jeU,1070
+starplot-0.15.6.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
+starplot-0.15.6.dist-info/METADATA,sha256=dirAqiVfN0z6zfJ62tMAssHoQEBDULtzfms5WWM2Ijs,4276
+starplot-0.15.6.dist-info/RECORD,,

{starplot-0.15.4.dist-info → starplot-0.15.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: flit 3.10.1
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any