newsworthycharts 1.57.2__py3-none-any.whl → 1.58.0__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/chart.py

@@ -273,7 +273,7 @@ class Chart(object):
     def _add_title(self, title_text):
         """Add a title."""
         # y=1 wraps title heavily, hence .9999
-        text = self._fig.suptitle(title_text, wrap=True, x=0, y=0.999,
+        text = self._fig.suptitle(title_text, wrap=True, x=0, y=0.985,
                                   horizontalalignment="left",
                                   multialignment="left",
                                   fontproperties=self._title_font)

newsworthycharts/map.py

@@ -99,7 +99,12 @@ class Map(Chart):
     def _normalize_region_code(self, code):
         code = code.upper().replace("_", "-")
         # Apply translation, if we find and applicable one
-        region_translation = REGION_TRANSLATIONS.get(self.base_map, {})
+
+        # normalize basemap name, so that `se|03-7` is treated as `se-7
+        # region_translation = REGION_TRANSLATIONS.get(self.base_map, {})
+        _base_map, _subdivisions, _subset, *opts = self.parse_basemap()
+        region_translation = REGION_TRANSLATIONS.get(f"{_base_map}-{_subdivisions}", {})
+
         region_translation = {k.upper(): v for k, v in region_translation.items()}
         code = region_translation.get(code, code)
         return code
@@ -132,7 +137,7 @@ class Map(Chart):
         if len(_) > 1:
             [base_map, subset] = _
 
-        if not self.df:
+        if self.df is None:
             __dir = pathlib.Path(__file__).parent.resolve()
             try:
                 self.df = gpd.read_file(f"{__dir}/maps/{base_map}-{subdivisions}.gpkg")

newsworthycharts/serialchart.py

@@ -53,6 +53,7 @@ class SerialChart(Chart):
 
         # Optional: Adds background color to part of charts
         self.highlighted_x_ranges = []
+        self.x_range_labels = []
 
     @property
     def ymin(self):
@@ -443,6 +444,20 @@ class SerialChart(Chart):
             x0 = to_date(x0)
             x1 = to_date(x1)
             self.ax.axvspan(x0, x1, alpha=.4, color="lightgrey", lw=0)
+        for idx, t in enumerate(self.x_range_labels):
+            if idx >= len(self.highlighted_x_ranges):
+                continue
+            (x0, x1) = self.highlighted_x_ranges[idx]
+            x0 = to_date(x0)
+            x1 = to_date(x1)
+            _y = self.ymax or self.data.max_val + self.baseline
+            self.ax.text(
+                x0 + (x1 - x0) / 2,
+                _y,
+                t,
+                ha='center',
+                color=self._nwc_style["dark_gray_color"],
+            )
 
         # Accentuate y=0 || y=baseline
         # if (self.data.min_val < self.baseline) or self.baseline_annotation:

{newsworthycharts-1.57.2.dist-info → newsworthycharts-1.58.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.57.2
+Version: 1.58.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.57.2.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.58.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -15,11 +15,11 @@ Requires-Dist: Pillow ==10.3.0
 Requires-Dist: PyYAML >=3
 Requires-Dist: adjustText ==0.7.3
 Requires-Dist: boto3 >=1.26
-Requires-Dist: geopandas ==0.14.3
+Requires-Dist: geopandas ==0.14.4
 Requires-Dist: langcodes >=3.3
 Requires-Dist: mapclassify ==2.6.1
 Requires-Dist: matplotlib-label-lines ==0.5.1
-Requires-Dist: matplotlib ==3.8.4
+Requires-Dist: matplotlib ==3.9.0
 Requires-Dist: numpy <2,>=1.21.0
 Requires-Dist: python-dateutil <3,>=2
 Requires-Dist: requests >=2.22
@@ -164,6 +164,7 @@ These settings are available for all chart types:
 - 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
+- x_range_labels = []  # List of labels for highlighted areas
 - label_placement = "legend"  # legend|inline|outside
 - color_labels = None  # A dictionary of label/color, to override style colors
 
@@ -193,8 +194,13 @@ These settings are available for all chart types:
 - 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`.
+
 **ChoroplethMap**
 
+_ Inherits from Map _
+
 **ProgressChart**
 
 **RangePlot**
@@ -233,13 +239,23 @@ Roadmap
   - Getting rid of custom settings-hack
   - Custom month locator with equal-width month bars
 
-
 Changelog
 ---------
 
+- 1.58.0
+
+  - Matplotlib==3.9
+  - Added `.x_range_labels` to SerialChart
+  - Some tweaks to title placement to avoid cropping of diactritics
+
+- 1.57.3
+
+  - Make NW region keys work with map subsets (e.g. `SE|03-7`)
+  - Don't crash on subsequent calls to basemap parser
+
 - 1.57.2
 
-  - reduce excessive padding in ctagoerical vertical charts
+  - reduce excessive padding in categorical vertical charts
   - improved padding and margin logic for titles/subtitles (taking line spacing into account)
 
 - 1.57.1

{newsworthycharts-1.57.2.dist-info → newsworthycharts-1.58.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-newsworthycharts/__init__.py,sha256=KmKpBttYKLayAfnuYYhLGJXXIEJpN8HluaOsuR1GFIw,1160
+newsworthycharts/__init__.py,sha256=TGm5s8DIgvd8xNLCVN0tjDhFXlDUgdQnIWchaonBmaw,1160
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=LwOZ3VbNy9vzvoK0s77AkbfMt4CXVDSAhnsnBInUIrE,14764
-newsworthycharts/chart.py,sha256=zVBkbCX4c3JjPhweXPXELkxbYMJDX1jSDVsoTfS1A7k,30634
+newsworthycharts/chart.py,sha256=B1T_gvtKB3ogWnzQCnPsUgerBm6ThY5d6DA8acnlUr4,30634
 newsworthycharts/choroplethmap.py,sha256=2b61MuYed8ccc7uZkzuSdZDbqVR7C3OP1ftb_khuaLw,6069
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
-newsworthycharts/map.py,sha256=e0WRcLTmb1KPZ7_-05QXgthMEmKrTpnci40DXnmd6Rc,5984
+newsworthycharts/map.py,sha256=ruhFEFmGg8DwySDPnEbx_4n57DgHL5LlLKQEnoNmuIU,6225
 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=ueDeequZe8Oufi2sBBjf9VyI2-_l767g1wZKqCtY200,25688
+newsworthycharts/serialchart.py,sha256=MGP-yCwfKpR_duPnX1_9A1mENOGSeoqq8iI-8GLiNFk,26232
 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.57.2.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.57.2.dist-info/METADATA,sha256=1OrCBrpa5SOFS01LD7FlqCo3CIIO_ok4rBKmg1TGo3c,26527
-newsworthycharts-1.57.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-newsworthycharts-1.57.2.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.57.2.dist-info/RECORD,,
+newsworthycharts-1.58.0.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.58.0.dist-info/METADATA,sha256=1aPmXJsf0vzxQTnv3x8RYYB5li-6mOZpb30iruMP-X4,27063
+newsworthycharts-1.58.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+newsworthycharts-1.58.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.58.0.dist-info/RECORD,,