starplot 0.12.0__py2.py3-none-any.whl → 0.12.2__py2.py3-none-any.whl

starplot/__init__.py

@@ -1,6 +1,6 @@
 """Star charts and maps"""
 
-__version__ = "0.12.0"
+__version__ = "0.12.2"
 
 from .base import BasePlot  # noqa: F401
 from .map import MapPlot, Projection  # noqa: F401

starplot/base.py

@@ -10,6 +10,7 @@ from matplotlib import patches
 from matplotlib import pyplot as plt, patheffects
 from matplotlib.lines import Line2D
 from pytz import timezone
+from shapely import Polygon
 
 from starplot import geod, models
 from starplot.data import load, ecliptic
@@ -498,13 +499,28 @@ class BasePlot(ABC):
         self.ax.add_patch(patch)
 
     @use_style(PolygonStyle)
-    def polygon(self, points: list, style: PolygonStyle):
-        """Plots a polygon of points
+    def polygon(
+        self,
+        style: PolygonStyle,
+        points: list = None,
+        geometry: Polygon = None,
+    ):
+        """
+        Plots a polygon.
+
+        Must pass in either `points` **or** `geometry` (but not both).
 
         Args:
             points: List of polygon points `[(ra, dec), ...]` - **must be in counterclockwise order**
+            geometry: A shapely Polygon. If this value is passed, then the `points` kwarg will be ignored.
             style: Style of polygon
         """
+        if points is None and geometry is None:
+            raise ValueError("Must pass points or geometry when plotting polygons.")
+
+        if geometry is not None:
+            points = list(zip(*geometry.exterior.coords.xy))
+
         _points = [(ra * 15, dec) for ra, dec in points]
         self._polygon(_points, style)
 

starplot/map.py

@@ -451,17 +451,27 @@ class MapPlot(BasePlot, ExtentMaskMixin, StarPlotterMixin, DsoPlotterMixin):
         """
         mw = self._read_geo_package(DataFiles.MILKY_WAY.value)
 
-        if not mw.empty:
-            # create union of all Milky Way patches
-            gs = mw.geometry.to_crs(self._plate_carree)
-            mw_union = gs.buffer(0.1).unary_union.buffer(-0.1)
-            points = list(zip(*mw_union.boundary.coords.xy))
+        if mw.empty:
+            return
 
+        def _prepare_polygon(p):
+            points = list(zip(*p.boundary.coords.xy))
             # convert lon to RA and reverse so the coordinates are counterclockwise order
-            points = [(lon_to_ra(lon) * 15, dec) for lon, dec in reversed(points)]
+            return [(lon_to_ra(lon) * 15, dec) for lon, dec in reversed(points)]
+
+        # create union of all Milky Way patches
+        gs = mw.geometry.to_crs(self._plate_carree)
+        mw_union = gs.buffer(0.1).unary_union.buffer(-0.1)
+        polygons = []
+
+        if mw_union.geom_type == "MultiPolygon":
+            polygons.extend([_prepare_polygon(polygon) for polygon in mw_union.geoms])
+        else:
+            polygons.append(_prepare_polygon(mw_union))
 
+        for polygon_points in polygons:
             self._polygon(
-                points,
+                polygon_points,
                 style=style,
             )
 

starplot/styles/base.py

@@ -1,7 +1,7 @@
 import json
 from enum import Enum
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Union
 from functools import cache
 
 import yaml
@@ -332,8 +332,8 @@ class LineStyle(BaseStyle):
     color: ColorStr = ColorStr("#000")
     """Color of the line. Can be a hex, rgb, hsl, or word string."""
 
-    style: LineStyleEnum = LineStyleEnum.SOLID
-    """Style of the line (e.g. solid, dashed, etc)."""
+    style: Union[LineStyleEnum, tuple] = LineStyleEnum.SOLID
+    """Style of the line (e.g. solid, dashed, etc). Can be a predefined value in `LineStyleEnum` or a [Matplotlib linestyle tuple](https://matplotlib.org/stable/gallery/lines_bars_and_markers/linestyles.html)."""
 
     dash_capstyle: DashCapStyleEnum = DashCapStyleEnum.PROJECTING
     """Style of dash endpoints"""
@@ -401,8 +401,8 @@ class PolygonStyle(BaseStyle):
     fill_color: Optional[ColorStr] = None
     """Fill color of the polygon"""
 
-    line_style: LineStyleEnum = LineStyleEnum.SOLID
-    """Edge line style"""
+    line_style: Union[LineStyleEnum, tuple] = LineStyleEnum.SOLID
+    """Edge line style. Can be a predefined value in `LineStyleEnum` or a [Matplotlib linestyle tuple](https://matplotlib.org/stable/gallery/lines_bars_and_markers/linestyles.html)."""
 
     alpha: float = 1.0
     """Alpha value (controls transparency)"""
@@ -419,6 +419,7 @@ class PolygonStyle(BaseStyle):
             linestyle=self.line_style,
             alpha=self.alpha,
             zorder=self.zorder,
