newsworthycharts 1.57.1__tar.gz → 1.57.3__tar.gz

newsworthycharts-1.57.3/PKG-INFO

@@ -0,0 +1,13 @@
+Metadata-Version: 2.1
+Name: newsworthycharts
+Version: 1.57.3
+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.3.tar.gz
+Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
+Author-email: stockholm@jplusplus.org
+License: MIT
+Requires-Python: >=3.9
+License-File: LICENSE.txt
+
+Matplotlib wrapper to create charts and publish them on Amazon S3

newsworthycharts-1.57.1/newsworthycharts.egg-info/PKG-INFO → newsworthycharts-1.57.3/README.rst

@@ -1,16 +1,3 @@
-Metadata-Version: 2.1
-Name: newsworthycharts
-Version: 1.57.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.57.1.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.
@@ -180,8 +167,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**
@@ -224,6 +216,16 @@ Roadmap
 Changelog
 ---------
 
+- 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 categorical vertical charts
+  - improved padding and margin logic for titles/subtitles (taking line spacing into account)
+
 - 1.57.1
 
   - Fix missing outline in choropleth maps

{newsworthycharts-1.57.1 → newsworthycharts-1.57.3}/newsworthycharts/__init__.py

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

{newsworthycharts-1.57.1 → newsworthycharts-1.57.3}/newsworthycharts/categoricalchart.py

@@ -16,7 +16,7 @@ class CategoricalChart(Chart):
         self.stacked = False
         self.legend = True
 
-        # Optional: specify a list of colors (for mulitple datasets)
+        # Optional: specify a list of colors (for multiple datasets)
         self.colors = None
 
     def _add_data(self):
@@ -144,8 +144,8 @@ class CategoricalChart(Chart):
                     kwargs["bottom"] = cum_values[i - 1]
                 self.ax.bar(bar_pos, values, **kwargs)
 
-        margin = 0.02  # above and below first/last bar on horizontal
         if self.bar_orientation == "horizontal":
+            margin = 0.02  # above and below first/last bar on horizontal
             self.ax.set_yticks(bar_pos)
             self.ax.set_yticklabels(categories)
             self.ax.invert_yaxis()
@@ -158,6 +158,7 @@ class CategoricalChart(Chart):
             self._fig.subplots_adjust(left=margin)
 
         elif self.bar_orientation == "vertical":
+            margin = 0.01  # above and below first/last bar on horizontal
             self.ax.margins(margin, 0)
             self.ax.set_xticks(bar_pos)
             self.ax.set_xticklabels(categories)

{newsworthycharts-1.57.1 → newsworthycharts-1.57.3}/newsworthycharts/chart.py

@@ -168,7 +168,7 @@ class Chart(object):
             ismath=False,
         )
         num_lines = len(obj._get_wrapped_text().split("\n"))
-        return (h * num_lines) / float(self._h)
+        return (h * (num_lines * 1.4)) / float(self._h)  # 1.4 is the line spacing used everywhere
 
     def _rel_height(self, obj):
         """ Get the relative height of a chart object to the whole canvas.
@@ -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.985,
+        text = self._fig.suptitle(title_text, wrap=True, x=0, y=0.999,
                                   horizontalalignment="left",
                                   multialignment="left",
                                   fontproperties=self._title_font)
@@ -755,7 +755,7 @@ class Chart(object):
         rel_height = 0
         if self._title_elem:
             rel_height += self._text_rel_height(self._title_elem)
-            # Adds a fixes margin below
+            # Adds a fixed margin below
             rel_height += 30 / self._h
         return rel_height
 
@@ -764,8 +764,8 @@ class Chart(object):
         rel_height = 0
         if self._subtitle_elem:
             rel_height += self._text_rel_height(self._subtitle_elem)
-            # Adds a fixes margin below
-            rel_height += 30 / self._h
+            # Adds a fixed margin below
+            rel_height += 15 / self._h
         return rel_height
 
     @property
@@ -773,7 +773,7 @@ class Chart(object):
         rel_height = 0
         if self._note_elem:
             rel_height += self._text_rel_height(self._note_elem)
-            # Adds a fixes margin below
+            # Adds a fixed margin below
             rel_height += 10 / self._h
         return rel_height
 

{newsworthycharts-1.57.1 → newsworthycharts-1.57.3}/newsworthycharts/choroplethmap.py

@@ -2,7 +2,6 @@
 Simple choropleths for common administrative areas
 """
 from .map import Map
-from shapely.geometry.multipolygon import MultiPolygon
 import geopandas as gpd
 import numpy as np
 import pandas as pd

{newsworthycharts-1.57.1 → newsworthycharts-1.57.3}/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.3/newsworthycharts.egg-info/PKG-INFO

@@ -0,0 +1,13 @@
+Metadata-Version: 2.1
+Name: newsworthycharts
+Version: 1.57.3
+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.3.tar.gz
+Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
+Author-email: stockholm@jplusplus.org
+License: MIT
+Requires-Python: >=3.9
+License-File: LICENSE.txt
+
+Matplotlib wrapper to create charts and publish them on Amazon S3

{newsworthycharts-1.57.1 → newsworthycharts-1.57.3}/setup.py

@@ -14,8 +14,7 @@ setup(
     name="newsworthycharts",
     version=version,
     description="Matplotlib wrapper to create charts and publish them on Amazon S3",
-    long_description=readme(),
-    long_description_content_type='text/x-rst',
+    long_description="Matplotlib wrapper to create charts and publish them on Amazon S3",
     url=repo,
     author="Jens Finnäs and Leo Wallentin, J++ Stockholm",
     author_email="stockholm@jplusplus.org",

{newsworthycharts-1.57.1 → newsworthycharts-1.57.3}/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)