newsworthycharts 1.73.0__py3-none-any.whl → 1.73.2__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/chart.py

@@ -427,7 +427,7 @@ class Chart(object):
             self.ax.xaxis.set_major_formatter(DateFormatter('%Y'))
 
         else:
-            loc = get_best_locator(delta, len(dates), self.interval)
+            loc = get_best_locator(delta, len(dates), self.interval, max_ticks=self.max_ticks)
             self.ax.xaxis.set_major_locator(loc)
             formatter = Formatter(self._language)
 

newsworthycharts/choroplethmap.py

@@ -174,6 +174,11 @@ class ChoroplethMap(Map):
             # We need to add it ourselves
             label_order = self.label_order or color_map.keys()
             for label in reversed(label_order):
+                if label not in color_map:
+                    if str(label) in color_map:
+                        label = str(label)
+                    else:
+                        continue
                 color = color_map[label]
                 # A bit of an hack:
                 # Check if this corresponds to one of our predefined
@@ -229,4 +234,4 @@ class ChoroplethMap(Map):
                 handles=patches,
                 **label_kwargs,
             )
-        #self.ax.get_figure().savefig("TST.png", bbox_inches="tight")
+        # self.ax.get_figure().savefig("TST.png", bbox_inches="tight")

newsworthycharts/lib/locator.py

@@ -1,7 +1,9 @@
 """ Custom locators and related methods
 """
-from matplotlib.dates import (YearLocator, MonthLocator, DayLocator,
-                              WeekdayLocator)
+from matplotlib.dates import (YearLocator, DayLocator, MonthLocator,
+                              WeekdayLocator, AutoDateLocator)
+import matplotlib.dates as mdates
+
 from datetime import datetime
 from dateutil.rrule import MO
 
@@ -36,7 +38,7 @@ def get_year_ticks(start_date, end_date, max_ticks=5):
     return selected_dates
 
 
