newsworthycharts 1.72.1__py3-none-any.whl → 1.73.1__py3-none-any.whl

newsworthycharts/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.72.1"
+__version__ = "1.73.1"
 
 from .chart import Chart
 from .choroplethmap import ChoroplethMap

newsworthycharts/chart.py

@@ -427,7 +427,7 @@ class Chart(object):
             self.ax.xaxis.set_major_formatter(DateFormatter('%Y'))
 
         else:
-            loc = get_best_locator(delta, len(dates), self.interval)
+            loc = get_best_locator(delta, len(dates), self.interval, max_ticks=self.max_ticks)
             self.ax.xaxis.set_major_locator(loc)
             formatter = Formatter(self._language)
 
@@ -776,7 +776,13 @@ class Chart(object):
                 'Creator': f"NWCharts {__version__}",
             }
             """
-
+        """
+        if img_format == "avif":
+            from matplotlib.animation import FuncAnimation, PillowWriter
+            ani = FuncAnimation(self._fig, lambda x: [], frames=[0], blit=True)
+            ani.save(buf, writer=PillowWriter(fps=1), dpi=self._fig.dpi * factor)
+        else:
+        """
         self._fig.savefig(buf, **args)  # , bbox_inches="tight")
         buf.seek(0)
         self._storage.save(key, buf, img_format, storage_options)

newsworthycharts/choroplethmap.py

@@ -174,6 +174,11 @@ class ChoroplethMap(Map):
             # We need to add it ourselves
             label_order = self.label_order or color_map.keys()
             for label in reversed(label_order):
+                if label not in color_map:
+                    if str(label) in color_map:
+                        label = str(label)
+                    else:
+                        continue
                 color = color_map[label]
                 # A bit of an hack:
                 # Check if this corresponds to one of our predefined
@@ -229,4 +234,4 @@ class ChoroplethMap(Map):
                 handles=patches,
                 **label_kwargs,
             )
-        #self.ax.get_figure().savefig("TST.png", bbox_inches="tight")
+        # self.ax.get_figure().savefig("TST.png", bbox_inches="tight")

newsworthycharts/lib/locator.py

@@ -1,7 +1,9 @@
 """ Custom locators and related methods
 """
-from matplotlib.dates import (YearLocator, MonthLocator, DayLocator,
-                              WeekdayLocator)
+from matplotlib.dates import (YearLocator, DayLocator,
+                              WeekdayLocator, AutoDateLocator)
+import matplotlib.dates as mdates
+
 from datetime import datetime
 from dateutil.rrule import MO
 
@@ -36,7 +38,7 @@ def get_year_ticks(start_date, end_date, max_ticks=5):
     return selected_dates
 
 
-def get_best_locator(delta, points, interval=None):
+def get_best_locator(delta, points, interval=None, max_ticks=None):
     """ Get the optimal locator given a time delta and number of points.
     This methods will be much more conservative than Matplotlib's AutoLocator,
     trying to keep the x axis as clean as possible, while still including
@@ -61,10 +63,12 @@ def get_best_locator(delta, points, interval=None):
     else:
         # Less than a year:
         if interval in ["monthly", "quarterly"]:
-            if points > 12:
-                return MonthLocator()
-            else:
-                return MonthLocator()
+            locator = AutoDateLocator(maxticks=max_ticks)
+            locator.intervald = {
+                mdates.MONTHLY: [1, 2, 3, 4, 6],  # only allow monthly intervals
+            }
+            return locator
+            # return MonthLocator()
 
         elif interval == "weekly":
             # NB The threshold are not tested thoroughly. Consider adjusting.
@@ -82,7 +86,12 @@ def get_best_locator(delta, points, interval=None):
 
         elif interval == "daily" or interval is None:
             if delta.days > 30:
-                return MonthLocator()
+                locator = AutoDateLocator(maxticks=max_ticks)
+                locator.intervald = {
+                    mdates.MONTHLY: [1, 2, 3, 4, 6],  # only allow monthly intervals
+                }
+                return locator
+                # return MonthLocator()
             elif delta.days > 21:
                 return DayLocator(interval=10)
             elif delta.days > 7:

newsworthycharts/serialchart.py

@@ -37,7 +37,7 @@ class SerialChart(Chart):
 
         self.grid = True
         self.point_marker = "."
