newsworthycharts 1.57.2__tar.gz → 1.58.0__tar.gz

{newsworthycharts-1.57.2 → newsworthycharts-1.58.0}/PKG-INFO

@@ -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
@@ -151,6 +151,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
 
@@ -180,8 +181,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**
@@ -220,13 +226,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/newsworthycharts.egg-info/PKG-INFO → newsworthycharts-1.58.0/README.rst

@@ -1,16 +1,3 @@
-Metadata-Version: 2.1
-Name: newsworthycharts
-Version: 1.57.2
-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
-Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
-Author-email: stockholm@jplusplus.org
-License: MIT
-Requires-Python: >=3.9
-Description-Content-Type: text/x-rst
-License-File: LICENSE.txt
-
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
 
 It is written and maintained for `Newsworthy <https://www.newsworthy.se/en/>`_, but could possibly come in handy for other people as well.
@@ -151,6 +138,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
 
@@ -180,8 +168,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**
@@ -220,13 +213,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 → newsworthycharts-1.58.0}/newsworthycharts/__init__.py

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

{newsworthycharts-1.57.2 → newsworthycharts-1.58.0}/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-1.57.2 → newsworthycharts-1.58.0}/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-1.57.2 → newsworthycharts-1.58.0}/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/README.rst → newsworthycharts-1.58.0/newsworthycharts.egg-info/PKG-INFO

@@ -1,3 +1,16 @@
+Metadata-Version: 2.1
+Name: newsworthycharts
+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.58.0.tar.gz
+Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
+Author-email: stockholm@jplusplus.org
+License: MIT
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
 
 It is written and maintained for `Newsworthy <https://www.newsworthy.se/en/>`_, but could possibly come in handy for other people as well.
@@ -138,6 +151,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
 
@@ -167,8 +181,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**
@@ -207,13 +226,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 → newsworthycharts-1.58.0}/newsworthycharts.egg-info/requires.txt

@@ -3,11 +3,11 @@ Pillow==10.3.0
 PyYAML>=3
 adjustText==0.7.3
 boto3>=1.26
-geopandas==0.14.3
+geopandas==0.14.4
 langcodes>=3.3
 mapclassify==2.6.1
 matplotlib-label-lines==0.5.1
-matplotlib==3.8.4
+matplotlib==3.9.0
 numpy<2,>=1.21.0
 python-dateutil<3,>=2
 requests>=2.22

{newsworthycharts-1.57.2 → newsworthycharts-1.58.0}/setup.py

@@ -25,7 +25,7 @@ setup(
     python_requires='>=3.9',
     install_requires=[
         "boto3>=1.26",
-        "matplotlib==3.8.4",
+        "matplotlib==3.9.0",
         "langcodes>=3.3",
         "Babel>=2.14.0,<3",
         "PyYAML>=3",
@@ -35,7 +35,7 @@ setup(
         "Pillow==10.3.0",
         "requests>=2.22",
         "matplotlib-label-lines==0.5.1",
-        "geopandas==0.14.3",
+        "geopandas==0.14.4",
         "mapclassify==2.6.1",
     ],
     setup_requires=["flake8"],

{newsworthycharts-1.57.2 → newsworthycharts-1.58.0}/test/test_choropleth_maps.py

@@ -24,6 +24,7 @@ def test_rendering():
     c = ChoroplethMap.init_from(chart_obj, storage=ds)
     c.render("test", "png")
 
+
 def test_map_with_nw_regions():
     container = {}
     ds = DictStorage(container)
@@ -40,9 +41,29 @@ def test_map_with_nw_regions():
             ]
         ],
     }
-    c = ChoroplethMap.init_from(chart_obj, storage=local_storage)
+    c = ChoroplethMap.init_from(chart_obj, storage=ds)
+    c.render("map_with_nw_ids", "png")
+
+
+def test_map_with_nw_regions_and_subsets():
+    container = {}
+    ds = DictStorage(container)
+
+    chart_obj = {
+        "width": 800,
+        "height": 600,
+        "base_map": "se|03-7",
+        "data": [
+            [
+                ("Uppsala kommun", 3),
+                ("Enköpings kommun", 2),
+            ]
+        ],
+    }
+    c = ChoroplethMap.init_from(chart_obj, storage=ds)
     c.render("map_with_nw_ids", "png")
 
+
 def test_invalid_region():
     container = {}
     ds = DictStorage(container)