-def get_best_locator(delta, points, interval=None):
+def get_best_locator(delta, points, interval=None, max_ticks=None):
     """ Get the optimal locator given a time delta and number of points.
     This methods will be much more conservative than Matplotlib's AutoLocator,
     trying to keep the x axis as clean as possible, while still including
@@ -61,10 +63,15 @@ def get_best_locator(delta, points, interval=None):
     else:
         # Less than a year:
         if interval in ["monthly", "quarterly"]:
-            if points > 12:
-                return MonthLocator()
-            else:
+            if points < max_ticks:
                 return MonthLocator()
+            locator = AutoDateLocator(maxticks=max_ticks)
+            _month_intervals = [1, 2, 3, 6]
+            locator.intervald = {
+                mdates.MONTHLY: _month_intervals,  # only allow monthly intervals
+            }
+            return locator
+            # return MonthLocator()
 
         elif interval == "weekly":
             # NB The threshold are not tested thoroughly. Consider adjusting.
@@ -82,7 +89,12 @@ def get_best_locator(delta, points, interval=None):
 
         elif interval == "daily" or interval is None:
             if delta.days > 30:
-                return MonthLocator()
+                locator = AutoDateLocator(maxticks=max_ticks)
+                _month_intervals = [1, 2, 3, 6]
+                locator.intervald = {
+                    mdates.MONTHLY: _month_intervals,  # only allow monthly intervals
+                }
+                return locator
             elif delta.days > 21:
                 return DayLocator(interval=10)
             elif delta.days > 7:

{newsworthycharts-1.73.0.dist-info → newsworthycharts-1.73.2.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.73.0
+Version: 1.73.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.73.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.73.2.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -160,6 +160,8 @@ These settings are available for all chart types:
 - baseline = 0  # The “zero” line. Useful for plotting deviations, e.g. temperatures above/below mean
 - baseline_annotation = None  # A label for the baseline
 - line_width = None  # To override style settings
+- line_marker = "-""  # Matplotlib line marker type.
+- line_marker_size = 3  # Matplotlib line marker size
 - max_ticks = 10  # Maximum number of ticks on the x axis. *Only used with yearly|decennial data* (this is yet to be fixed)
 - ticks = None  # Custom ticks on the x axis, as a list of lists or tuples: `[(2013-01-01, "-13"), (2014-01-01, "-14"), (2015-01-01, "-15")]`
 - ymin = None  # Minimum value on y axis. If None, it will be calculated from data
@@ -271,6 +273,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.73.2
+
+  - Fix month locator bug for very short series
+
+- 1.73.1
+
+  - More leniant label parsing in ChoroplethMap
+  - Make max_ticks work in monthly time series charts. 
+
 - 1.73.0
 
   - Add `type: "markers"` to serial charts. Uses a thin line with a marker at each data point as default.

{newsworthycharts-1.73.0.dist-info → newsworthycharts-1.73.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-newsworthycharts/__init__.py,sha256=YipNMmrmV-BzA_A-apTdyB5as6cLAALqVZdOHDiU-mo,1221
+newsworthycharts/__init__.py,sha256=1o8ucdOR6SaBd8TcxRAOhCRiD_3h1NrjY74gRgJRCO0,1221
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=Vr-0yFms0hEVCeUa3vLt3FYBqpX4xLQ8YGPc4LGQN_A,18368
-newsworthycharts/chart.py,sha256=V7ZyqHG3ER-W1lSmsrV-V-pciij1TFMK4ga2jLfAVJM,35367
-newsworthycharts/choroplethmap.py,sha256=PEhBOw9UD0OyeFRjpCFFoxa2ztT5NeGSYOubo2PaNtA,9210
+newsworthycharts/chart.py,sha256=ebPLEIFAlUrE7N7n0aIqkzayKHHguuF0rVkXDK3OpJU,35393
+newsworthycharts/choroplethmap.py,sha256=dMJYmep3Qt3pC09N3-9dSUxUO6EI3QmLktQRJ-D0bdM,9404
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=EGh96tU10y7Kgu1e83_VWQSeABdjP6V-0VM6VTHDxu4,6089
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
@@ -20,7 +20,7 @@ newsworthycharts/lib/colors.py,sha256=U04TDkvoMQkcldRFXfnwyLOTwq1SWW2se-Ad-DNcw9
 newsworthycharts/lib/datalist.py,sha256=-LdGFE0SOvjLnIRZ6eoJoijDaG3SeUPNIDPBjbm5A2U,6433
 newsworthycharts/lib/formatter.py,sha256=GNH43hE0bC17OgiV8LYH3YUrEhm7OJh9XzfSV4HVtHo,4838
 newsworthycharts/lib/geography.py,sha256=K0_teFmuPJwXX7Py-amJB_1YY5_gL2kBYhz1LrRCyTg,584
-newsworthycharts/lib/locator.py,sha256=rJHdgiA0LASRzdLINhTeU5zOoq1TCMgge4KOBWSagnM,3041
+newsworthycharts/lib/locator.py,sha256=oF4IbIofzDQsrVXM0WpQdLZMByL4B07pYYvuyVNANa0,3600
 newsworthycharts/lib/mimetypes.py,sha256=bL9HtVWbn2Of39LcBt4u4yelkr4bGZiyebq3OfLnfFY,237
 newsworthycharts/lib/utils.py,sha256=zk2hfbZluRcwwxa-N9LocP65HKiHmvgkBw9saAq1lgU,7403
 newsworthycharts/maps/se-4.gpkg,sha256=oWw5j7FPVpI0ig67jNDim8qSn5SG8rcHp0014-uTKZM,290816
@@ -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.73.0.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.73.0.dist-info/METADATA,sha256=lG3pEK6YlZ3XNSdoFjIraPugl-KtxXwKIVwEXd5ZF3M,34390
-newsworthycharts-1.73.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.73.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.73.0.dist-info/RECORD,,
+newsworthycharts-1.73.2.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.73.2.dist-info/METADATA,sha256=1gwuOipenxv4m9FIG1zbWkpiU7oF2pegK3hvAZ1yYng,34671
+newsworthycharts-1.73.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.73.2.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.73.2.dist-info/RECORD,,