-        self.line_marker = "-"
+        self.line_marker = None
         self.line_marker_size = 3
 
         self.max_ticks = 10
@@ -234,16 +234,26 @@ class SerialChart(Chart):
                                            highlight_value)
                 highlight_diff['y1'] = max(highlight_diff['y1'],
                                            highlight_value)
-            if self.type[i] == "line":
+            if self.type[i] in ["line", "markers"]:
                 # Put first series on top
                 zo = len(series) - i + 1
                 zo += 10  # Make sure lines are on top of bars
 
-                if self.line_width is None:
-                    lw = self._nwc_style.get("lines.linewidth", 2)
+                lw = self.line_width
+                mz = self.line_marker_size
+                lm = self.line_marker
+                if self.type[i] == "markers":
+                    if lm is None:
+                        lm = "o"
+                    if lw is None:
+                        lw = self._nwc_style.get("lines.linewidth", 2) / 2
+                    mz *= 3
                 else:
-                    lw = self.line_width
-
+                    if lm is None:
+                        lm = "-"
+                    if lw is None:
+                        lw = self._nwc_style.get("lines.linewidth", 2)
+        
                 if hasattr(self, "_get_line_colors"):
                     # Hook for sub classes
                     color = self._get_line_colors(i)
@@ -252,6 +262,9 @@ class SerialChart(Chart):
                         color = self._nwc_style["qualitative_colors"][i]
                     else:
                         color = self.colors[i]
+                elif self.highlight in dates_str and self.type[i] == "markers":
+                    # For markers, will will use a logic similar to bars
+                    color = self._nwc_style["neutral_color"]
                 elif i == 0:
                     color = self._nwc_style["strong_color"]
                 else:
@@ -263,44 +276,67 @@ class SerialChart(Chart):
                 line, = self.ax.plot(
                     dates,
                     values,
-                    self.line_marker,
-                    markersize=self.line_marker_size,
+                    lm,
+                    markersize=mz,
                     color=color,
                     markerfacecolor=marker_fill,
                     markeredgewidth=0,
                     zorder=zo,
                     lw=lw,
                 )
-                # Add single, orphaned data points as markers
-                # None, 1, None, 1, 1, 1 =>  . ---
-                num_values = len(values)
-                if num_values == 1:
+                if self.highlight in dates_str and self.type[i] == "markers":
+                    # Highlight specific date (Motplotlib has no better option than to overwrite the marker)
                     self.ax.plot(
-                        dates[0],
-                        values[0],
-                        c=color,
-                        marker=self.point_marker,
-                        zorder=12,
+                        highlight_date,
+                        highlight_value,
+                        c=self._nwc_style["strong_color"],
+                        marker=lm,
+                        markersize=mz,
+                        markerfacecolor=marker_fill,
+                        markeredgewidth=0,
+                        zorder=zo + 1,
+                    )
+
+                if self.type[i] == "markers":
+                    # Join the dots with a line
+                    self.ax.plot(
+                        dates,
+                        values,
+                        color=color,
+                        zorder=zo - 1,
+                        lw=lw,
                     )
-                elif num_values > 1:
-                    for j, v in enumerate(values):
-                        def nullish(val):
-                            return val is None or np.isnan(val)
-                        plot_me = False
-                        if not nullish(v):
-                            if j == 0 and nullish(values[1]):
-                                plot_me = True
-                            elif j == num_values - 1 and nullish(values[j - 1]):
-                                plot_me = True
-                            elif nullish(values[j - 1]) and nullish(values[j + 1]):
-                                plot_me = True
-                        if plot_me:
-                            self.ax.plot(
-                                dates[j], v,
-                                c=color,
-                                marker=self.point_marker,
-                                zorder=12
-                            )
+                else:
+                    # Add single, orphaned data points as markers
+                    # None, 1, None, 1, 1, 1 =>  . ---
+                    num_values = len(values)
+                    if num_values == 1:
+                        self.ax.plot(
+                            dates[0],
+                            values[0],
+                            c=color,
+                            marker=self.point_marker,
+                            zorder=12,
+                        )
+                    elif num_values > 1:
+                        for j, v in enumerate(values):
+                            def nullish(val):
+                                return val is None or np.isnan(val)
+                            plot_me = False
+                            if not nullish(v):
+                                if j == 0 and nullish(values[1]):
+                                    plot_me = True
+                                elif j == num_values - 1 and nullish(values[j - 1]):
+                                    plot_me = True
+                                elif nullish(values[j - 1]) and nullish(values[j + 1]):
+                                    plot_me = True
+                            if plot_me:
+                                self.ax.plot(
+                                    dates[j], v,
+                                    c=color,
+                                    marker=self.point_marker,
+                                    zorder=12
+                                )
 
                 if len(self.labels) > i and any([x[1] for x in serie]):
                     line.set_label(self.labels[i])
