newsworthycharts 1.71.4__tar.gz → 1.72.0__tar.gz

{newsworthycharts-1.71.4/newsworthycharts.egg-info → newsworthycharts-1.72.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.4
+Version: 1.72.0
 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.71.4.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.72.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -11,7 +11,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: boto3>=1.26
-Requires-Dist: matplotlib==3.10.0
+Requires-Dist: matplotlib==3.10.1
 Requires-Dist: langcodes>=3.3
 Requires-Dist: Babel<3,>=2.14.0
 Requires-Dist: PyYAML>=3
@@ -179,6 +179,7 @@ _ Inherits from SerialChart _
 
 _ Inherits from SerialChart _
 
+- label_placement = "right"  # [left|right|both|outside|legend]
 - highlight = None  # The label value to of a line to highlight
 - line_marker = "o-"  # Matplotlib line marker type. 
 - line_marker_size = 5  # Matplotlib line marker size
@@ -270,6 +271,21 @@ Roadmap
 Changelog
 ---------
 
+- 1.72.0
+
+  - Use gradient legend för continuous choropleth maps
+  - Don't add None value to legend if it is empty in ChoroplethMap
+  - Fixed zorder bug in SerialChart with baseline annotations and bars
+  - matplotlib==3.10.1
+  - Fixed a bug where choropleth maps would break on svery small numbers (by bypassing all axis formatting logic for maps).
+    This should also speed up rendering of maps somewhat.
+
+- 1.71.5
+
+  - zorder fixes in BumpChart
+  - Add `label_placement` = [left|right|both|outside|legend] to BumpChart. Default is 'right'
+  - Use alternating shades of gray in BumpChart
+
 - 1.71.4
 
   - BumpChart: Use dual colors in line markers when rank is shared

{newsworthycharts-1.71.4 → newsworthycharts-1.72.0}/README.rst

@@ -153,6 +153,7 @@ _ Inherits from SerialChart _
 
 _ Inherits from SerialChart _
 
+- label_placement = "right"  # [left|right|both|outside|legend]
 - highlight = None  # The label value to of a line to highlight
 - line_marker = "o-"  # Matplotlib line marker type. 
 - line_marker_size = 5  # Matplotlib line marker size
@@ -244,6 +245,21 @@ Roadmap
 Changelog
 ---------
 
+- 1.72.0
+
+  - Use gradient legend för continuous choropleth maps
+  - Don't add None value to legend if it is empty in ChoroplethMap
+  - Fixed zorder bug in SerialChart with baseline annotations and bars
+  - matplotlib==3.10.1
+  - Fixed a bug where choropleth maps would break on svery small numbers (by bypassing all axis formatting logic for maps).
+    This should also speed up rendering of maps somewhat.
+
+- 1.71.5
+
+  - zorder fixes in BumpChart
+  - Add `label_placement` = [left|right|both|outside|legend] to BumpChart. Default is 'right'
+  - Use alternating shades of gray in BumpChart
+
 - 1.71.4
 
   - BumpChart: Use dual colors in line markers when rank is shared

{newsworthycharts-1.71.4 → newsworthycharts-1.72.0}/newsworthycharts/__init__.py

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

{newsworthycharts-1.71.4 → newsworthycharts-1.72.0}/newsworthycharts/choroplethmap.py

@@ -8,6 +8,7 @@ import pandas as pd
 import mapclassify
 import matplotlib as mpl
 import matplotlib.patches as mpatches
+from mpl_toolkits.axes_grid1.inset_locator import inset_axes
 
 
 class ChoroplethMap(Map):
@@ -61,6 +62,32 @@ class ChoroplethMap(Map):
             df["color"] = df["color"].fillna("gainsboro")
             args["color"] = df["color"]
 
+            self._fig.tight_layout()
+            fmt = self._get_value_axis_formatter()
+            cax = inset_axes(
+                self.ax,
+                width=0.1,
+                height=2,  # 2 tum = 200 px vid 100 dpi
+                loc='upper right',
+                borderpad=0.1,
+                # formatter
+            )
+            cb = self._fig.colorbar(
+                mapper,
+                cax=cax,
+                format=mpl.ticker.FuncFormatter(fmt),
+                drawedges=False,
+                shrink=0.9,
+                # use_gridspec=False,
+                # pad=0.1,
+            )
+            # args["legend_kwds"]["pad"] = 0.15
+            # args["legend_kwds"]["location"] = "left"
+
+            if self.legend_title:
+                cb.set_label(self.legend_title)
+                self.legend_title = None
+            """
             _min = df["data"].min()
             _max = df["data"].max()
             _median = df["data"].median()
@@ -70,6 +97,7 @@ class ChoroplethMap(Map):
                 patches.append(mpatches.Patch(color=mapper.to_rgba(_median), label=fmt(_median)))
             if _max != _min:
                 patches.append(mpatches.Patch(color=mapper.to_rgba(_max), label=fmt(_max)))
+            """
 
         elif not self.categorical:
             # mapclassify doesn't work well with nan values,
@@ -99,7 +127,7 @@ class ChoroplethMap(Map):
             # args["cmap"] = self.color_ramp
             # We can not provide vmin/vmax to geopandas, so we need to
             # normalize the data ourselves, otherwise the inset maps will be off
-            norm = mpl.colors.Normalize(vmin=df["data"].min(), vmax=df["data"].max())
+            norm = mpl.colors.Normalize(vmin=_has_value["data"].min(), vmax=_has_value["data"].max())
             mapper = mpl.cm.ScalarMappable(norm=norm, cmap=self.color_ramp)
             df["color"] = df["data"].apply(lambda x: mapper.to_rgba(x) if not np.isnan(x) else "gainsboro")
             df["color"] = df["color"].fillna("gainsboro")
@@ -155,7 +183,7 @@ class ChoroplethMap(Map):
                 patch = mpatches.Patch(color=color, label=label)
                 patches.append(patch)
         patches = list(reversed(patches))
-        if self.missing_label:
+        if self.missing_label and len(patches):
             patches.append(mpatches.Patch(color="gainsboro", label=self.missing_label))
 
         df.plot(ax=self.ax, **args)
@@ -201,3 +229,4 @@ class ChoroplethMap(Map):
                 handles=patches,
                 **label_kwargs,
             )
