newsworthycharts 1.74.1__py3-none-any.whl → 1.75.0__py3-none-any.whl

newsworthycharts/__init__.py

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

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/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/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.dist-info → newsworthycharts-1.75.0.dist-info}/METADATA

@@ -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.dist-info → newsworthycharts-1.75.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-newsworthycharts/__init__.py,sha256=fRJO8g3nfstntB5oDDv7d411O48Z4OkA-eL5IvwTRaY,1221
+newsworthycharts/__init__.py,sha256=s4ey1U5ZXaKsuTS3HiWnmpfA8QwY-m28T4XFqgAO1gc,1221
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=Vr-0yFms0hEVCeUa3vLt3FYBqpX4xLQ8YGPc4LGQN_A,18368
 newsworthycharts/chart.py,sha256=QDvIo_HV9fDmadBKLsPJMXrIYL6ZbHnDbVjZuzX9Srw,35441
-newsworthycharts/choroplethmap.py,sha256=eJiFcUpPFnkiF8VPiHTROdMuuRXHNX8_65rdowBskpc,9709
+newsworthycharts/choroplethmap.py,sha256=a31tavi8lSVhzYierf2exuO32moGXVKHYbTYV0sFL1U,9838
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
-newsworthycharts/map.py,sha256=EGh96tU10y7Kgu1e83_VWQSeABdjP6V-0VM6VTHDxu4,6089
+newsworthycharts/map.py,sha256=tECE7bZhJnvJxFV2pSitDxaHrKOwjBjoSA15H-MdzeI,6123
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
 newsworthycharts/rankchart.py,sha256=vMzNMVOv1jae6wuHC_riAdb1lm9oPltO3TT3YQpc0Oc,9376
 newsworthycharts/scatterplot.py,sha256=weHubdMsDGaBTXejg2TqBNPTQ1K-QBpZqJiyQ8EOEc4,5084
 newsworthycharts/seasonalchart.py,sha256=ttT8JpvWB3DL0EcTBQor_Uxlow_6tdcl7ibEmLCpUrQ,1982
-newsworthycharts/serialchart.py,sha256=Km1qxTumFq0GcKPzdaaU5mhq9f2BtusQ0tbpW6WsMiw,31936
+newsworthycharts/serialchart.py,sha256=0soPp2hwCYNOv1c8iTBCkh6YwXlhTDqZlR5j4k3uh3Q,32079
 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.74.1.dist-info/licenses/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.74.1.dist-info/METADATA,sha256=4VzONRQwYL2m336k48UXCPBNt29KTv-1rtVhMwWA6P8,35284
-newsworthycharts-1.74.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-newsworthycharts-1.74.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.74.1.dist-info/RECORD,,
+newsworthycharts-1.75.0.dist-info/licenses/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.75.0.dist-info/METADATA,sha256=8A7ATOaIxGnOm2tz2nGGN8ViEYoz3S7pt6GXwFWDG5E,35550
+newsworthycharts-1.75.0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+newsworthycharts-1.75.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.75.0.dist-info/RECORD,,