@@ -460,7 +496,7 @@ class SerialChart(Chart):
                         dir = "up"
                     else:
                         dir = "down"
-                if self.type[i] == "line":
+                if self.type[i] in ["line", "markers"]:
                     if len(highlight_values) > 1:
                         # When highlighting two values on the same point,
                         # put them in opposite direction
@@ -519,7 +555,7 @@ class SerialChart(Chart):
                 y=self.baseline,
                 linewidth=1,
                 color="#444444",
-                zorder=11,
+                zorder=11 if "bars" in self.type else 9,
                 linestyle="--" if self.baseline else "-",
             )
         if self.baseline_annotation:
@@ -531,7 +567,7 @@ class SerialChart(Chart):
                 xy,
                 direction="down" if first_val and first_val >= self.baseline else "up",
                 color=self._nwc_style["neutral_color"],
-                zorder=11,
+                zorder=12,
             )
 
         # Shade area between lines if there are exactly 2 series

{newsworthycharts-1.72.1.dist-info → newsworthycharts-1.73.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.72.1
+Version: 1.73.1
 Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
 Home-page: https://github.com/jplusplus/newsworthycharts
-Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.72.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.73.1.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -154,12 +154,14 @@ These settings are available for all chart types:
 
 **SerialChart**
 
-- type = 'line'  # line|bars, or a list of types for each data serie
+- type = 'line'  # line|bars|markers, or a list of types for each data serie
 - bar_width = 0.9  # percent of data point width
 - allow_broken_y_axis = True|False  # default depends on chart type
 - baseline = 0  # The “zero” line. Useful for plotting deviations, e.g. temperatures above/below mean
 - baseline_annotation = None  # A label for the baseline
 - line_width = None  # To override style settings
+- line_marker = "-""  # Matplotlib line marker type.
+- line_marker_size = 3  # Matplotlib line marker size
 - max_ticks = 10  # Maximum number of ticks on the x axis. *Only used with yearly|decennial data* (this is yet to be fixed)
 - ticks = None  # Custom ticks on the x axis, as a list of lists or tuples: `[(2013-01-01, "-13"), (2014-01-01, "-14"), (2015-01-01, "-15")]`
 - ymin = None  # Minimum value on y axis. If None, it will be calculated from data
@@ -271,6 +273,17 @@ Roadmap
 Changelog
 ---------
 
+- 1.73.1
+
+  - More leniant label parsing in ChoroplethMap
+  - Make max_ticks work in monthly time series charts. 
+
+- 1.73.0
+
+  - Add `type: "markers"` to serial charts. Uses a thin line with a marker at each data point as default.
+  - Make sure `baseline` goes behind lines in serial charts
+  - Make sure baseline annotation goes above lines in serial charts
+
 - 1.72.1
 
   - Better interval detection in SerialChart when years are all in different decades

{newsworthycharts-1.72.1.dist-info → newsworthycharts-1.73.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
-newsworthycharts/__init__.py,sha256=PQRGF5fVut2-N573MdBk5WLnTRKz9d3WWjMgw_Pru44,1221
+newsworthycharts/__init__.py,sha256=j6K16TGBlydhzNJ9jIftxz03lGGYkpR8E1DcEXHuZPk,1221
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=Vr-0yFms0hEVCeUa3vLt3FYBqpX4xLQ8YGPc4LGQN_A,18368
-newsworthycharts/chart.py,sha256=eXgrNCmfE52rFsvTDkMpCZsmL0oSezdkH---LGYsES8,35062
-newsworthycharts/choroplethmap.py,sha256=PEhBOw9UD0OyeFRjpCFFoxa2ztT5NeGSYOubo2PaNtA,9210
+newsworthycharts/chart.py,sha256=ebPLEIFAlUrE7N7n0aIqkzayKHHguuF0rVkXDK3OpJU,35393
+newsworthycharts/choroplethmap.py,sha256=dMJYmep3Qt3pC09N3-9dSUxUO6EI3QmLktQRJ-D0bdM,9404
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=EGh96tU10y7Kgu1e83_VWQSeABdjP6V-0VM6VTHDxu4,6089
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
 newsworthycharts/rankchart.py,sha256=vMzNMVOv1jae6wuHC_riAdb1lm9oPltO3TT3YQpc0Oc,9376
 newsworthycharts/scatterplot.py,sha256=weHubdMsDGaBTXejg2TqBNPTQ1K-QBpZqJiyQ8EOEc4,5084
 newsworthycharts/seasonalchart.py,sha256=rr55yqJUkaYDR9Ik98jes6574oY1U8t8LwoLE3gClW4,1967
-newsworthycharts/serialchart.py,sha256=x28ldRdba3JEmat-cnQH1XQQXrPEhx-S55_1yTvNIDI,30133
+newsworthycharts/serialchart.py,sha256=HQv3zAGBhlwbrH6HsslaM-c7VAvl9rg5CYCv1ok_Acw,31826
 newsworthycharts/storage.py,sha256=myERhlpvXyExXxUByBq9eW1bWkCyfH9SwTZbsWSyy3Q,4301
 newsworthycharts/stripechart.py,sha256=9B6PX2MyLuKNQ8W0OGdKbP0-U32kju0K_NHHwwz_J68,1547
 newsworthycharts/custom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,7 +20,7 @@ newsworthycharts/lib/colors.py,sha256=U04TDkvoMQkcldRFXfnwyLOTwq1SWW2se-Ad-DNcw9
 newsworthycharts/lib/datalist.py,sha256=-LdGFE0SOvjLnIRZ6eoJoijDaG3SeUPNIDPBjbm5A2U,6433
 newsworthycharts/lib/formatter.py,sha256=GNH43hE0bC17OgiV8LYH3YUrEhm7OJh9XzfSV4HVtHo,4838
 newsworthycharts/lib/geography.py,sha256=K0_teFmuPJwXX7Py-amJB_1YY5_gL2kBYhz1LrRCyTg,584
-newsworthycharts/lib/locator.py,sha256=rJHdgiA0LASRzdLINhTeU5zOoq1TCMgge4KOBWSagnM,3041
+newsworthycharts/lib/locator.py,sha256=9iCow6GZDdKTqvY1HIkW60p5xFmBc1rMiPqh-kodT-s,3459
 newsworthycharts/lib/mimetypes.py,sha256=bL9HtVWbn2Of39LcBt4u4yelkr4bGZiyebq3OfLnfFY,237
 newsworthycharts/lib/utils.py,sha256=zk2hfbZluRcwwxa-N9LocP65HKiHmvgkBw9saAq1lgU,7403
 newsworthycharts/maps/se-4.gpkg,sha256=oWw5j7FPVpI0ig67jNDim8qSn5SG8rcHp0014-uTKZM,290816
@@ -29,8 +29,8 @@ newsworthycharts/rc/newsworthy,sha256=yOIZvYS6PG1u19VMcdtfj9vbihKQsey5IprwqK59Kg
 newsworthycharts/translations/datawrapper_regions.csv,sha256=fzZcQRX6RFMlNNP8mpgfYNdR3Y0QAlQxDXk8FXTaWWI,9214
 newsworthycharts/translations/regions.py,sha256=Nv1McQjggD4S3JRu82rDMTG3pqUVR13E5-FBpSYbm98,239
 newsworthycharts/translations/se_municipalities.csv,sha256=br_mm-IvzQtj_W55_ATREhJ97jWnCweBFlDAVY2EBxA,7098
-newsworthycharts-1.72.1.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.72.1.dist-info/METADATA,sha256=Vz1Yjzk7s9RfcTHDpTIkSB5fb-meY0zgrKRVWENQnxA,34137
-newsworthycharts-1.72.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.72.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.72.1.dist-info/RECORD,,
+newsworthycharts-1.73.1.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.73.1.dist-info/METADATA,sha256=W7n5cgzx9DCRCvG8vbkqplsQw9dheDi67yAxUFbUYz8,34612
+newsworthycharts-1.73.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.73.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.73.1.dist-info/RECORD,,