v0.5.2 (#38)

* relative buffer

* hide milky way in minimal style

* adjust star sizing

* styles and star sizes

* sizing

* format

* styles

* update tests

* examples

* version

Author: steveberardi

docs/images/example_3.png

@@ -20,8 +20,8 @@ def create_map_orion():
     style = PlotStyle().extend(
         # extensions.GRAYSCALE,
         # extensions.BLUE_LIGHT,
-        # extensions.BLUE_MEDIUM,
-        extensions.BLUE_DARK,
+        extensions.BLUE_MEDIUM,
+        # extensions.BLUE_DARK,
         extensions.MAP,
         {
             "star": {
@@ -47,7 +47,7 @@ def create_map_orion():
         dec_max=23.6,
         limiting_magnitude=7.2,
         style=style,
-        resolution=3000,
+        resolution=2600,
     )
     # marker for M42
     p.plot_object(
@@ -239,8 +239,8 @@ def create_galaxy_test():
     style = PlotStyle().extend(
         # sp.styles.extensions.HIDE_LABELS,
         # extensions.GRAYSCALE,
-        extensions.BLUE_LIGHT,
-        # extensions.BLUE_MEDIUM,
+        # extensions.BLUE_LIGHT,
+        extensions.BLUE_MEDIUM,
         # extensions.BLUE_DARK,
         extensions.MAP,
         {
@@ -314,11 +314,11 @@ def create_scope_view_m11():
 
     p = sp.MapPlot(
         projection=Projection.MERCATOR,
-        ra_min=18.7,
-        ra_max=19,
+        ra_min=18.6,
+        ra_max=19.16,
         dec_min=-8,
-        dec_max=-4,
-        limiting_magnitude=14,
+        dec_max=-3,
+        limiting_magnitude=11,
         style=style,
         resolution=2000,
         star_catalog="tycho-1",
@@ -334,6 +334,27 @@ def create_scope_view_m11():
     p.export("temp/map-m11.svg", format="svg", padding=0.3)
 
 
+def create_startest():
+    style = PlotStyle().extend(
+        # extensions.MINIMAL,
+        extensions.BLUE_LIGHT,
+        extensions.MAP,
+    )
+
+    p = sp.MapPlot(
+        projection=Projection.STEREO_NORTH,
+        ra_min=2,
+        ra_max=6,
+        dec_min=60,
+        dec_max=85,
+        limiting_magnitude=8,
+        style=style,
+        resolution=3000,
+        star_catalog="tycho-1",
+    )
+    p.export("temp/stars.png", format="png", padding=0.3)
+
+
 def dump_extensions():
     import yaml
 
@@ -354,16 +375,16 @@ def dump_extensions():
 
 # ------------------------------------------
 
-
-# create_scope_view_m45()
+create_startest()
+create_scope_view_m45()
 create_scope_view_m11()
-# create_galaxy_test()
+create_galaxy_test()
 
 # create_zenith()
 # create_map_mercator()
 # create_map_stereo_north()
 # create_map_stereo_south()
-# create_map_orion()
+create_map_orion()
 # create_map_sgr()
 
 # create_map_with_planets()

docs/images/example_4.png

@@ -1,6 +1,6 @@
 """Star charts and maps"""
 
-__version__ = "0.5.1"
+__version__ = "0.5.2"
 
 from .base import StarPlot  # noqa: F401
 from .zenith import ZenithPlot  # noqa: F401

examples/03_map_orion.png

@@ -68,6 +68,7 @@ class MapPlot(StarPlot):
         hide_colliding_labels: If True, then labels will not be plotted if they collide with another existing label
         adjust_text: If True, then the labels will be adjusted to avoid overlapping
         star_catalog: The catalog of stars to use: "hipparcos" or "tycho-1" -- Hipparcos is the default and has about 10x less stars than Tycho-1 but will also plot much faster
+        rasterize_stars: 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
 
     Returns:
         MapPlot: A new instance of a MapPlot
@@ -90,6 +91,7 @@ def __init__(
         hide_colliding_labels: bool = True,
         adjust_text: bool = False,
         star_catalog: stars.StarCatalog = stars.StarCatalog.HIPPARCOS,
+        rasterize_stars: bool = False,
         *args,
         **kwargs,
     ) -> "MapPlot":
@@ -111,6 +113,7 @@ def __init__(
         self.dec_min = dec_min
         self.dec_max = dec_max
         self.star_catalog = star_catalog
+        self.rasterize_stars = rasterize_stars
 
         self._init_plot()
 
@@ -204,23 +207,36 @@ def _plot_stars(self):
         )
         eph = load(self.ephemeris)
         earth = eph["earth"]
+
+        ra_buffer = (self.ra_max - self.ra_min) / 4
+        dec_buffer = (self.dec_max - self.dec_min) / 4
+
         nearby_stars_df = stardata[
             (stardata["magnitude"] <= self.limiting_magnitude)
-            & (stardata["ra_hours"] < self.ra_max + 5)
-            & (stardata["ra_hours"] > self.ra_min - 5)
-            & (stardata["dec_degrees"] < self.dec_max + 10)
-            & (stardata["dec_degrees"] > self.dec_min - 10)
+            & (stardata["ra_hours"] < self.ra_max + ra_buffer)
+            & (stardata["ra_hours"] > self.ra_min - ra_buffer)
+            & (stardata["dec_degrees"] < self.dec_max + dec_buffer)
+            & (stardata["dec_degrees"] > self.dec_min - dec_buffer)
         ]
         nearby_stars = Star.from_dataframe(nearby_stars_df)
         astrometric = earth.at(self.timescale).observe(nearby_stars)
         stars_ra, stars_dec, _ = astrometric.radec()
 
         sizes = []
+        alphas = []
         for m in nearby_stars_df["magnitude"]:
-            if m < 4.6:
-                sizes.append((8 - m) ** 2.36 * self._size_multiplier)
+            if m < 1.6:
+                sizes.append((9 - m) ** 2.85 * self._size_multiplier)
+                alphas.append(1)
+            elif m < 4.6:
+                sizes.append((8 - m) ** 2.92 * self._size_multiplier)
+                alphas.append(1)
+            elif m < 5.8:
+                sizes.append((9 - m) ** 2.46 * self._size_multiplier)
+                alphas.append(0.9)
             else:
-                sizes.append(0.75 * self._size_multiplier)
+                sizes.append(2.23 * self._size_multiplier)
+                alphas.append((16 - m) * 0.09)
 
         # Plot Stars
         if self.style.star.marker.visible:
@@ -229,6 +245,11 @@ def _plot_stars(self):
                 sizes,
                 zorder=self.style.star.marker.zorder,
                 color=self.style.star.marker.color.as_hex(),
+                edgecolors=self.style.star.marker.edge_color.as_hex()
+                if self.style.star.marker.edge_color
+                else "none",
+                rasterized=self.rasterize_stars,
+                alpha=alphas,
                 **self._plot_kwargs(),
             )
             self._add_legend_handle_marker("Star", self.style.star.marker)

examples/04_map_m45_scope.png

@@ -141,7 +141,7 @@ class MarkerStyle(BaseStyle):
     color: ColorStr = ColorStr("#000")
     """Fill color of marker. Can be a hex, rgb, hsl, or word string."""
 
-    edge_color: ColorStr = ColorStr("#000")
+    edge_color: Optional[ColorStr] = ColorStr("#000")
     """Edge color of marker. Can be a hex, rgb, hsl, or word string."""
 
     symbol: MarkerSymbolEnum = MarkerSymbolEnum.POINT
@@ -165,7 +165,7 @@ class MarkerStyle(BaseStyle):
     def matplot_kwargs(self, size_multiplier: float = 1.0) -> dict:
         return dict(
             color=self.color.as_hex(),
-            markeredgecolor=self.edge_color.as_hex(),
+            markeredgecolor=self.edge_color.as_hex() if self.edge_color else "none",
             marker=self.symbol,
             markersize=self.size * size_multiplier * FONT_SCALE,
             fillstyle=self.fill,
@@ -421,7 +421,7 @@ class PlotStyle(BaseStyle):
 
     # Stars
     star: ObjectStyle = ObjectStyle(
-        marker=MarkerStyle(fill=FillStyleEnum.FULL, zorder=1, size=10),
+        marker=MarkerStyle(fill=FillStyleEnum.FULL, zorder=1, size=10, edge_color=None),
         label=LabelStyle(font_size=9, font_weight=FontWeightEnum.BOLD, zorder=1),
     )
     """Styling for stars *(see [`ObjectStyle`][starplot.styles.ObjectStyle])*"""

scripts/scratchpad.py

@@ -30,6 +30,7 @@ dso:
   marker:
     alpha: 0.46
     color: rgb(230, 204, 147)
+    edge_color: '#d2a441'
     fill: full
     size: 4
 dso_double_star:
@@ -41,16 +42,24 @@ dso_galaxy:
   marker:
     alpha: 0.6
     color: '#D99CBA'
+    edge_color: '#bd5187'
 dso_nebula:
   marker:
     alpha: 0.45
     color: '#9CD9BB'
+    edge_color: '#52896e'
 dso_open_cluster:
   label:
     visible: false
   marker:
     alpha: 0.45
     color: '#d8d99c'
+    edge_color: '#9d9f3c'
+dso_globular_cluster:
+  marker:
+    alpha: 0.5
+    color: '#c7c7c7'
+    edge_color: '#444'
 
 ecliptic:
   label:
@@ -99,4 +108,4 @@ star:
 
 legend:
   background_color: '#a0abbf'
-  background_alpha: 0.6
+  background_alpha: 1.0

src/starplot/__init__.py

@@ -21,16 +21,19 @@ dso_galaxy:
   marker:
     alpha: 0.5
     color: hsl(18, 68%, 75%)
+    edge_color: hsl(18, 68%, 40%)
 dso_nebula:
   marker:
     alpha: 0.5
     color: hsl(91, 53%, 75%)
+    edge_color: hsl(91, 53%, 40%)
 dso_open_cluster:
   label:
     visible: false
   marker:
     alpha: 0.3
     color: '#fffb68'
+    edge_color: '#989400'
 ecliptic:
   label:
     font_color: '#e33b3b'

src/starplot/map.py

@@ -53,16 +53,24 @@ dso_galaxy:
   marker:
     alpha: 0.45
     color: '#D99CBA'
+    edge_color: '#b15d87'
 dso_nebula:
   marker:
-    alpha: 0.45
-    color: '#a8f5b0'
+    alpha: 0.56
+    color: hsl(91, 62%, 82%)
+    edge_color: hsl(91, 53%, 40%)
 dso_open_cluster:
   label:
     visible: false
   marker:
-    alpha: 0.5
-    color: '#EDF5A8'
+    alpha: 0.4
+    color: '#fffb68'
+    edge_color: '#989400'
+dso_globular_cluster:
+  marker:
+    alpha: 0.8
+    color: '#c7c7c7'
+    edge_color: '#444'
 
 legend:
   background_color: '#f1f6ff'

src/starplot/styles/base.py

@@ -3,6 +3,8 @@ bayer_labels:
 constellation:
   label:
     visible: false
+  line:
+    visible: false
 constellation_borders:
   visible: false
 dso:
@@ -31,3 +33,5 @@ legend:
   visible: false
 tick_marks:
   visible: false
+milky_way:
+  visible: false

src/starplot/styles/ext/blue_dark.yml

@@ -47,7 +47,7 @@ def map_plot_stereo_north():
 def test_map_plot_mercator_base(map_plot_mercator):
     filename = DATA_PATH / "actual-mercator-base.png"
     map_plot_mercator.export(filename)
-    assert dhash(filename) == "183b1a3e3636644c"
+    assert dhash(filename) == "193b1a3e2e26644c"
     assert colorhash(filename) == "07406040000"
 
 
@@ -77,14 +77,14 @@ def test_map_plot_mercator_with_extra_object(map_plot_mercator):
         )
     )
     map_plot_mercator.export(filename)
-    assert dhash(filename) == "183b1a3e362c644c"
+    assert dhash(filename) == "193b1a3e2e2e644c"
     assert colorhash(filename) == "07403040000"
 
 
 def test_map_plot_stereo_base(map_plot_stereo_north):
     filename = DATA_PATH / "actual-stereo-north-base.png"
     map_plot_stereo_north.export(filename)
-    assert dhash(filename) == "56f6647468787267"
+    assert dhash(filename) == "57f66464686c7467"
     assert colorhash(filename) == "07000000000"
 
 
@@ -108,7 +108,7 @@ def test_map_plot_stereo_with_extra_object(map_plot_stereo_north):
         )
     )
     map_plot_stereo_north.export(filename)
-    assert dhash(filename) == "56f6647468787267"
+    assert dhash(filename) == "57f66464686c7467"
     assert colorhash(filename) == "07e00000000"
 
 
@@ -139,7 +139,7 @@ def test_map_plot_with_planets():
     )
     p.export(filename)
 
-    assert dhash(filename) == "cccc716333b68c0e"
+    assert dhash(filename) == "ccc871633bb68e0c"
     assert colorhash(filename) == "07603000000"
 
 
@@ -176,5 +176,5 @@ def test_map_plot_scope_bino_fov():
     p.ax.set_title("M45 :: TV-85 / 14mm @ 82deg, 10x binos @ 65deg")
     p.export(filename, padding=0.3)
 
-    assert dhash(filename) == "86a4c29a9ad2a4ca"
+    assert dhash(filename) == "0aa4d29a9ad2a480"
     assert colorhash(filename) == "07200030000"