newsworthycharts 1.61.1__py3-none-any.whl → 1.61.3__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/chart.py

@@ -716,7 +716,7 @@ class Chart(object):
                     'Creator': f"NWCharts {__version__}",
                 }
                 """
-            self._fig.savefig(buf, **args)  #, bbox_inches="tight")
+            self._fig.savefig(buf, **args)  # bbox_inches="tight")
             buf.seek(0)
             self._storage.save(key, buf, file_format, storage_options)
 

newsworthycharts/rc/newsworthy

@@ -55,7 +55,7 @@ lines.markersize : 8
 
 #! neutral_color      : 6f6e75
 #! strong_color       : 00a39a
-#! qualitative_colors : 00a39a, DBAD58, A6426A, 93003a
+#! qualitative_colors : 00a39a, DBAD58, A6426A, 93003a, C8C7D1
 #! positive_color     : 00a39a
 #! negative_color     : 93003a
 

newsworthycharts/serialchart.py

@@ -194,6 +194,8 @@ class SerialChart(Chart):
         line_label_elems = []
         value_label_elems = []
 
+        bar_elems = []
+
         for i, serie in enumerate(series):
 
             values = np.array(serie_values[i], dtype=float)
@@ -340,7 +342,6 @@ class SerialChart(Chart):
                 """
                 bar_widths_ = [self._days_in(self.interval, d) for d in dates]
 
-                # Put whitespace betw bars, unless there are a lot of bars
                 bbox = self.ax.get_window_extent()
                 if (sum(bar_widths_) * 2 / len(dates)) > bbox.width:
                     bar_widths = bar_widths_
@@ -352,13 +353,13 @@ class SerialChart(Chart):
                     width=bar_widths,
                     zorder=zo,
                 )
-                if len(dates) < 100:
-                    # FIXME: This complements the bar_width hack above
-                    # For some charts edges give better results (n_bars ~50?)
-                    # This should be better tested, and implemented in a
-                    # more robust way
-                    bar_kwargs["edgecolor"] = "white"
-                    bar_kwargs["linewidth"] = 1
+                # if len(dates) < 100:
+                #    # FIXME: This complements the bar_width hack above
+                #    # For some charts edges give better results (n_bars ~50?)
+                #    # This should be better tested, and implemented in a
+                #    # more robust way
+                #    bar_kwargs["edgecolor"] = "white"
+                #    bar_kwargs["linewidth"] = 0  # 1
 
                 if is_stacked and i > 0:
                     if self.baseline != 0:
@@ -378,6 +379,7 @@ class SerialChart(Chart):
                     bar_kwargs["bottom"] = self.baseline
 
                 bars = self.ax.bar(dates, values, **bar_kwargs)
+                bar_elems.append(bars)
 
                 if len(self.labels) > i:
                     bars.set_label(self.labels[i])
@@ -438,7 +440,17 @@ class SerialChart(Chart):
                             # Could happen if we have two or more lines,
                             # with different start and end points.
                             continue
-                self._annotate_point(value_label, xy, direction=dir)
+                self._annotate_point(value_label, xy, direction=dir, zorder=15)
+
+        # Add some padding around bars, but only left/right to avoid lines in stacked bars
+        if len(dates) < 100:
+            for bars in bar_elems:
+                # for container in self.ax.containers:
+                for bar in bars:
+                    x, y = bar.get_xy()
+                    w, h = bar.get_width(), bar.get_height()
+                    self.ax.plot([x + w, x + w], [y, y + h], color='white', lw=1, zorder=10)
+                    self.ax.plot([x, x], [y, y + h], color='white', lw=1, zorder=10)
 
         # Add background highlights
         for (x0, x1) in self.highlighted_x_ranges:
@@ -600,9 +612,13 @@ class SerialChart(Chart):
                 for i, date in enumerate(dates):
                     xy = (date, values[i])
                     dir = self._get_annotation_direction(i, values)
-                    self._annotate_point(a_formatter(values[i]), xy,
-                                         color=trendline_color,
-                                         direction=dir)
+                    self._annotate_point(
+                        a_formatter(values[i]),
+                        xy,
+                        color=trendline_color,
+                        direction=dir,
+                        zorder=15
+                    )
 
             # x = [a.xy[0] for a in self._annotations]
             # y = [a.xy[1] for a in self._annotations]

