newsworthycharts 1.57.2__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.2 → newsworthycharts-1.57.3}/README.rst

@@ -167,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**
@@ -211,9 +216,14 @@ 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 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.57.3}/newsworthycharts/__init__.py

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

{newsworthycharts-1.57.2 → 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.2 → 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.2 → 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)