+            capstyle="round",
         )
         if self.color:
             styles["color"] = self.color.as_hex()

{starplot-0.12.0.dist-info → starplot-0.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: starplot
-Version: 0.12.0
+Version: 0.12.2
 Summary: Star charts and maps
 Keywords: astronomy,stars,charts,maps,constellations
 Author-email: Steve Berardi <hello@steveberardi.com>

{starplot-0.12.0.dist-info → starplot-0.12.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-starplot/__init__.py,sha256=bSGsGKZh8KGDm17jVK-aZ65sdWIYncR5rF5Mfe1jTSQ,435
-starplot/base.py,sha256=sSaDlw8J2krLimJ5JkusnuyYShP_4rZcomhHDRiHKsI,28801
+starplot/__init__.py,sha256=2lnh-uGVPlF6yYtorZZRVz4sfHXRnDGyoISl3tbDdYs,435
+starplot/base.py,sha256=QYjlLeiEZ5M3fq2NQiaQdkTjUVamzsc5_V2Ry-KWP2M,29309
 starplot/callables.py,sha256=5GZZoOhYc3wAJTzPgXt_tHdjIr-fKdhCbWjm6FT7Er8,2927
 starplot/geod.py,sha256=QJmF6dOa4dpLoLQ32QsiXaG4gBpTBuagzSFquM9OzsM,2665
-starplot/map.py,sha256=gR4rZtjp8z52SZoMC1lN82j5iTEwlttCbIT3mpD9YkE,30743
+starplot/map.py,sha256=Xw6jVGGAULl1S6yI7SzGyhfUXE2oeVFJE90ehbyzIRA,31048
 starplot/mixins.py,sha256=Gp6qzlz-QWHI5pxWLSbrmBF7LltY0isBZm-Z4saSZo0,3249
 starplot/optic.py,sha256=8F7CTJcVXPYLeXlsBNSHtO_qIqm4uC4HBtbbqG1-0Ag,14197
 starplot/optics.py,sha256=JfSzfrCx_g8r3upyukgJUtXekwyVkCJ3dZxdOclfzU4,8624
@@ -46,7 +46,7 @@ starplot/plotters/__init__.py,sha256=MvgqZDMPuR3NaHW9SoiAk47HyMSiFwjrv34RTa_j0rs
 starplot/plotters/dsos.py,sha256=vyFx2eB1NhSZdkumSPy7VfgoFx79E1TCIUr1q3eiDpU,9066
 starplot/plotters/stars.py,sha256=VF76I5zv8XpH97y3vbfinKMQQ8BDGqBsQpyPXfK5ho8,8455
 starplot/styles/__init__.py,sha256=luEPtL8bIpcCCUlvBojmYn7XQtGYapId-8xuA2m783U,124
-starplot/styles/base.py,sha256=Y3nz8jEu2zUUUX_KkdDiiiFXhdIioVxTCQVhbSuCkCs,29959
+starplot/styles/base.py,sha256=S77625QNXNuTnvjvY6zI9_gzMc3tv-NUuTOjJDIePsc,30341
 starplot/styles/extensions.py,sha256=4DsFMOHy3PHpam14o-S7f73jNTR7ARNFE21ZUo8_RGU,615
 starplot/styles/helpers.py,sha256=AGgHWaHLzJZ6jicvwPzY-p5oSHE0H8gDk1raCmeRFtg,3032
 starplot/styles/markers.py,sha256=iDuzpBnRhrhElBzv5M4AWxValDxpTFaIcldq46VB4_M,2135
@@ -61,7 +61,7 @@ starplot/styles/ext/grayscale_dark.yml,sha256=6tm79qOdYpNc38bToak9RX-NHabrcE5jFN
 starplot/styles/ext/map.yml,sha256=HbP7po572UMdDmYFyA34Reac9s8V2nEoO9pi5DT9M1o,120
 starplot/styles/ext/nord.yml,sha256=AXQ-YGbKGOaQgGO6qdnNKYa1ushn3IYofg04ztE4EHE,2615
 starplot/styles/ext/optic.yml,sha256=fiTvTl8Ka07o5KqtIqqBGL65ADjnMe6oyxTBbfoHz40,236
-starplot-0.12.0.dist-info/LICENSE,sha256=jcjClHF4BQwhz-kDgia-KphO9Zxu0rCa2BbiA7j1jeU,1070
-starplot-0.12.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-starplot-0.12.0.dist-info/METADATA,sha256=eiK37ATvFFV3oMPOeyfXXjKg3n3ALaWf39XEKZVR_8A,4120
-starplot-0.12.0.dist-info/RECORD,,
+starplot-0.12.2.dist-info/LICENSE,sha256=jcjClHF4BQwhz-kDgia-KphO9Zxu0rCa2BbiA7j1jeU,1070
+starplot-0.12.2.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+starplot-0.12.2.dist-info/METADATA,sha256=zJeM49DBvS4zFSgmFvti0A9yW87RC4s6UuWZicUXGhs,4120
+starplot-0.12.2.dist-info/RECORD,,