{newsworthycharts-1.61.1.dist-info → newsworthycharts-1.61.3.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.61.1
+Version: 1.61.3
 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.61.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.61.3.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -150,6 +150,7 @@ These settings are available for all chart types:
 - decimals = None  # None means automatically chose the best number
 - logo = None  # Path to image that will be embedded in the caption area. Can also be set though a style property
 - color_fn = None  # Custom coloring function
+- legend_title = None  # Title for the legend
 
 **SerialChart**
 
@@ -252,6 +253,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.61.3
+
+  - z-ordering fix in stacked bar charts
+  - added an extra categorical color to the newsworthy style
+
+- 1.61.2
+
+  - Remove horizontal line between bars in stacked bar charts
+
 - 1.61.1
 
   - Improved handling of label_placement = "outside" in SerialChart

{newsworthycharts-1.61.1.dist-info → newsworthycharts-1.61.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
-newsworthycharts/__init__.py,sha256=UtUks101pRHa3vCOHg4UPZbyoH12L711yi8xRgqF1aY,1160
+newsworthycharts/__init__.py,sha256=u6vihRaQbJ0Wpazujsxpq-IS7W6GSN6lFAXqOG7MkoI,1160
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=LwOZ3VbNy9vzvoK0s77AkbfMt4CXVDSAhnsnBInUIrE,14764
-newsworthycharts/chart.py,sha256=LYrcWNq2zQY90TB1b7e-5XPyBJ2nUGkzHqip1hGm5G0,30682
+newsworthycharts/chart.py,sha256=bCUkNKjFfuGRN6_VRQ-yCHla5LIMZ9H9a16upWbeWmY,30681
 newsworthycharts/choroplethmap.py,sha256=bCLf4kcchp1C2djg5AxcOM8BdbaMj0xg7UHrZsDafhI,8013
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
 newsworthycharts/scatterplot.py,sha256=6iaMoiZx__Gc-2Hcdw-8Ga5dSonrFo3oexKNmSFuir4,4959
 newsworthycharts/seasonalchart.py,sha256=rr55yqJUkaYDR9Ik98jes6574oY1U8t8LwoLE3gClW4,1967
-newsworthycharts/serialchart.py,sha256=ZgCaFhxwgrNEZZNB3QnrmcWdT9PnYMtORpb_jz4fzW8,26688
+newsworthycharts/serialchart.py,sha256=FOILuBd_NP-YZNeJwCTz89hPCiO1mDBcJmTEaJVbsw8,27294
 newsworthycharts/storage.py,sha256=myERhlpvXyExXxUByBq9eW1bWkCyfH9SwTZbsWSyy3Q,4301
 newsworthycharts/stripechart.py,sha256=9B6PX2MyLuKNQ8W0OGdKbP0-U32kju0K_NHHwwz_J68,1547
 newsworthycharts/custom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -24,12 +24,12 @@ newsworthycharts/lib/mimetypes.py,sha256=bL9HtVWbn2Of39LcBt4u4yelkr4bGZiyebq3OfL
 newsworthycharts/lib/utils.py,sha256=2Ko0dNFw2eHd32zQwJFUsgDkJGWSl6VacZs4AFPgrc8,7038
 newsworthycharts/maps/se-4.gpkg,sha256=oWw5j7FPVpI0ig67jNDim8qSn5SG8rcHp0014-uTKZM,290816
 newsworthycharts/maps/se-7.gpkg,sha256=Vmvqudq_ZtgV0sd6TY6kuk7vzqmYZCJmaxtsJ87q2a8,331776
-newsworthycharts/rc/newsworthy,sha256=X0btLNrmk2DRrfOsKj_WCSIgeD6btacEN2tRF_B4m8w,1581
+newsworthycharts/rc/newsworthy,sha256=vbYTav1w3DmB5tpaaV7Xl5q7TQJsc9eou6pLCoWc2vs,1589
 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.61.1.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.61.1.dist-info/METADATA,sha256=9aeZ4y_rdYwGMbukHpQ6y1LaIMuyh9zX7NRg7FGqV8I,28644
-newsworthycharts-1.61.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.61.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.61.1.dist-info/RECORD,,
+newsworthycharts-1.61.3.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.61.3.dist-info/METADATA,sha256=FH47AXXq2GHTmWEWqkZz_hiIwDCZIXUz-KB1E2nD4xE,28876
+newsworthycharts-1.61.3.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.61.3.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.61.3.dist-info/RECORD,,