newsworthycharts 1.64.0__py3-none-any.whl → 1.65.0__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/categoricalchart.py

@@ -20,6 +20,10 @@ class CategoricalChart(Chart):
         # Optional: specify a list of colors (for multiple datasets)
         self.colors = None
 
+    @property
+    def values_will_be_stacked(self):
+        return self.stacked
+
     def _add_pie_data(self):
         if len(self.data) > 1:
             raise ValueError("Pie chart takes one data series only.")

newsworthycharts/chart.py

@@ -527,20 +527,21 @@ class Chart(object):
 
             ticks = self.value_axis.get_ticklabels()
             ticks_ = [x for (i, x) in enumerate(ticks) if ticks[i - 1].get_text() != x.get_text()]
+            value_axis = "_y" if self.value_axis == self.ax.yaxis else "_x"
             # remove non integer ticks
             if self.decimals == 0:
-                y = [float(x._y) for x in ticks]
+                y = [float(getattr(x, value_axis)) for x in ticks]
                 if self.units == "percent":
-                    y = [x for x in y if (x * 100).is_integer()]
+                    y = [x for x in y if round(x * 100, 5).is_integer()]
                 else:
-                    y = [x for x in y if x.is_integer()]
+                    y = [x for x in y if round(x, 5).is_integer()]
                 self.value_axis.set_ticks(y)
             # Remove duplicate y ticks (most should be gone as per above)
             elif len(ticks_) == 2 and self.data:
                 # When only two ticks we want them on top and bottom
-                self.value_axis.set_ticks([float(ticks[0]._y), self.data.max_val])
+                self.value_axis.set_ticks([float(getattr(ticks[0], value_axis)), self.data.max_val])
             elif len(ticks_) < len(ticks):
-                y = [float(x._y) for x in ticks_]
+                y = [float(getattr(x, value_axis)) for x in ticks_]
                 self.value_axis.set_ticks(y)
 
             # Force a second tick if we ended up having just one
@@ -549,6 +550,20 @@ class Chart(object):
             if len(ticks_) <= 1 and self.data:
                 self.value_axis.set_ticks([0, self.data.max_val])
 
+            # Special handling for stacked percents, where, we want to fix any rounding errors,
+            # to make sure value max is 100 %, and not something like 100.00000000000001 (which
+            # may cause an extra tick to show up
+            if self.units == "percent" and self.values_will_be_stacked:
+                max_val = max(self.data.stacked_values)
+                diff = abs(1 - max_val)
+                _decimals = self.decimals if self.decimals is not None else 2
+                if diff < (pow(10, -_decimals) / 100):  # 0.01 / 100 for 2 decimals, etc
+                    value_lim = self.ax.get_ylim() if value_axis == "_y" else self.ax.get_xlim()
+                    if value_axis == "_y":
+                        self.ax.set_ylim(value_lim[0], 1)
+                    else:
+                        self.ax.set_xlim(value_lim[0], 1)
+
         for a in self.annotations:
             self._annotate_point(a["text"], a["xy"], a["direction"])
         if self.ylabel is not None:
@@ -793,6 +808,15 @@ class Chart(object):
     def units(self):
         return self._units
 
