newsworthycharts 1.60.1__tar.gz → 1.61.1__tar.gz

{newsworthycharts-1.60.1/newsworthycharts.egg-info → newsworthycharts-1.61.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.60.1
+Version: 1.61.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.60.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.61.1.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -21,9 +21,9 @@ Requires-Dist: python-dateutil<3,>=2
 Requires-Dist: Pillow==10.4.0
 Requires-Dist: requests>=2.22
 Requires-Dist: matplotlib-label-lines==0.5.1
-Requires-Dist: geopandas>1
+Requires-Dist: geopandas>=1
 Requires-Dist: mapclassify==2.6.1
-Requires-Dist: fiona>=1.10
+Requires-Dist: puremagic>=1
 
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
 
@@ -167,7 +167,7 @@ These settings are available for all chart types:
 - value_labels = False  # Print out values at points on line?
 - highlighted_x_ranges = []  # List of tuples with start and end of highlighted areas
 - x_range_labels = []  # List of labels for highlighted areas
-- label_placement = "legend"  # legend|inline|outside
+- label_placement = "legend"  # legend|inline|outside|line
 - color_labels = None  # A dictionary of label/color, to override style colors
 
 **SeasonalChart**
@@ -188,13 +188,14 @@ These settings are available for all chart types:
 
 **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
+- `use_bins` = True  # If False, the map will be colored by a continuous value
+- `bins` = 5  # 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
 
 `basemap` can be `{ISO}-{level}` or `{ISO}|{subset}-{level}`. 
 For example, `se-4` will show Swedish counties, while `se|03-7` will show municipalities (`se-7`) starting with `03`.
@@ -203,6 +204,10 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
 
 _ Inherits from Map _
 
+**BubbleMap**
+
+_ Inherits from Map _
+
 **ProgressChart**
 
 **RangePlot**
@@ -247,6 +252,16 @@ Roadmap
 Changelog
 ---------
 
+- 1.61.1
+
+  - Improved handling of label_placement = "outside" in SerialChart
+
+- 1.61.0
+
+  - Added non-binned color ramp support to ChoroplethMap, with `use_bins=False`
+  - Improved data validation in ChoroplethMap
+  - Put largest value on top in choropleth map legends
+
 - 1.60.1
 
   - Don't require fiona. Geopandas now support Pyogrio

{newsworthycharts-1.60.1 → newsworthycharts-1.61.1}/README.rst

@@ -140,7 +140,7 @@ These settings are available for all chart types:
 - value_labels = False  # Print out values at points on line?
 - highlighted_x_ranges = []  # List of tuples with start and end of highlighted areas
 - x_range_labels = []  # List of labels for highlighted areas
-- label_placement = "legend"  # legend|inline|outside
+- label_placement = "legend"  # legend|inline|outside|line
 - color_labels = None  # A dictionary of label/color, to override style colors
 
 **SeasonalChart**
@@ -161,13 +161,14 @@ These settings are available for all chart types:
 
 **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
+- `use_bins` = True  # If False, the map will be colored by a continuous value
+- `bins` = 5  # 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
 
 `basemap` can be `{ISO}-{level}` or `{ISO}|{subset}-{level}`. 
 For example, `se-4` will show Swedish counties, while `se|03-7` will show municipalities (`se-7`) starting with `03`.
@@ -176,6 +177,10 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
 
 _ Inherits from Map _
 
+**BubbleMap**
+
+_ Inherits from Map _
+
 **ProgressChart**
 
 **RangePlot**
@@ -220,6 +225,16 @@ Roadmap
 Changelog
 ---------
 
+- 1.61.1
+
+  - Improved handling of label_placement = "outside" in SerialChart
+
+- 1.61.0
+
+  - Added non-binned color ramp support to ChoroplethMap, with `use_bins=False`
+  - Improved data validation in ChoroplethMap
+  - Put largest value on top in choropleth map legends
+
 - 1.60.1
 
   - Don't require fiona. Geopandas now support Pyogrio

{newsworthycharts-1.60.1 → newsworthycharts-1.61.1}/newsworthycharts/__init__.py

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

{newsworthycharts-1.60.1 → newsworthycharts-1.61.1}/newsworthycharts/chart.py

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

{newsworthycharts-1.60.1 → newsworthycharts-1.61.1}/newsworthycharts/choroplethmap.py

@@ -6,6 +6,7 @@ import geopandas as gpd
 import numpy as np
 import pandas as pd
 import mapclassify
+import matplotlib as mpl
 import matplotlib.patches as mpatches
 
 
@@ -50,11 +51,33 @@ class ChoroplethMap(Map):
         }
 
         patches = []  # for legend
-        if not self.categorical:
+        if not self.categorical and self.use_bins is False:
+            # 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())
+            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")
+            args["color"] = df["color"]
+
+            _min = df["data"].min()
+            _max = df["data"].max()
+            _median = df["data"].median()
+            fmt = self._get_value_axis_formatter()
+            patches.append(mpatches.Patch(color=mapper.to_rgba(_min), label=fmt(_min)))
+            if _median != _min and _median != _max:
+                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,
             # but we to keep them for plotting, hence
             # this hack with cutting out nan's and re-pasting them below
             _has_value = df[~df["data"].isna()].copy()
