newsworthycharts 1.74.1__tar.gz → 1.75.0__tar.gz

{newsworthycharts-1.74.1/newsworthycharts.egg-info → newsworthycharts-1.75.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: newsworthycharts
-Version: 1.74.1
+Version: 1.75.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.74.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.75.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -21,7 +21,7 @@ Requires-Dist: python-dateutil<3,>=2
 Requires-Dist: Pillow==11.2.1
 Requires-Dist: requests>=2.22
 Requires-Dist: matplotlib-label-lines==0.5.1
-Requires-Dist: geopandas==1.0.1
+Requires-Dist: geopandas==1.1.0
 Requires-Dist: mapclassify==2.8.1
 Dynamic: author
 Dynamic: author-email
@@ -225,6 +225,7 @@ These settings are available for all chart types:
 - `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
+- `missing_color` = "gainsboro"  # Color for regions with 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`.
@@ -285,6 +286,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.75.0
+
+  - geopandas==1.1.0
+  - Added `missing_color` argument to ChoroplethMap, to set the color of regions with no data
+
+- 1.74.2
+
+  - Improved positioning of x-range annotations in SerialChart
+
 - 1.74.1
 
   - Wait for data to be added before calculating dynamic heights and responsive typography

{newsworthycharts-1.74.1 → newsworthycharts-1.75.0}/README.rst

@@ -188,6 +188,7 @@ These settings are available for all chart types:
 - `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
+- `missing_color` = "gainsboro"  # Color for regions with 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`.
@@ -248,6 +249,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.75.0
+
+  - geopandas==1.1.0
+  - Added `missing_color` argument to ChoroplethMap, to set the color of regions with no data
+
+- 1.74.2
+
+  - Improved positioning of x-range annotations in SerialChart
+
 - 1.74.1
 
   - Wait for data to be added before calculating dynamic heights and responsive typography

{newsworthycharts-1.74.1 → newsworthycharts-1.75.0}/newsworthycharts/__init__.py

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

{newsworthycharts-1.74.1 → newsworthycharts-1.75.0}/newsworthycharts/choroplethmap.py

@@ -33,6 +33,10 @@ class ChoroplethMap(Map):
 
         df = self._prepare_map_data()
 
+        missing_color = "gainsboro"
+        if self.missing_color:
+            missing_color = self.missing_color
+
         args = {
             "categorical": True,
             "legend": True,  # bug in geopandas, fixed in master but not released
@@ -43,7 +47,7 @@ class ChoroplethMap(Map):
             "edgecolor": "white",
             "linewidth": 0.2,
             "missing_kwds": {
-                "color": "gainsboro",
+                "color": missing_color,
             },
         }
         # This should be adjusted per basemap
@@ -58,8 +62,8 @@ class ChoroplethMap(Map):
             # 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")
+            df["color"] = df["data"].apply(lambda x: mapper.to_rgba(x) if not np.isnan(x) else missing_color)
+            df["color"] = df["color"].fillna(missing_color)
             args["color"] = df["color"]
 
             self._fig.tight_layout()
@@ -129,8 +133,8 @@ class ChoroplethMap(Map):
             # normalize the data ourselves, otherwise the inset maps will be off
             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")
+            df["color"] = df["data"].apply(lambda x: mapper.to_rgba(x) if not np.isnan(x) else missing_color)
+            df["color"] = df["color"].fillna(missing_color)
             args["color"] = df["color"]
 
             # Add labels legend (manually, Geopandas is too crude as of now)
@@ -173,7 +177,7 @@ class ChoroplethMap(Map):
                 for idx, cat in enumerate(cat):
                     color_map[cat] = self._nwc_style["qualitative_colors"][idx]
             df["color"] = df["data"].astype(str).map(color_map)
-            df["color"] = df["color"].fillna("gainsboro")
+            df["color"] = df["color"].fillna(missing_color)
             args["color"] = df["color"]
 
             # Geopandas does not handle legend if color keyword is used
@@ -195,7 +199,7 @@ class ChoroplethMap(Map):
                 patches.append(patch)
         patches = list(reversed(patches))
         if self.missing_label and len(patches):
-            patches.append(mpatches.Patch(color="gainsboro", label=self.missing_label))
+            patches.append(mpatches.Patch(color=missing_color, label=self.missing_label))
 
         df.plot(ax=self.ax, **args)
         # Add outer edge

{newsworthycharts-1.74.1 → newsworthycharts-1.75.0}/newsworthycharts/map.py

@@ -94,6 +94,7 @@ class Map(Chart):
         self.categorical = kwargs.get("categorical", False)
         self.base_map = None
         self.missing_label = None
+        self.missing_color = None
         self.df = None
         self.show_ticks = False
 

{newsworthycharts-1.74.1 → newsworthycharts-1.75.0}/newsworthycharts/serialchart.py

@@ -539,7 +539,10 @@ class SerialChart(Chart):
             (x0, x1) = self.highlighted_x_ranges[idx]
             x0 = to_date(x0)
             x1 = to_date(x1)
+            # Put label betwen top value and axis limit
             _y = self.ymax or self.data.max_val + self.baseline
+            _y_top = self.ax.get_ylim()[1]
+            _y = _y_top - (_y_top - _y) / 2
             self.ax.text(
                 x0 + (x1 - x0) / 2,
                 _y,

{newsworthycharts-1.74.1 → newsworthycharts-1.75.0/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: newsworthycharts
-Version: 1.74.1
+Version: 1.75.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.74.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.75.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -21,7 +21,7 @@ Requires-Dist: python-dateutil<3,>=2
 Requires-Dist: Pillow==11.2.1
 Requires-Dist: requests>=2.22
 Requires-Dist: matplotlib-label-lines==0.5.1
-Requires-Dist: geopandas==1.0.1
+Requires-Dist: geopandas==1.1.0
 Requires-Dist: mapclassify==2.8.1
 Dynamic: author
 Dynamic: author-email
@@ -225,6 +225,7 @@ These settings are available for all chart types:
 - `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
+- `missing_color` = "gainsboro"  # Color for regions with 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`.
@@ -285,6 +286,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.75.0
+
+  - geopandas==1.1.0
+  - Added `missing_color` argument to ChoroplethMap, to set the color of regions with no data
+
+- 1.74.2
+
+  - Improved positioning of x-range annotations in SerialChart
+
 - 1.74.1
 
   - Wait for data to be added before calculating dynamic heights and responsive typography

{newsworthycharts-1.74.1 → newsworthycharts-1.75.0}/newsworthycharts.egg-info/requires.txt

@@ -9,5 +9,5 @@ python-dateutil<3,>=2
 Pillow==11.2.1
 requests>=2.22
 matplotlib-label-lines==0.5.1
-geopandas==1.0.1
+geopandas==1.1.0
 mapclassify==2.8.1

{newsworthycharts-1.74.1 → newsworthycharts-1.75.0}/setup.py

@@ -35,7 +35,7 @@ setup(
         "Pillow==11.2.1",
         "requests>=2.22",
         "matplotlib-label-lines==0.5.1",
-        "geopandas==1.0.1",
+        "geopandas==1.1.0",
         "mapclassify==2.8.1",
     ],
     setup_requires=["flake8"],