newsworthycharts 1.56.0__py3-none-any.whl → 1.57.1__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/bubblemap.py

@@ -23,7 +23,6 @@ class BubbleMap(Map):
     def __init__(self, *args, **kwargs):
         super(BubbleMap, self).__init__(*args, **kwargs)
         self.bubble_size = kwargs.get("bubble_size", 1)
-        print(self.bubble_size)
 
     def _add_data(self):
 

newsworthycharts/chart.py

@@ -432,16 +432,6 @@ class Chart(object):
         if len(self.data):
             self._add_data()
 
-        if (self.yline):
-            self.ax.axhline(
-                y=self.yline,
-                color=self._nwc_style["neutral_color"],
-                linewidth=0.8,
-                xmin=0,
-                xmax=1,
-                clip_on=False,
-            )
-
         # Calculate size in inches
         # Until 1.45 we did this on init, but now we'd like to enable dynamic heights
         if self.requested_height is None:

newsworthycharts/choroplethmap.py

@@ -112,27 +112,13 @@ class ChoroplethMap(Map):
 
         fig = df.plot(ax=self.ax, **args)
         # Add outer edge
-        # unary_union does not work with Multipolygons
-        mp = MultiPolygon([g for g in df.explode(index_parts=True).geometry])
-        gpd.GeoSeries(mp.boundary).plot(
+        gpd.GeoSeries(df.unary_union).plot(
             ax=self.ax,
             edgecolor="lightgrey",
             linewidth=0.2,
+            facecolor="none",
             color="none",
         )
-        """
-        unary = df.unary_union
-        if unary.geom_type == "Polygon":
-            # We don't know in advance if unary_union will produce a polugon or a multipolygon
-            unary = MultiPolygon([unary])
-        for uu in unary.geoms:
-            gpd.GeoSeries(uu).plot(
-                ax=self.ax,
-                edgecolor="lightgrey",
-                linewidth=0.2,
-                facecolor="none",
-            )
-        """
         self.ax.axis("off")
 
         # Format numbers in legend

newsworthycharts/serialchart.py

@@ -216,6 +216,7 @@ class SerialChart(Chart):
             if self.type[i] == "line":
                 # 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)
@@ -243,7 +244,7 @@ class SerialChart(Chart):
                     self.ax.plot(dates[0], values[0],
                                  c=color,
                                  marker='.',
-                                 zorder=2)
+                                 zorder=12)
                 elif num_values > 1:
                     for j, v in enumerate(values):
                         def nullish(val):
@@ -260,7 +261,7 @@ class SerialChart(Chart):
                             self.ax.plot(dates[j], v,
                                          c=color,
                                          marker='.',
-                                         zorder=2)
+                                         zorder=12)
 
                 if len(self.labels) > i:
                     line.set_label(self.labels[i])
@@ -449,7 +450,7 @@ class SerialChart(Chart):
             y=self.baseline,
             linewidth=1,
             color="#444444",
-            zorder=4,
+            zorder=6,
             linestyle="--" if self.baseline else "-"
         )
         if self.baseline_annotation:
@@ -530,11 +531,11 @@ class SerialChart(Chart):
         if len(self.labels) > 1:
             if self.label_placement == "legend":
                 _ = self.ax.legend(loc="best")
-                _.set(zorder=10)
+                _.set(zorder=20)
             elif self.label_placement == "outside":
                 self.ax.legend(bbox_to_anchor=(0, 1, 1, 0), loc="lower right")
             elif self.label_placement == "inline":
-                labelLines(self.ax.get_lines(), align=False, zorder=3, outline_width=4, fontweight="bold")
+                labelLines(self.ax.get_lines(), align=False, zorder=13, outline_width=4, fontweight="bold")
 
         # Trend/change line
         if self.trendline:
@@ -551,6 +552,10 @@ class SerialChart(Chart):
                 # Use neutral color for trendline
                 trendline_color = self._nwc_style["neutral_color"]
 
+            if len(self.data) == 1 and self.type[0] == "line":
+                # If we have a single line,
+                # avoid using the same color for trendline
+                trendline_color = self._nwc_style["neutral_color"]
             # Check if we have a list of single (x-) values, or data points
             if all(len(x) == 2 for x in self.trendline):
                 # data points
@@ -565,7 +570,7 @@ class SerialChart(Chart):
                 marker = 'o'
 
             self.ax.plot(dates, values,
-                         color=trendline_color, zorder=4,
+                         color=trendline_color, zorder=14,
                          linewidth=1,
                          marker=marker, linestyle='dashed')
 
@@ -589,6 +594,18 @@ class SerialChart(Chart):
         if len(value_label_elems) > 1:
             self._adust_texts_vertically(value_label_elems, ha="center")
 
+        # yline
+        if (self.yline):
+            self.ax.axhline(
+                y=self.yline,
+                color=self._nwc_style["neutral_color"],
+                linewidth=0.8,
+                xmin=0,
+                xmax=1,
+                clip_on=False,
+                zorder=6,
+            )
+
     def _adust_texts_vertically(self, elements, ha="left"):
         if len(elements) == 2:
             # Hack: check for overlap and adjust labels only

