Merge branch 'develop' into patch-2

Author: hcpchris

CHANGES.rst

@@ -1,4 +1,13 @@
 
+Release 1.9.3
+=========================================
+
+* **BUGFIX:** Fixed incorrect export serialization of Highcharts Maps for Python map topologies.
+* **BUGFIX:** Added support for value ``'allow'`` to ``DataLabel.overflow`` property. Fixes #198.
+
+----
+
+
 Release 1.9.2
 =========================================
 

highcharts_core/__version__.py

@@ -1 +1 @@
-__version__ = '1.9.2'
+__version__ = '1.9.3'

highcharts_core/metaclasses.py

@@ -323,6 +323,18 @@ def trim_dict(untrimmed: dict,
                     trimmed_value = str(value)
                     if trimmed_value and trimmed_value != 'None':
                         as_dict[key] = trimmed_value
+            # MapData -> dict --> object
+            elif checkers.is_type(value, 'MapData') and to_json and for_export:
+                untrimmed_value = value._to_untrimmed_dict()
+                updated_context = value.__class__.__name__
+                topology = untrimmed_value.get('topology', None)
+                if topology:
+                    trimmed_value = topology.to_dict()
+                else:
+                    trimmed_value = None
+
+                if trimmed_value:
+                    as_dict[key] = trimmed_value
             # HighchartsMeta -> dict --> object
             elif value and hasattr(value, '_to_untrimmed_dict'):
                 untrimmed_value = value._to_untrimmed_dict()

highcharts_core/utility_classes/data_labels.py

@@ -561,8 +561,8 @@ def overflow(self, value):
             self._overflow = None
         else:
             value = value.lower()
-            if value not in ['justify', 'none']:
-                raise errors.HighchartsValueError(f'overflow accepts "justify" or "none".'
+            if value not in ['justify', 'allow', 'none']:
+                raise errors.HighchartsValueError(f'overflow accepts "justify", "allow", or "none".'
                                                   f' Was: {value}')
             self._overflow = value