+    @property
+    def values_will_be_stacked(self):
+        """
+            Are the values from more than one dataseries going to be stacked or grouped together,
+            e.g. a stacked barchart?
+            This is used to to sanitize the value axis, and work around rounding errors.
+        """
+        return False
+
     @units.setter
     def units(self, val: str):
         """ Units, used for number formatting. Note that 'degrees' is designed

newsworthycharts/lib/datalist.py

@@ -184,6 +184,18 @@ class DataSet(MutableSequence):
             self.max_val = max(self.max_val, max(values))
         return v
 
+    @property
+    def values(self):
+        """ Return values from each data serie """
+        return [[to_float(x[1]) for x in s] for s in self.list]
+
+    @property
+    def stacked_values(self):
+        """Returns the sum of all y values in each x """
+        # converts None to np.na for np.sum()
+        values = array(self.values, dtype=float)
+        return np.nansum(values, axis=0).tolist()
+
     def __len__(self):
         return len(self.list)
 

newsworthycharts/serialchart.py

@@ -143,6 +143,10 @@ class SerialChart(Chart):
             return "down"
         return "up"
 
+    @property
+    def values_will_be_stacked(self):
+        return (len(self.data) > 1) and all([t == "bars" for t in self.type])
+
     def _add_data(self):
 
         series = self.data
@@ -150,7 +154,6 @@ class SerialChart(Chart):
         # For backwards compatibility: Convert type = "line" -> type = ["line"]
         if type(self.type) is str:
             self.type = [self.type] * len(series)
-        is_stacked = (len(series) > 1) and all([t == "bars" for t in self.type])
 
         if self.allow_broken_y_axis is None:
             if "bars" in self.type:
@@ -323,7 +326,7 @@ class SerialChart(Chart):
                     hl_color_for_series = self._nwc_style["strong_color"]
                 elif i == 0:
                     base_color_for_series = self._nwc_style["strong_color"]
-                elif is_stacked:
+                elif self.values_will_be_stacked:
                     hl_color_for_series = self._nwc_style["strong_color"]
                     base_color_for_series = self._nwc_style["qualitative_colors"][i]
                 else:
@@ -370,7 +373,7 @@ class SerialChart(Chart):
                 #    bar_kwargs["edgecolor"] = "white"
                 #    bar_kwargs["linewidth"] = 0  # 1
 
-                if is_stacked and i > 0:
+                if self.values_will_be_stacked and i > 0:
                     if self.baseline != 0:
                         raise Exception("Setting a baseline is not supported for stacked bars")
                     # To make stacked bars we need to set bottom value
@@ -545,7 +548,7 @@ class SerialChart(Chart):
             ymax = self.ymax
             padding_top = 0
         else:
-            if is_stacked:
+            if self.values_will_be_stacked:
                 ymax = self.data.stacked_max_val
             else:
                 ymax = self.data.max_val + self.baseline

{newsworthycharts-1.64.0.dist-info → newsworthycharts-1.65.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.64.0
+Version: 1.65.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.64.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.65.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -214,6 +214,10 @@ _ Inherits from Map _
 
 **ProgressChart**
 
+_ Inherits from CategoricalChart _
+
+- `target` = None  # A target value to compare to, often 1 (when using percentages)
+
 **RangePlot**
 
 **ScatterPlot**
@@ -255,6 +259,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.65.0
+
+  - Stacked data with percentages summing to very close to 100 % will now be treated as 100 %, assuming rounding error artifacts
+
+- 1.64.1
+
+  - Fixed assumption about y axis being the value axis in tick cleaning
+  - Fix floating point bug in label handling, causing some integer labels to disappear when decimals=0
+
 - 1.64.0
 
   - Improved handling of value axis in categorical charts

{newsworthycharts-1.64.0.dist-info → newsworthycharts-1.65.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-newsworthycharts/__init__.py,sha256=Ar8KT2Z_t3lWJ367gTYTFtMKii3FmyxKPDhlK3qrz2s,1160
+newsworthycharts/__init__.py,sha256=Tw-zK6IN6hHkpecyNWQX_D5QGNkeEVkRxRzIx6pRIH8,1160
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
-newsworthycharts/categoricalchart.py,sha256=4qzx17QcJX-Xw7COwyL_atIEgeVkNnlgS3B1v4-Q6dQ,15648
-newsworthycharts/chart.py,sha256=5JqEsWZUNefgXyhpznXcV5U1j-IOScsGWQoCijVMo9c,32841
+newsworthycharts/categoricalchart.py,sha256=TySDZf6EfG1fMk7uv2-5aJjjvQRco2YslmH6f05euyk,15729
+newsworthycharts/chart.py,sha256=y-OjOcFYL4YaqgJEdUyqN6sAqk-8a0wOz5vjktRCr6E,34170
 newsworthycharts/choroplethmap.py,sha256=bCLf4kcchp1C2djg5AxcOM8BdbaMj0xg7UHrZsDafhI,8013
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
 newsworthycharts/scatterplot.py,sha256=l2w2JkA_4WzxQG9XG1Pn62IlJOdCMm1VemMiZL0rEfU,4959
 newsworthycharts/seasonalchart.py,sha256=rr55yqJUkaYDR9Ik98jes6574oY1U8t8LwoLE3gClW4,1967
-newsworthycharts/serialchart.py,sha256=WrCWyDDRkXBXSqNyIhoBnm7A5RR2_wlluFPYirq_Snw,27686
+newsworthycharts/serialchart.py,sha256=_TBZiOyU-TtnnkJGbP4yZcTlypdIpbxHK4AjE4Su3k8,27787
 newsworthycharts/storage.py,sha256=myERhlpvXyExXxUByBq9eW1bWkCyfH9SwTZbsWSyy3Q,4301
 newsworthycharts/stripechart.py,sha256=9B6PX2MyLuKNQ8W0OGdKbP0-U32kju0K_NHHwwz_J68,1547
 newsworthycharts/custom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,7 +16,7 @@ newsworthycharts/custom/climate_cars.py,sha256=WyNLgjgRCv_zRrzVuk_BmcigFSzpzudjE
 newsworthycharts/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 newsworthycharts/lib/color_fn.py,sha256=ck65GzTS9oPgHUCnKDwX2z8zlnNyzncw97MmhXwi8z8,1282
 newsworthycharts/lib/colors.py,sha256=U04TDkvoMQkcldRFXfnwyLOTwq1SWW2se-Ad-DNcw9o,485
-newsworthycharts/lib/datalist.py,sha256=Lmb37IXZi9fqrV4qAZRFDtH4ctMDpOqH-ITV62mfarQ,5807
+newsworthycharts/lib/datalist.py,sha256=rO7kA0-waYOLMj4AqcksjPWBmn3q1cPyV0xxEUqkukA,6206
 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
@@ -28,8 +28,8 @@ newsworthycharts/rc/newsworthy,sha256=vbYTav1w3DmB5tpaaV7Xl5q7TQJsc9eou6pLCoWc2v
 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.64.0.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.64.0.dist-info/METADATA,sha256=Bd6gWjBOcSYe5uGZju_Ohtt_lqmkd1I_KOjsTzyFpZs,30226
-newsworthycharts-1.64.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.64.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.64.0.dist-info/RECORD,,
+newsworthycharts-1.65.0.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.65.0.dist-info/METADATA,sha256=5daaEv6MGlSO7H4Z6ELkNTuMMc38LfL-P3OeRVOvM_o,30673
+newsworthycharts-1.65.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.65.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.65.0.dist-info/RECORD,,