starplot 0.11.3__py2.py3-none-any.whl → 0.11.4__py2.py3-none-any.whl

starplot/__init__.py

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

starplot/models/dso.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from starplot.data.dsos import DsoType
+from starplot.data.dsos import DsoType, load_ongc, ONGC_TYPE_MAP
 from starplot.mixins import CreateMapMixin, CreateOpticMixin
 from starplot.models.base import SkyObject, SkyObjectManager
 
@@ -8,27 +8,12 @@ from starplot.models.base import SkyObject, SkyObjectManager
 class DsoManager(SkyObjectManager):
     @classmethod
     def all(cls):
-        from starplot.data.dsos import load_ongc, ONGC_TYPE_MAP
-
         all_dsos = load_ongc()
 
         for d in all_dsos.itertuples():
             magnitude = d.mag_v or d.mag_b or None
             magnitude = float(magnitude) if magnitude else None
-            yield DSO(
-                name=d.name,
-                ra=d.ra_degrees / 15,
-                dec=d.dec_degrees,
-                type=ONGC_TYPE_MAP[d.type],
-                maj_ax=d.maj_ax,
-                min_ax=d.min_ax,
-                angle=d.angle,
-                magnitude=magnitude,
-                size=d.size_deg2,
-                m=d.m,
-                ngc=d.ngc,
-                ic=d.ic,
-            )
+            yield from_tuple(d)
 
 
 class DSO(SkyObject, CreateMapMixin, CreateOpticMixin):
@@ -131,3 +116,22 @@ class DSO(SkyObject, CreateMapMixin, CreateOpticMixin):
 
         """
         pass
+
+
+def from_tuple(d: tuple) -> DSO:
+    magnitude = d.mag_v or d.mag_b or None
+    magnitude = float(magnitude) if magnitude else None
+    return DSO(
+        name=d.name,
+        ra=d.ra_degrees / 15,
+        dec=d.dec_degrees,
+        type=ONGC_TYPE_MAP[d.type],
+        maj_ax=d.maj_ax,
+        min_ax=d.min_ax,
+        angle=d.angle,
+        magnitude=magnitude,
+        size=d.size_deg2,
+        m=d.m,
+        ngc=d.ngc,
+        ic=d.ic,
+    )

starplot/plotters/dsos.py

@@ -10,7 +10,7 @@ from starplot.data.dsos import (
     DsoLabelMaker,
     load_ongc,
 )
-from starplot.models import DSO
+from starplot.models.dso import DSO, from_tuple
 from starplot.styles import MarkerSymbolEnum
 
 
@@ -22,22 +22,6 @@ class DsoPlotterMixin:
         coords.append(coords[0])
         self._polygon(coords, style.marker.to_polygon_style(), closed=False)
 
-    def _dso_from_df_tuple(self, d):
-        magnitude = d.mag_v or d.mag_b or None
-        magnitude = float(magnitude) if magnitude else None
-        return DSO(
-            name=d.name,
-            ra=d.ra_degrees / 15,
-            dec=d.dec_degrees,
-            type=ONGC_TYPE_MAP[d.type],
-            maj_ax=d.maj_ax,
-            min_ax=d.min_ax,
-            angle=d.angle,
-            magnitude=magnitude,
-            size=d.size_deg2,
-            m=d.m,
-        )
-
     def open_clusters(self, *args, **kwargs):
         """
         Plots open clusters
@@ -155,7 +139,7 @@ class DsoPlotterMixin:
             legend_label = legend_labels.get(dso_type)
             magnitude = d.mag_v or d.mag_b or None
             magnitude = float(magnitude) if magnitude else None
