newsworthycharts 1.70.2__py3-none-any.whl → 1.71.1__py3-none-any.whl

newsworthycharts/__init__.py

@@ -1,10 +1,11 @@
-__version__ = "1.70.2"
+__version__ = "1.71.1"
 
 from .chart import Chart
 from .choroplethmap import ChoroplethMap
 from .bubblemap import BubbleMap
 from .serialchart import SerialChart
 from .seasonalchart import SeasonalChart
+from .rankchart import BumpChart
 from .categoricalchart import CategoricalChart, CategoricalChartWithReference, ProgressChart
 from .scatterplot import ScatterPlot
 from .datawrapper import DatawrapperChart
@@ -26,6 +27,7 @@ CHART_ENGINES = {
     "SeasonalChart": SeasonalChart,
     "SerialChart": SerialChart,
     "StripeChart": StripeChart,
+    "BumpChart": BumpChart,
 
     # custom
     "ClimateCarsYearlyEmissionsTo2030": ClimateCarsYearlyEmissionsTo2030,

newsworthycharts/chart.py

@@ -66,6 +66,7 @@ class Chart(object):
         self.decimals = None
         self.yline = None
         self.type = None
+        self.revert_value_axis = False
         # number of decimals to show in annotations, value ticks, etc
         # None means automatically chose the best number
         self.force_decimals = False
@@ -206,9 +207,14 @@ class Chart(object):
             c = color_name
         return c
 
-    def _annotate_point(self, text, xy,
-                        direction, offset=12,
-                        **kwargs):
+    def _annotate_point(
+        self,
+        text,
+        xy,
+        direction,
+        offset=12,
+        **kwargs
+    ):
         """Add a label to a given point.
 
         :param text: text content of label
@@ -236,11 +242,11 @@ class Chart(object):
         elif direction == "left":
             opts["verticalalignment"] = "center"
             opts["horizontalalignment"] = "right"
-            opts["xytext"] = (-offset, 0)
+            opts["xytext"] = (-offset, -self._nwc_style["annotation.fontsize"] / 0.75)
         elif direction == "right":
             opts["verticalalignment"] = "center"
             opts["horizontalalignment"] = "left"
-            opts["xytext"] = (offset, 0)
+            opts["xytext"] = (offset, -self._nwc_style["annotation.fontsize"] / 0.75)
         else:
             msg = f"'{direction}' is an unknown direction for an annotation"
             raise Exception(msg)
@@ -669,6 +675,19 @@ class Chart(object):
         # print(sub_canvas_height, self._note_rel_height, self._footer_rel_height)
         self._fig.subplots_adjust(bottom=sub_canvas_height)
 
+        if self.revert_value_axis:
+            if hasattr(self, "orientation") and self.orientation == "horizontal":
+                self.ax.invert_xaxis()
+                value_axis = self.ax.get_xaxis()
+                value_ticks = self.ax.get_xticks()
+            else:
+                self.ax.invert_yaxis()
+                value_axis = self.ax.get_yaxis()
+                value_ticks = self.ax.get_yticks()
+            value_ticks = [x for x in value_ticks if x <= self.data.max_val and x >= self.ymin]
+            value_axis.set_ticks(value_ticks)
+            # self.ax.set_ylim(self.data.max_val, self.ymin)
+
     @classmethod
     def init_from(cls, args: dict, storage=LocalStorage(),
                   style: str="newsworthy", language: str='en-GB'):

newsworthycharts/rankchart.py

@@ -0,0 +1,40 @@
+"""
+A chart showing ranking over time (like ”most popular baby names”)
+"""
+from .serialchart import SerialChart
+
+
+class BumpChart(SerialChart):
+    """Plot a rank chart
+
+        Data should be a list of iterables of (rank, date string) tuples, eg:
+    `[ [("2010-01-01", 2), ("2011-01-01", 3)] ]`, combined with a list of
+    labels in the same order
+    """
+
+    def __init__(self, *args, **kwargs):
+        super(BumpChart, self).__init__(*args, **kwargs)
+
+        if self.line_width is None:
+            self.line_width = 0.9
+        self.label_placement = 'line'
+        self.type = "line"
+        self.decimals = 0
+        self.revert_value_axis = True
+        self.ymin = 1
+        self.allow_broken_y_axis = False
+        self.grid = False
+        self.accentuate_baseline = False
+
+        self.line_marker = "o-"
+        self.line_marker_size = 5
+
+    def _get_line_colors(self, i, *args):
+        if not self.data:
+            # Don't waste time
+            return None
+        if self.highlight and self.highlight in self.labels and i == self.labels.index(self.highlight):
+            return self._nwc_style["strong_color"]
+        elif self.colors and i < len(self.colors):
+            return self.colors[i]
+        return self._nwc_style["neutral_color"]

newsworthycharts/serialchart.py

@@ -28,12 +28,18 @@ class SerialChart(Chart):
         # draw bars and cut ay axis from this line
         self.baseline = kwargs.get("baseline", 0)
         self.baseline_annotation = kwargs.get("baseline_annotation", None)
+        self.accentuate_baseline = True
 
         self.color_labels = kwargs.get("color_labels", None)
 
         # Set with of lines explicitly (otherwise determined by style file)
         self.line_width = None
 
+        self.grid = True
+        self.point_marker = "."
+        self.line_marker = "-"
+        self.line_marker_size = 3
+
         self.max_ticks = 10
 
         # Manually set tick locations and labels? Provide a list of tuples:
@@ -235,7 +241,10 @@ class SerialChart(Chart):
                 else:
                     lw = self.line_width
 
-                if self.colors is not None:
+                if hasattr(self, "_get_line_colors"):
+                    # Hook for sub classes
+                    color = self._get_line_colors(i)
+                elif self.colors is not None:
                     if self.colors == "qualitative_colors":
                         color = self._nwc_style["qualitative_colors"][i]
                     else:
@@ -245,18 +254,26 @@ class SerialChart(Chart):
                 else:
                     color = self._nwc_style["neutral_color"]
 
-                line, = self.ax.plot(dates, values,
-                                     color=color,
-                                     zorder=zo,
-                                     lw=lw)
+                line, = self.ax.plot(
+                    dates,
+                    values,
+                    self.line_marker,
+                    markersize=self.line_marker_size,
+                    color=color,
+                    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:
-                    self.ax.plot(dates[0], values[0],
-                                 c=color,
-                                 marker='.',
-                                 zorder=12)
+                    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):
@@ -270,10 +287,12 @@ class SerialChart(Chart):
                             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='.',
-                                         zorder=12)
+                            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])
@@ -286,7 +305,7 @@ class SerialChart(Chart):
                         "right",
                         offset=15,
                         color=color,
-                        va="center"
+                        va="center",
                     )
                     # store labels to check for overlap later
                     line_label_elems.append(lbl)
@@ -486,13 +505,14 @@ class SerialChart(Chart):
 
         # Accentuate y=0 || y=baseline
         # if (self.data.min_val < self.baseline) or self.baseline_annotation:
-        self.ax.axhline(
-            y=self.baseline,
-            linewidth=1,
-            color="#444444",
-            zorder=11,
-            linestyle="--" if self.baseline else "-"
-        )
+        if self.accentuate_baseline:
+            self.ax.axhline(
+                y=self.baseline,
+                linewidth=1,
+                color="#444444",
+                zorder=11,
+                linestyle="--" if self.baseline else "-"
+            )
         if self.baseline_annotation:
             xy = (to_date(self.data.outer_min_x), self.baseline)
             # We only allow baseline to be set for single series bar charts
@@ -559,7 +579,7 @@ class SerialChart(Chart):
                          ymax=ymax + padding_top)
 
         self.ax.yaxis.set_major_formatter(y_formatter)
-        self.ax.yaxis.grid(True)
+        self.ax.yaxis.grid(self.grid)
 
         if ymin > self.baseline and self.allow_broken_y_axis:
             self._mark_broken_axis()

{newsworthycharts-1.70.2.dist-info → newsworthycharts-1.71.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.70.2
+Version: 1.71.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.70.2.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.71.1.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -174,6 +174,14 @@ These settings are available for all chart types:
 
 _ Inherits from SerialChart _
 
+**BumpChart**
+
+_ Inherits from SerialChart _
+
+- 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
+
 **BubbleMap**
 
 - bubble_size = 1  # The size of the bubbles
@@ -261,6 +269,16 @@ Roadmap
 Changelog
 ---------
 
+- 1.71.1
+
+  - Allow setting line marker size and style in `BumpChart`
+  - Various fixes in `BumpChart`
+  - Take font size into account when positioning annotations
+
+- 1.71.0
+
+  - Add `BumpChart`
+
 - 1.70.2
 
   - Fix edge case bug in y axis cutoff logic

{newsworthycharts-1.70.2.dist-info → newsworthycharts-1.71.1.dist-info}/RECORD

@@ -1,14 +1,15 @@
-newsworthycharts/__init__.py,sha256=wRQAtMtzNzN2_8aMN6-JPjSE44gy1ZL53OyXh4BNvtQ,1160
+newsworthycharts/__init__.py,sha256=FHI9lMZXxj8DQAOroGA-Wh60kaCHGKtJYd9O4fWKOb4,1221
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=YL3pzq8a7U5F0MpeRIAEwCAHw1BRDyKjoaAhf-UyRDo,18179
-newsworthycharts/chart.py,sha256=gAMCXLtQkhOzu93QxeR5GgcoGVEnGddzFgubzsBeZ8Y,35055
+newsworthycharts/chart.py,sha256=8Ys9z-BF5mXJiBx-9_k5yEBrBLA66LscwqhfM5YU9uQ,35807
 newsworthycharts/choroplethmap.py,sha256=Si-01213rWqDKINkhmKV6x5iSMumQveJfrlCnqYcIJM,8173
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
+newsworthycharts/rankchart.py,sha256=Hv5PyUOfDgaxrzr5RApsE9q6wbd203qbCYqqUjcc_hc,1271
 newsworthycharts/scatterplot.py,sha256=l2w2JkA_4WzxQG9XG1Pn62IlJOdCMm1VemMiZL0rEfU,4959
 newsworthycharts/seasonalchart.py,sha256=rr55yqJUkaYDR9Ik98jes6574oY1U8t8LwoLE3gClW4,1967
-newsworthycharts/serialchart.py,sha256=_TBZiOyU-TtnnkJGbP4yZcTlypdIpbxHK4AjE4Su3k8,27787
+newsworthycharts/serialchart.py,sha256=zFc5ss3uOC6S61AgsW4Dm3nqeHTaWIxg40LmC1n1yv4,28380
 newsworthycharts/storage.py,sha256=myERhlpvXyExXxUByBq9eW1bWkCyfH9SwTZbsWSyy3Q,4301
 newsworthycharts/stripechart.py,sha256=9B6PX2MyLuKNQ8W0OGdKbP0-U32kju0K_NHHwwz_J68,1547
 newsworthycharts/custom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,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.70.2.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.70.2.dist-info/METADATA,sha256=sGu65_A1eTrUDLhtVkIjrMaGBbdjehSwSBI_RoYr6E0,32089
-newsworthycharts-1.70.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.70.2.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.70.2.dist-info/RECORD,,
+newsworthycharts-1.71.1.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.71.1.dist-info/METADATA,sha256=S3GUG2BAP-Yprx9ANeUNu6uAqH4T_Daem6yPGxCiWAo,32504
+newsworthycharts-1.71.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.71.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.71.1.dist-info/RECORD,,