{newsworthycharts-1.56.0.dist-info → newsworthycharts-1.57.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.56.0
+Version: 1.57.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.56.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.57.1.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: Babel <3,>=2.14.0
-Requires-Dist: Pillow ==10.2.0
+Requires-Dist: Pillow ==10.3.0
 Requires-Dist: PyYAML >=3
 Requires-Dist: adjustText ==0.7.3
 Requires-Dist: boto3 >=1.26
@@ -19,7 +19,7 @@ Requires-Dist: geopandas ==0.14.3
 Requires-Dist: langcodes >=3.3
 Requires-Dist: mapclassify ==2.6.1
 Requires-Dist: matplotlib-label-lines ==0.5.1
-Requires-Dist: matplotlib ==3.8.3
+Requires-Dist: matplotlib ==3.8.4
 Requires-Dist: numpy <2,>=1.21.0
 Requires-Dist: python-dateutil <3,>=2
 Requires-Dist: requests >=2.22
@@ -128,9 +128,12 @@ Options
 
 **Chart**
 
+These settings are available for all chart types:
+
 - data: A list of datasets
 - annotate_trend = True  # Print out values at points on trendline?
 - trendline = []  # List of x positions, or data points
+- yline = None  # A horizontal line across the chart (Matplotlib: axhline)
 - labels = []  # Optionally one label for each dataset
 - annotations = []  # Manually added annotations
 - interval = None  # yearly|quarterly|monthly|weekly|daily
@@ -146,6 +149,59 @@ Options
 - 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
 
+**SerialChart**
+
+- type = 'line'  # line|bar|stacked_bar
+- 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
+- max_ticks = 7  # Maximum number of ticks on the x axis
+- 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
+- ymax = None  # Maximum value on y axis. If None, it will be calculated from data
+- colors = None  # A list of colors, each correspoding to one dataseries. Default behaviour is to use the style colors
+- value_labels = False  # Print out values at points on line?
+- highlighted_x_ranges = []  # List of tuples with start and end of highlighted areas
+- label_placement = "legend"  # legend|inline|outside
+- color_labels = None  # A dictionary of label/color, to override style colors
+
+**SeasonalChart**
+
+**BubbleMap**
+
+- bubble_size = 1  # The size of the bubbles
+
+**CategoricalChart**
+
+- bar_orientation = "horizontal"  # [horizontal|vertical]
+- annotation_rotation = 0
+- stacked = False
+- legend = True
+- colors = None
+
+**CategoricalChartWithReference**
+
+**Map**
+
+- bins = 9  # Number of bins for continuous data
+- binning_method = "natural_breaks"
+- colors = None
+- color_ramp = "YlOrRd"
+- categorical = False  # If True, the map will be colored by category. If False, it will be colored by a continuous value
+- base_map = None
+- missing_label = None  # Add a label for no data
+
+**ChoroplethMap**
+
+**ProgressChart**
+
+**RangePlot**
+
+**ScatterPlot**
+
+**StripeChart**
 
 Developing
 ----------
@@ -181,6 +237,17 @@ Roadmap
 Changelog
 ---------
 
+- 1.57.1
+
+  - Fix missing outline in choropleth maps
+  - matplotlib==3.8.4; Pillow==10.3.0
+
+- 1.57.0
+
+  - Changed z-ordering so that line are always on top of bars, and ylines/zero lines are behind lines but in front of bars
+  - Avoid using the same color for trendline and lines
+  - `yline` was moved to the SerialChart class, where it makes sense.
+
 - 1.56.0
 
   - Reverted trendline behaviour to 1.54

{newsworthycharts-1.56.0.dist-info → newsworthycharts-1.57.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
-newsworthycharts/__init__.py,sha256=Stb7eJUCOxgLmid8Qvz2nSgUPGDl9xWEmElbJQ45PAo,1160
-newsworthycharts/bubblemap.py,sha256=_AMj3RkmKDKVmrtj3FuuY776xRUSEf2qE8tG0vQ3Lyg,2619
+newsworthycharts/__init__.py,sha256=KwgSbe7UCJDXJhb66gLqhiZ1or8woAGXKYTXvM3YQo8,1160
+newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=k2cd96pNysbVU88nZduiLGpzyjMsDXTbASAVu6ov-kI,14686
-newsworthycharts/chart.py,sha256=3Xwgtgp1Qf8pq_eR3At40jwQZd2rEvl71Cax3z_3czw,30848
-newsworthycharts/choroplethmap.py,sha256=KXtdiRBe-_j_zUozUgdhAWyoYN-eUdFxt9mneN10H1w,6670
+newsworthycharts/chart.py,sha256=YXoK2VvB7t8sfVrCVkLpPulHHsDKQZKAm_aTCig_4ck,30583
+newsworthycharts/choroplethmap.py,sha256=YamK4yf7X5y7VU_13I3iKE4KbwJ1Ie2x9fezwCh17cg,6124
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=e0WRcLTmb1KPZ7_-05QXgthMEmKrTpnci40DXnmd6Rc,5984
 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=nBfXd877V6TsIDZ4QWaONNlft_fL71tkFjnJ1n4tjfs,25081
+newsworthycharts/serialchart.py,sha256=ueDeequZe8Oufi2sBBjf9VyI2-_l767g1wZKqCtY200,25688
 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 +28,8 @@ newsworthycharts/rc/newsworthy,sha256=X0btLNrmk2DRrfOsKj_WCSIgeD6btacEN2tRF_B4m8
 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.56.0.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.56.0.dist-info/METADATA,sha256=SvBL5j5SVZ7R_5R7w8o3rmF_uTB_yC9MFwxfaH2p5A0,24049
-newsworthycharts-1.56.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-newsworthycharts-1.56.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.56.0.dist-info/RECORD,,
+newsworthycharts-1.57.1.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.57.1.dist-info/METADATA,sha256=RnpK8VFn5k0_gYUJOEUlLkIAaKb_8Cwm57K9akt8YIg,26362
+newsworthycharts-1.57.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+newsworthycharts-1.57.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.57.1.dist-info/RECORD,,