newsworthycharts 1.71.3__py3-none-any.whl → 1.71.5__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/rankchart.py

@@ -15,11 +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
-        self.label_placement = 'none'
+        if self.line_marker_size is None:
+            self.line_marker_size = 6
+        if not label_placement:
+            self.label_placement = 'right'
         self.type = "line"
         self.decimals = 0
         self.revert_value_axis = True
@@ -29,7 +36,6 @@ class BumpChart(SerialChart):
         self.accentuate_baseline = False
 
         self.line_marker = "o-"
-        self.line_marker_size = 5
 
     def _get_line_colors(self, i, *args):
         if not self.data:
@@ -39,17 +45,77 @@ 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):
+        pass
+    """
 
     def _after_add_data(self):
         # Print out every rank
         if self.data.max_val < 30:
             _range = list(range(1, int(self.data.max_val) + 1))
             self.ax.yaxis.set_ticks(_range, _range)
+
+        # 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):
+                values = np.array(self.serie_values[i], dtype=np.float64)
+                dates = [x[0] for x in serie]
+                color = self._get_line_colors(i)
+                if date not in dates:
+                    continue
+                idx = dates.index(date)
+                if np.isnan(values[idx]):
+                    continue
+                val = int(values[idx])
+                if val not in value_colors:
+                    value_colors[val] = []
+                value_colors[val].append(color)
+            for val, colors in value_colors.items():
+                if len(colors) < 2:
+                    continue
+                elif len(colors) == 2:
+                    self.ax.plot(
+                        to_date(date),
+                        val,
+                        self.line_marker,
+                        markersize=self.line_marker_size,
+                        color="None",
+                        fillstyle="left",
+                        markeredgewidth=0,
+                        markerfacecolor=colors[0],
+                        markerfacecoloralt=colors[1],
+                        zorder=100,
+                    )
+                else:
+                    self.ax.plot(
+                        to_date(date),
+                        val,
+                        self.line_marker,
+                        markersize=self.line_marker_size,
+                        color=self._nwc_style["neutral_color"],
+                        markeredgewidth=0,
+                        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
+        # y1 = self.ax.transData.transform((0, 1))
+        # y2 = self.ax.transData.transform((0, 2))
+        # dist = abs(y1[1] - y2[1])
         for i, serie in enumerate(self.data):
             values = np.array(self.serie_values[i], dtype=np.float64)
             dates = [to_date(x[0]) for x in serie]
@@ -59,20 +125,71 @@ 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
-                slots_occupied[ep[0]].append(position)
-                self._annotate_point(
-                    self.labels[i],
-                    (ep[0], position),
-                    "right",
-                    offset=15,
-                    color=color,
-                    va="center",
-                    # arrowprops=dict(arrowstyle="->", color=color),
-                )
+
+            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))  # Add a bit extra space
+                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/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
@@ -254,6 +256,9 @@ class SerialChart(Chart):
                     color = self._nwc_style["strong_color"]
                 else:
                     color = self._nwc_style["neutral_color"]
+                marker_fill = None
+                if hasattr(self, "_get_marker_fill"):
+                    marker_fill = self._get_marker_fill(i)
 
                 line, = self.ax.plot(
                     dates,
@@ -261,6 +266,8 @@ class SerialChart(Chart):
                     self.line_marker,
                     markersize=self.line_marker_size,
                     color=color,
+                    markerfacecolor=marker_fill,
+                    markeredgewidth=0,
                     zorder=zo,
                     lw=lw,
                 )

{newsworthycharts-1.71.3.dist-info → newsworthycharts-1.71.5.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.3
+Version: 1.71.5
 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.3.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.71.5.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -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,16 @@ Roadmap
 Changelog
 ---------
 
+- 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
+
 - 1.71.3
 
   - Revert 1.71.2 changes to rendering, to make file sizes predictable again

{newsworthycharts-1.71.3.dist-info → newsworthycharts-1.71.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-newsworthycharts/__init__.py,sha256=_KQ5nZbWoOfbRV3YzJrGxr7xt4UnnweP_qR4OS8t-P8,1221
+newsworthycharts/__init__.py,sha256=pPubTzsF-HxZnryr86J7ir5eaH5q595foyBekjtB-9s,1221
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=Vr-0yFms0hEVCeUa3vLt3FYBqpX4xLQ8YGPc4LGQN_A,18368
 newsworthycharts/chart.py,sha256=eXgrNCmfE52rFsvTDkMpCZsmL0oSezdkH---LGYsES8,35062
@@ -6,10 +6,10 @@ newsworthycharts/choroplethmap.py,sha256=Si-01213rWqDKINkhmKV6x5iSMumQveJfrlCnqY
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
-newsworthycharts/rankchart.py,sha256=b7MJpei08fzDAbVS1Y4qK9KSmcO4UbnRFwhND-8Ms4Y,4211
+newsworthycharts/rankchart.py,sha256=1wn2ZP67xH-F_Wz-XnTOr2gAXMXMCufe6eFRHXY7Fms,9285
 newsworthycharts/scatterplot.py,sha256=weHubdMsDGaBTXejg2TqBNPTQ1K-QBpZqJiyQ8EOEc4,5084
 newsworthycharts/seasonalchart.py,sha256=rr55yqJUkaYDR9Ik98jes6574oY1U8t8LwoLE3gClW4,1967
-newsworthycharts/serialchart.py,sha256=aZP8QacKdRnHADiJcQ7d0UDLUlLVnlRdjJzSuGFvLFg,29773
+newsworthycharts/serialchart.py,sha256=gy5BIOrzte529JFII1jFbEDDejnB7FmO_kzDHXdE21o,30105
 newsworthycharts/storage.py,sha256=myERhlpvXyExXxUByBq9eW1bWkCyfH9SwTZbsWSyy3Q,4301
 newsworthycharts/stripechart.py,sha256=9B6PX2MyLuKNQ8W0OGdKbP0-U32kju0K_NHHwwz_J68,1547
 newsworthycharts/custom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.71.3.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.71.3.dist-info/METADATA,sha256=nXe9_uwI6gFGEBLs9yRC8N_IMORYb-v25Kex_ESlDlM,33287
-newsworthycharts-1.71.3.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.71.3.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.71.3.dist-info/RECORD,,
+newsworthycharts-1.71.5.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.71.5.dist-info/METADATA,sha256=QBAoSQvoGUQgik45tPfmTO43h2Zwu8nc_U1xxJoBjHQ,33612
+newsworthycharts-1.71.5.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.71.5.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.71.5.dist-info/RECORD,,