+        #self.ax.get_figure().savefig("TST.png", bbox_inches="tight")

{newsworthycharts-1.71.4 → newsworthycharts-1.72.0}/newsworthycharts/map.py

@@ -95,6 +95,7 @@ class Map(Chart):
         self.base_map = None
         self.missing_label = None
         self.df = None
+        self.show_ticks = False
 
     def _normalize_region_code(self, code):
         code = code.upper().replace("_", "-")

{newsworthycharts-1.71.4 → newsworthycharts-1.72.0}/newsworthycharts/rankchart.py

@@ -15,13 +15,18 @@ class BumpChart(SerialChart):
     """
 
     def __init__(self, *args, **kwargs):
+        label_placement = kwargs.get("label_placement", None)
+        if label_placement not in ["legend", "outside"]:
+            self.label_placement = "none"
+
         super(BumpChart, self).__init__(*args, **kwargs)
 
         if self.line_width is None:
             self.line_width = 0.9
         if self.line_marker_size is None:
             self.line_marker_size = 6
-        self.label_placement = 'none'
+        if not label_placement:
+            self.label_placement = 'right'
         self.type = "line"
         self.decimals = 0
         self.revert_value_axis = True
@@ -40,7 +45,11 @@ class BumpChart(SerialChart):
             return self._nwc_style["strong_color"]
         elif self.colors and i < len(self.colors):
             return self.colors[i]
-        return self._nwc_style["neutral_color"]
+        # alternate between dark gray and light gray
+        if i % 2 == 0:
+            return "darkgray"
+        else:
+            return "lightgray"
 
     """
     def _get_marker_fill(self, i):
