v0.15.6 (#143)

* degrees

* allow constellation line collision

* format

* get constellation stars separately

* plot hii

* fix polygon clipping

* changelog

Author: steveberardi

docs/changelog.md

@@ -16,6 +16,11 @@
 - [**v0.15.5**]
     - Fixes compatibility with Ibis 10.x
     - Fixes bug with getting star names and designations
+- [**v0.15.6**]
+    - Removes dependency on plotting stars before constellation labels
+    - Fixes static constellation label plotting
+    - Fixes polygon clipping on optic plots
+    - Adds HII Regions to the `nebula()` function
 
 ## v0.14.x
 [Documentation](https://archives.starplot.dev/0.14.0/)

hash_checks/hashlock.yml

@@ -1,11 +1,11 @@
 horizon_base:
-  dhash: 2f83990dc60b44702e83890d461b44700383cd0d861b4460
+  dhash: 0687590d4409c4700683490d4419c4d006a34d0d441b4460
   filename: /starplot/hash_checks/data/horizon-base.png
-  phash: e3b81ced14b63386
+  phash: e3ba1ce506e23387
 horizon_north_celestial_pole:
-  dhash: 30aa6ad0c2728c54212a6850c272a45431aa48c8c262ac54
+  dhash: 30aa48d0e232a45430aa48d08232a44431aa49c8e232ac54
   filename: /starplot/hash_checks/data/horizon-north-celestial-pole.png
-  phash: d59a38c94ad20be7
+  phash: d59a3ad94ad24bc2
 map_coma_berenices_dso_size:
   dhash: aa84acecc888c0c0a2848ceca888c6c08a8a92a2a882c282
   filename: /starplot/hash_checks/data/map-coma-berenices-dso-size.png
@@ -31,94 +31,94 @@ map_mollweide:
   filename: /starplot/hash_checks/data/map-mollweide.png
   phash: ebcbb69ce3249460
 map_moon_phase_waxing_crescent:
-  dhash: 0814284d4d2814080814284d4d6814080804084d4d480408
+  dhash: 0814284d4d6814080814284d4d6814080804084d4d480408
   filename: /starplot/hash_checks/data/map-moon-phase-waxing-crescent.png
   phash: b3cccc3333cccc31
 map_orion_base:
-  dhash: 18393b5e3e2f656819393b5e2e2d65681c392bce2e2f6468
+  dhash: 18193b5e3a2f646919393bde2a2d646958192bce2a2f6469
   filename: /starplot/hash_checks/data/map-orion-base.png
-  phash: bf795a649504b594
+  phash: bf795a241784359c
 map_orion_extra:
-  dhash: 193b1b7f3b656d17193b1b7f2b656d0f1c3b0b4e2b256c0f
+  dhash: 191b3b7f3b65690f1b191b7f2b25690d1c1b0b4e2b25690d
   filename: /starplot/hash_checks/data/map-orion-extra.png
-  phash: be71e01ee117e491
+  phash: be71e01ee117a499
 map_plot_custom_clip_path_virgo:
   dhash: 060521339d1c04040625252f0d1c0404062525270d1c0404
   filename: /starplot/hash_checks/data/map-custom-clip-path-virgo.png
   phash: e66e8591b10d4bda
 map_plot_limit_by_geometry:
-  dhash: 12288086440c1204a2aa8286040c124432a880c6450c1242
+  dhash: 12e8c086440c124422cac286040c124432e8c086450c5242
   filename: /starplot/hash_checks/data/map-limit-by-geometry.png
-  phash: a40999be6679539a
+  phash: a4509bbe2ee9328e
 map_scope_bino_fov:
   dhash: 86c092848ca28400868633454d21920c868633454d21920c
   filename: /starplot/hash_checks/data/map-scope-bino-fov.png
   phash: e465997166649979
 map_stereo_base:
-  dhash: 77766470353b5412777664f435185416777664f0b598d412
+  dhash: 7372647231385412737264f431185416737664f2b498d412
   filename: /starplot/hash_checks/data/map-stereo-north-base.png
-  phash: 9dce6961c291f23a
+  phash: 9dce6979e81162b2
 map_with_planets:
   dhash: 639344668ddb323b629304668ddb323b2a9304668ddb323b
   filename: /starplot/hash_checks/data/map-mercator-planets.png
   phash: e8c29d89a67f5312
 map_wrapping:
-  dhash: 0f332ccd655231150f332ccd655231150f332ccd65523115
+  dhash: 0f352ccd655231150f352ccd655231150f352ccd65523115
   filename: /starplot/hash_checks/data/map-wrapping.png
-  phash: ba36d8c583c2b716
+  phash: ba36d8c583c2b536
 optic_camera_rotated:
   dhash: 25468b13261c1a6525468b13261c1a6525468b13261c1a65
   filename: /starplot/hash_checks/data/optic-camera-rotated-m45.png
-  phash: bc6cc6941ed97285
+  phash: ac6cc6941edb7285
 optic_clipping:
-  dhash: 70d898f062e4fc5d70d898f0eae4f85971f098f2e6e4fc71
+  dhash: 7099b874e2f4fc4d70d9b8f4eaf4fc5971e898f2d2f4fc71
   filename: /starplot/hash_checks/data/optic-clipping.png
-  phash: 95696a872f9a7870
+  phash: 95696a87279c7871
 optic_m45_binoculars:
   dhash: 8e17237133330e4d8e17237133330e4d8e17237133330e4d
   filename: /starplot/hash_checks/data/optic-m45-binoculars.png
-  phash: aa7b84f186d18ac7
+  phash: ae7b80f182d18ed3
 optic_m45_camera:
-  dhash: 4d715151716559754d715151716559754d71515171655975
+  dhash: 4d717151716549754d717151716549754d71715171654975
   filename: /starplot/hash_checks/data/optic-m45-camera.png
-  phash: ba7b846e843b84d5
+  phash: ae7b846e907b84c5
 optic_m45_reflector:
-  dhash: 8e172b7123330e4d8e172b7123330e4d8e172b7123330e4d
+  dhash: 8e173b712b330e4d8e173b712b330e4d8e173b712b330e4d
   filename: /starplot/hash_checks/data/optic-m45-reflector.png
-  phash: ba7b80e5c6b19a92
+  phash: ba7b84e086e59a93
 optic_m45_scope:
-  dhash: 8e173b5123230e4d8e173b5123230e4d8e173b5123230e4d
+  dhash: 8e172b5133230e4d8e172b5133230e4d8e172b5133230e4d
   filename: /starplot/hash_checks/data/optic-m45-scope.png
-  phash: aa7b84e586b18e93
+  phash: ae7b84e492b1ce83
 optic_moon_phase_full:
   dhash: 0e2b553333552b0e0e2b553333552b0e0e2b553333552b0e
   filename: /starplot/hash_checks/data/optic-moon-phase-full.png
-  phash: fb6ba06295718725
+  phash: fb6fa02395658721
 optic_moon_phase_new:
   dhash: 13498e96968e491313498e96968e491313498e96968e4913
   filename: /starplot/hash_checks/data/optic-moon-phase-new.png
-  phash: e1649e9669496766
+  phash: e5259ec6694c6761
 optic_moon_phase_waxing_crescent:
   dhash: 0e33454d59712b0e0e33454d59712b0e0e33454d59712b0e
   filename: /starplot/hash_checks/data/optic-moon-phase-waxing-crescent.png
   phash: bb26e4999166c699
 optic_orion_nebula_refractor:
-  dhash: 8e1f2d7163230e4d8e1f2d7163230e4d8e1f2d7163230e4d
+  dhash: 8e17257163238e4d8e17257163238e4d8e17257163238e4d
   filename: /starplot/hash_checks/data/optic-orion-nebula-refractor.png
-  phash: ae3ab065c7919e92
+  phash: ae3ab061c3939e96
 optic_polaris_binoculars:
   dhash: 8e172b5523338e4d8e172b5523338e4d8e172b5523338e4d
   filename: /starplot/hash_checks/data/optic-binoculars-polaris.png
-  phash: aa7b84f182d18ed3
+  phash: aa7b84e186d18ed3
 optic_solar_eclipse_binoculars:
-  dhash: 0779649a9ae461071759e49a9ae461170359c09c9cc06903
+  dhash: 0769f0cccccc710f0769f0cccccc710f0369c0cccccc610b
   filename: /starplot/hash_checks/data/optic-binoculars-eclipse.png
-  phash: b1ccce3131cece31
+  phash: b38ccc3333cccc33
 optic_wrapping:
-  dhash: 71f0ec92d2d8650a71e0d4aca4c4782a71e8d4aca4c4713a
+  dhash: 71f0ecd2dad8650a71e0d4aca4c4782a71e8d4aca4c4793a
   filename: /starplot/hash_checks/data/optic-wrapping.png
-  phash: d1846e1b792ef138
+  phash: d1846e1a792ef139
 zenith_base:
-  dhash: 1771d4b8865d338e1771d4b6865d338e1771d49e865d3b0e
+  dhash: 1771cc8ad67d338e1771cc86d47d338e1771c486947d3b0e
   filename: /starplot/hash_checks/data/zenith-base.png
-  phash: ba40eb3be1788764
+  phash: be40fb3ee5289660

src/starplot/__init__.py

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

src/starplot/base.py

@@ -360,6 +360,9 @@ def _text_point(
 
         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 @@ def _text_point(
                 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 @@ def _polygon(self, points: list, style: PolygonStyle, **kwargs):
             # 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(

src/starplot/plotters/constellations.py

@@ -12,9 +12,9 @@
 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 @@ def constellation_borders(self, style: LineStyle = None):
         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 @@ def _constellation_labels_static(self, style, labels):
             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 @@ def constellation_labels(
         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 @@ def constellation_labels(
             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:

src/starplot/plotters/dsos.py

@@ -85,6 +85,9 @@ def nebula(self, **kwargs):
         - 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 @@ def nebula(self, **kwargs):
             DsoType.EMISSION_NEBULA,
             DsoType.STAR_CLUSTER_NEBULA,
             DsoType.REFLECTION_NEBULA,
+            DsoType.HII_IONIZED_REGION,
         ]
         where = kwargs.pop("where", [])
         where.append(_.type.isin(nebula_types))