+            if not pd.to_numeric(_has_value['data'], errors='coerce').notnull().all():
+                # We can't bin non-numeric data
+                raise ValueError("Data must be numeric")
             binning = mapclassify.classify(
                 np.asarray(_has_value["data"]),  # .astype("category")
                 self.binning_method,
@@ -75,10 +98,8 @@ 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
-            import matplotlib.cm as cm
-            import matplotlib as mpl
             norm = mpl.colors.Normalize(vmin=df["data"].min(), vmax=df["data"].max())
-            mapper = cm.ScalarMappable(norm=norm, cmap=self.color_ramp)
+            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")
             args["color"] = df["color"]
@@ -130,6 +151,7 @@ class ChoroplethMap(Map):
                     color = self._nwc_style[f"{color}_color"]
                 patch = mpatches.Patch(color=color, label=label)
                 patches.append(patch)
+        patches = list(reversed(patches))
         if self.missing_label:
             patches.append(mpatches.Patch(color="gainsboro", label=self.missing_label))
 
@@ -171,7 +193,8 @@ class ChoroplethMap(Map):
             for _line in [a, b, c, d]:
                 _line.set_visible(False)
 
-        self.ax.legend(
-            handles=patches,
-            **label_kwargs,
-        )
+        if len(patches):
+            self.ax.legend(
+                handles=patches,
+                **label_kwargs,
+            )

{newsworthycharts-1.60.1 → newsworthycharts-1.61.1}/newsworthycharts/map.py

@@ -87,6 +87,7 @@ class Map(Chart):
     def __init__(self, *args, **kwargs):
         super(Map, self).__init__(*args, **kwargs)
         self.bins = kwargs.get("bins", 5)
+        self.use_bins = kwargs.get("use_bins", True)
         self.binning_method = kwargs.get("binning_method", "natural_breaks")
         self.colors = kwargs.get("colors", None)
         self.color_ramp = kwargs.get("color_ramp", "YlGn")  # YlOrRd

{newsworthycharts-1.60.1 → newsworthycharts-1.61.1}/newsworthycharts/serialchart.py

@@ -46,7 +46,7 @@ class SerialChart(Chart):
         self.colors = None
 
         # Optional: where to place series label
-        self.label_placement = "legend"  # legend|inline|outside
+        self.label_placement = "legend"  # legend|inline|outside|line
 
         # Optional: annotate each point with a value label
         self.value_labels = False
@@ -549,7 +549,12 @@ class SerialChart(Chart):
                 _ = self.ax.legend(loc="best")
                 _.set(zorder=20)
             elif self.label_placement == "outside":
-                self.ax.legend(bbox_to_anchor=(0, 1, 1, 0), loc="lower right")
+                # mpl 3.7 has loc=outside, but it will lead to overlaps with titles
+                # also, has to be set on the figure, causing image size to change
+                _ = self.ax.legend(bbox_to_anchor=(1.04, 1), loc="upper left")
+                # self._fig.subplots_adjust(right=0.8)
+                # self._fig.tight_layout()
+                _.set(zorder=20)
             elif self.label_placement == "inline":
                 labelLines(self.ax.get_lines(), align=False, zorder=13, outline_width=4, fontweight="bold")
 

{newsworthycharts-1.60.1 → newsworthycharts-1.61.1/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.60.1
+Version: 1.61.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.60.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.61.1.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -21,9 +21,9 @@ Requires-Dist: python-dateutil<3,>=2
 Requires-Dist: Pillow==10.4.0
 Requires-Dist: requests>=2.22
 Requires-Dist: matplotlib-label-lines==0.5.1
-Requires-Dist: geopandas>1
+Requires-Dist: geopandas>=1
 Requires-Dist: mapclassify==2.6.1
-Requires-Dist: fiona>=1.10
+Requires-Dist: puremagic>=1
 
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
 
@@ -167,7 +167,7 @@ These settings are available for all chart types:
 - value_labels = False  # Print out values at points on line?
 - highlighted_x_ranges = []  # List of tuples with start and end of highlighted areas
 - x_range_labels = []  # List of labels for highlighted areas
-- label_placement = "legend"  # legend|inline|outside
+- label_placement = "legend"  # legend|inline|outside|line
 - color_labels = None  # A dictionary of label/color, to override style colors
 
 **SeasonalChart**
@@ -188,13 +188,14 @@ These settings are available for all chart types:
 
 **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
+- `use_bins` = True  # If False, the map will be colored by a continuous value
+- `bins` = 5  # 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
 
 `basemap` can be `{ISO}-{level}` or `{ISO}|{subset}-{level}`. 
 For example, `se-4` will show Swedish counties, while `se|03-7` will show municipalities (`se-7`) starting with `03`.
@@ -203,6 +204,10 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
 
 _ Inherits from Map _
 
+**BubbleMap**
+
+_ Inherits from Map _
+
 **ProgressChart**
 
 **RangePlot**
@@ -247,6 +252,16 @@ Roadmap
 Changelog
 ---------
 
+- 1.61.1
+
+  - Improved handling of label_placement = "outside" in SerialChart
+
+- 1.61.0
+
+  - Added non-binned color ramp support to ChoroplethMap, with `use_bins=False`
+  - Improved data validation in ChoroplethMap
+  - Put largest value on top in choropleth map legends
+
 - 1.60.1
 
   - Don't require fiona. Geopandas now support Pyogrio

{newsworthycharts-1.60.1 → newsworthycharts-1.61.1}/newsworthycharts.egg-info/requires.txt

@@ -9,6 +9,6 @@ python-dateutil<3,>=2
 Pillow==10.4.0
 requests>=2.22
 matplotlib-label-lines==0.5.1
-geopandas>1
+geopandas>=1
 mapclassify==2.6.1
-fiona>=1.10
+puremagic>=1

{newsworthycharts-1.60.1 → newsworthycharts-1.61.1}/setup.py

@@ -35,9 +35,9 @@ setup(
         "Pillow==10.4.0",
         "requests>=2.22",
         "matplotlib-label-lines==0.5.1",
-        "geopandas>1",
+        "geopandas>=1",
         "mapclassify==2.6.1",
-        "fiona>=1.10",
+        "puremagic>=1",
     ],
     setup_requires=["flake8"],
     include_package_data=True,