@@ -55,7 +64,6 @@ class BumpChart(SerialChart):
 
         # Recolor markers with more than one line passing through
         # (MPL does not allow access to individual markers, so we'll overwrite them)
-
         for date in self.data.x_points:
             value_colors = {}
             for i, serie in enumerate(self.data):
@@ -98,7 +106,10 @@ class BumpChart(SerialChart):
                         zorder=100,
                     )
         # Add labels
-        slots_occupied = {
+        slots_occupied_right = {
+            to_date(k): [] for k in self.data.x_points
+        }
+        slots_occupied_left = {
             to_date(k): [] for k in self.data.x_points
         }
         # distance between rank ticks
@@ -114,23 +125,77 @@ class BumpChart(SerialChart):
                 (d, values[idx])
                 for (idx, d) in enumerate(dates) if idx == len(dates) - 1 or np.isnan(values[idx + 1])
             ]
-            for ep in endpoints:
-                position = ep[1]
-                while position in slots_occupied[ep[0]]:
-                    position += 1
-                # pos_diff = position - ep[1]
-                slots_occupied[ep[0]].append(position)
-                self._annotate_point(
-                    self.labels[i],
-                    # (ep[0], ep[1]),
-                    (ep[0], position),
-                    "right",
-                    offset=15,
-                    color=color,
-                    va="center",
-                    # xytext=(15, -abs(y1[1] - y2[1]) * pos_diff),
-                    # arrowprops=dict(arrowstyle="->", color=color) if pos_diff > 1 else None,
+
+            startpoints = []
+            if self.label_placement == "both":
+                startpoints = [
+                    (d, values[idx])
+                    for (idx, d) in enumerate(dates)
+                    if (idx == 0 or np.isnan(values[idx - 1])  # only if 2 consecutive values come after
+                        and (idx < len(dates) - 2)
+                        and not np.isnan(values[idx + 1])
+                        and not np.isnan(values[idx + 2]))
+                ]
+            elif self.label_placement == "left":
+                startpoints = [
+                    (d, values[idx])
+                    for (idx, d) in enumerate(dates)
+                    if idx == 0 or np.isnan(values[idx - 1])
+                ]
+
+            if self.label_placement in ["left", "both"]:
+                # We need to move y spine to the left to make room for labels
+                # To save time we'll only measure the with of the longest text string
+                # There will be edge cases where shorter strings taker up more space
+                longest_sp_label = max([len(str(x[1])) for x in startpoints])
+                dummy_text = self.ax.text(
+                    0, 0,
+                    longest_sp_label,
+                    fontsize=self._nwc_style["annotation.fontsize"]
+                )
+                _bbox = dummy_text.get_window_extent(renderer=self._fig.canvas.get_renderer())
+                self.ax.spines['left'].set_position(
+                    ('outward', _bbox.width * 1.15 + 15)
                 )
+                dummy_text.remove()
+
+            if self.label_placement in ["right", "both"]:
+                for ep in endpoints:
+                    position = ep[1]
+                    while position in slots_occupied_right[ep[0]]:
+                        position += 1
+                    # pos_diff = position - ep[1]
+                    slots_occupied_right[ep[0]].append(position)
+                    self._annotate_point(
+                        self.labels[i],
+                        # (ep[0], ep[1]),
+                        (ep[0], position),
+                        "right",
+                        offset=15,
+                        color=color,
+                        va="center",
+                        # xytext=(15, -abs(y1[1] - y2[1]) * pos_diff),
+                        # arrowprops=dict(arrowstyle="->", color=color) if pos_diff > 1 else None,
+                        zorder=99,
+                    )
+            if self.label_placement in ["left", "both"]:
+                for sp in startpoints:
+                    position = sp[1]
+                    while position in slots_occupied_left[sp[0]]:
+                        position += 1
+                    # pos_diff = position - sp[1]
+                    slots_occupied_left[sp[0]].append(position)
+                    self._annotate_point(
+                        self.labels[i],
+                        (sp[0], position),
+                        "left",
+                        offset=15,
+                        color=color,
+                        va="center",
+                        zorder=99,
+                    )
+        # Add space for labels on the left
+
         """
         labels = []
         for i, serie in enumerate(self.data):

{newsworthycharts-1.71.4 → newsworthycharts-1.72.0}/newsworthycharts/serialchart.py

@@ -52,7 +52,9 @@ class SerialChart(Chart):
         self.colors = None
 
         # Optional: where to place series label
-        self.label_placement = "legend"  # legend|inline|outside|line
+        # Could be set already by subclass
+        if not hasattr(self, "label_placement"):
+            self.label_placement = "legend"  # legend|inline|outside|line
 
         # Optional: annotate each point with a value label
         self.value_labels = False
@@ -518,7 +520,7 @@ class SerialChart(Chart):
                 linewidth=1,
                 color="#444444",
                 zorder=11,
-                linestyle="--" if self.baseline else "-"
+                linestyle="--" if self.baseline else "-",
             )
         if self.baseline_annotation:
             xy = (to_date(self.data.outer_min_x), self.baseline)
@@ -529,6 +531,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,
             )
 
         # Shade area between lines if there are exactly 2 series

{newsworthycharts-1.71.4 → newsworthycharts-1.72.0/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.4
+Version: 1.72.0
 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.71.4.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.72.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -11,7 +11,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: boto3>=1.26
-Requires-Dist: matplotlib==3.10.0
+Requires-Dist: matplotlib==3.10.1
 Requires-Dist: langcodes>=3.3
 Requires-Dist: Babel<3,>=2.14.0
 Requires-Dist: PyYAML>=3
@@ -179,6 +179,7 @@ _ Inherits from SerialChart _
 
 _ Inherits from SerialChart _
 
+- label_placement = "right"  # [left|right|both|outside|legend]
 - highlight = None  # The label value to of a line to highlight
 - line_marker = "o-"  # Matplotlib line marker type. 
 - line_marker_size = 5  # Matplotlib line marker size
@@ -270,6 +271,21 @@ Roadmap
 Changelog
 ---------
 
+- 1.72.0
+
+  - Use gradient legend för continuous choropleth maps
+  - Don't add None value to legend if it is empty in ChoroplethMap
+  - Fixed zorder bug in SerialChart with baseline annotations and bars
+  - matplotlib==3.10.1
+  - Fixed a bug where choropleth maps would break on svery small numbers (by bypassing all axis formatting logic for maps).
+    This should also speed up rendering of maps somewhat.
+
+- 1.71.5
+
+  - zorder fixes in BumpChart
+  - Add `label_placement` = [left|right|both|outside|legend] to BumpChart. Default is 'right'
+  - Use alternating shades of gray in BumpChart
+
 - 1.71.4
 
   - BumpChart: Use dual colors in line markers when rank is shared

{newsworthycharts-1.71.4 → newsworthycharts-1.72.0}/newsworthycharts.egg-info/requires.txt

@@ -1,5 +1,5 @@
 boto3>=1.26
-matplotlib==3.10.0
+matplotlib==3.10.1
 langcodes>=3.3
 Babel<3,>=2.14.0
 PyYAML>=3

{newsworthycharts-1.71.4 → newsworthycharts-1.72.0}/setup.py

@@ -25,7 +25,7 @@ setup(
     python_requires='>=3.9',
     install_requires=[
         "boto3>=1.26",
-        "matplotlib==3.10.0",
+        "matplotlib==3.10.1",
         "langcodes>=3.3",
         "Babel>=2.14.0,<3",
         "PyYAML>=3",