newsworthycharts 1.73.0__tar.gz → 1.73.1__tar.gz

{newsworthycharts-1.73.0/newsworthycharts.egg-info → newsworthycharts-1.73.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.73.0
+Version: 1.73.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.73.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.73.1.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,11 @@ Roadmap
 Changelog
 ---------
 
+- 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 → newsworthycharts-1.73.1}/README.rst

@@ -134,6 +134,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
@@ -245,6 +247,11 @@ Roadmap
 Changelog
 ---------
 
+- 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 → newsworthycharts-1.73.1}/newsworthycharts/__init__.py

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

{newsworthycharts-1.73.0 → newsworthycharts-1.73.1}/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-1.73.0 → newsworthycharts-1.73.1}/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-1.73.0 → newsworthycharts-1.73.1}/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,
+                              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,12 @@ def get_best_locator(delta, points, interval=None):
     else:
         # Less than a year:
         if interval in ["monthly", "quarterly"]:
-            if points > 12:
-                return MonthLocator()
-            else:
-                return MonthLocator()
+            locator = AutoDateLocator(maxticks=max_ticks)
+            locator.intervald = {
+                mdates.MONTHLY: [1, 2, 3, 4, 6],  # only allow monthly intervals
+            }
+            return locator
+            # return MonthLocator()
 
         elif interval == "weekly":
             # NB The threshold are not tested thoroughly. Consider adjusting.
@@ -82,7 +86,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)
+                locator.intervald = {
+                    mdates.MONTHLY: [1, 2, 3, 4, 6],  # only allow monthly intervals
+                }
+                return locator
+                # return MonthLocator()
             elif delta.days > 21:
                 return DayLocator(interval=10)
             elif delta.days > 7:

{newsworthycharts-1.73.0 → newsworthycharts-1.73.1/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.73.0
+Version: 1.73.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.73.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.73.1.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,11 @@ Roadmap
 Changelog
 ---------
 
+- 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.