-            _dso = self._dso_from_df_tuple(d)
+            _dso = from_tuple(d)
 
             if any(
                 [

{starplot-0.11.3.dist-info → starplot-0.11.4.dist-info}/METADATA

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

{starplot-0.11.3.dist-info → starplot-0.11.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-starplot/__init__.py,sha256=B9cAP4b-UO1EcKuzXMvaPAKm--7v7CgP9DA-fG435TI,435
+starplot/__init__.py,sha256=WIGsb7deLkVk2bFq_QmwVxXFOx3q35C9012S9Ak0RZQ,435
 starplot/base.py,sha256=7fen823EBPzjPk8FtF7R4eB1Ub-EczuHhVma74sKMeQ,28214
 starplot/callables.py,sha256=5GZZoOhYc3wAJTzPgXt_tHdjIr-fKdhCbWjm6FT7Er8,2927
 starplot/geod.py,sha256=QJmF6dOa4dpLoLQ32QsiXaG4gBpTBuagzSFquM9OzsM,2665
@@ -32,14 +32,14 @@ starplot/data/library/stars.hipparcos.parquet,sha256=wipUr4K0OyYIot7VuwqPCVkQ1iQ
 starplot/models/__init__.py,sha256=fnf_ELnfbqLsrEabc6B259ouqi38tG1BPlVw4m4pmFI,312
 starplot/models/base.py,sha256=KXCvm21Mu_rPx-O1Te5gXQ_ue6_j21F19sjeWK43fPE,4356
 starplot/models/constellation.py,sha256=8XW8bdnDNlXEIxUDnPqg6ME5QIGAwKsUul2O81Plq9A,1958
-starplot/models/dso.py,sha256=ke1hGPOv1n8JGR9SbVS50rdetO7wsGfDDwPc7pYXEvE,3777
+starplot/models/dso.py,sha256=ksgLzw_HGzewMksa2waUow8c88sc8dfOW4t6OIj2x9k,3793
 starplot/models/moon.py,sha256=21quuL8qlMzBWCYjS58yxski6RpIs3sIlyz3p9sttp4,5151
 starplot/models/objects.py,sha256=p4HcC0f94qZOcmGtyRhIh9cdFmEID403-LN3GVJMTSE,562
 starplot/models/planet.py,sha256=pxXwofKLx9dUGCbz_yJ6Ywj0_f_f6dD3VLoHWN9p3iw,5106
 starplot/models/star.py,sha256=yXwQ7x0yOYS2bBYfxs_tpCVRKqdSo4nbDBvAScgQ8WQ,2296
 starplot/models/sun.py,sha256=FUOxmUyuopky_-2Mgtl-kJI6aYzUUhb0rwSjCQnKHaA,2709
 starplot/plotters/__init__.py,sha256=MvgqZDMPuR3NaHW9SoiAk47HyMSiFwjrv34RTa_j0rs,98
-starplot/plotters/dsos.py,sha256=dySYUdCu2wWS-_ztKnTxfIYOQUGTB7uqUffWCdp6jcw,8365
+starplot/plotters/dsos.py,sha256=u2W8u9yuADRmYxV7-0Q2SmbTQqB2lbgfSlLVVmrRrmc,7896
 starplot/plotters/stars.py,sha256=1TkTrmpyIgAFWvvRqexf8-bkCQ6xCZdy5WjwQA8Uq-I,8618
 starplot/styles/__init__.py,sha256=luEPtL8bIpcCCUlvBojmYn7XQtGYapId-8xuA2m783U,124
 starplot/styles/base.py,sha256=cyA3TlIGgFf9Hiw4TuIckgw2p_3rARq5QnxzMhRm5_E,28714
@@ -56,7 +56,7 @@ starplot/styles/ext/grayscale_dark.yml,sha256=sCdEldJnxGnOcb_bHq258GodBCyYxEOoUm
 starplot/styles/ext/map.yml,sha256=HbP7po572UMdDmYFyA34Reac9s8V2nEoO9pi5DT9M1o,120
 starplot/styles/ext/nord.yml,sha256=M6APu9Iks4srC4HGAAhlOlsmdXebhnqq8PPDYGO0zzA,2164
 starplot/styles/ext/optic.yml,sha256=fiTvTl8Ka07o5KqtIqqBGL65ADjnMe6oyxTBbfoHz40,236
-starplot-0.11.3.dist-info/LICENSE,sha256=jcjClHF4BQwhz-kDgia-KphO9Zxu0rCa2BbiA7j1jeU,1070
-starplot-0.11.3.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-starplot-0.11.3.dist-info/METADATA,sha256=P2StKVdSihltdGmRYRrnOZ7f-fiDiZMZ56NZVbaUeZ4,4189
-starplot-0.11.3.dist-info/RECORD,,
+starplot-0.11.4.dist-info/LICENSE,sha256=jcjClHF4BQwhz-kDgia-KphO9Zxu0rCa2BbiA7j1jeU,1070
+starplot-0.11.4.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+starplot-0.11.4.dist-info/METADATA,sha256=bcWwlPwnWGSG8iQ_NxW0zHlMzLi8d254pzdSeqdGtwI,4189
+starplot-0.11.4.dist-info/RECORD,,