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

newsworthycharts/__init__.py

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

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/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/rankchart.py

@@ -148,9 +148,15 @@ class BumpChart(SerialChart):
                 # 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"])
+                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
+                self.ax.spines['left'].set_position(
+                    ('outward', _bbox.width * 1.15 + 15)
+                )
                 dummy_text.remove()
 
             if self.label_placement in ["right", "both"]:

newsworthycharts/serialchart.py

@@ -520,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)
@@ -531,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.5.dist-info → newsworthycharts-1.72.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.5
+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.5.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
@@ -271,6 +271,15 @@ 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

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

@@ -1,15 +1,15 @@
-newsworthycharts/__init__.py,sha256=pPubTzsF-HxZnryr86J7ir5eaH5q595foyBekjtB-9s,1221
+newsworthycharts/__init__.py,sha256=RGNp0faDG-9SuFh6Ha4f8TB-QT5j3WSTn1gcqdIANhk,1221
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=Vr-0yFms0hEVCeUa3vLt3FYBqpX4xLQ8YGPc4LGQN_A,18368
 newsworthycharts/chart.py,sha256=eXgrNCmfE52rFsvTDkMpCZsmL0oSezdkH---LGYsES8,35062
-newsworthycharts/choroplethmap.py,sha256=Si-01213rWqDKINkhmKV6x5iSMumQveJfrlCnqYcIJM,8173
+newsworthycharts/choroplethmap.py,sha256=PEhBOw9UD0OyeFRjpCFFoxa2ztT5NeGSYOubo2PaNtA,9210
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
-newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
+newsworthycharts/map.py,sha256=EGh96tU10y7Kgu1e83_VWQSeABdjP6V-0VM6VTHDxu4,6089
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
-newsworthycharts/rankchart.py,sha256=1wn2ZP67xH-F_Wz-XnTOr2gAXMXMCufe6eFRHXY7Fms,9285
+newsworthycharts/rankchart.py,sha256=vMzNMVOv1jae6wuHC_riAdb1lm9oPltO3TT3YQpc0Oc,9376
 newsworthycharts/scatterplot.py,sha256=weHubdMsDGaBTXejg2TqBNPTQ1K-QBpZqJiyQ8EOEc4,5084
 newsworthycharts/seasonalchart.py,sha256=rr55yqJUkaYDR9Ik98jes6574oY1U8t8LwoLE3gClW4,1967
-newsworthycharts/serialchart.py,sha256=gy5BIOrzte529JFII1jFbEDDejnB7FmO_kzDHXdE21o,30105
+newsworthycharts/serialchart.py,sha256=x28ldRdba3JEmat-cnQH1XQQXrPEhx-S55_1yTvNIDI,30133
 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.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,,
+newsworthycharts-1.72.0.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.72.0.dist-info/METADATA,sha256=uGw146ThyPklZETg3rtINrRMYmr7Y2w5VsI8MUX1fHM,34022
+newsworthycharts-1.72.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.72.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.72.0.dist-info/RECORD,,