✨ upgrade to use pyecharts 1.x

Author: chfw

pyecharts_extras/choropleth_map.py

@@ -1,88 +1,56 @@
 # coding=utf-8
-from pyecharts.charts.map import Map
+from pyecharts import options as opts
+from pyecharts.commons.types import Union, Optional, Sequence, Numeric
+from pyecharts.charts import Map
 
 
 class ChoroplethMap(Map):
-    def get_series_options(self, index):
-        return self._option["series"][index]
 
     def add(
         self,
-        name,
-        attr,
-        value,
-        choropleth_legend,
-        maptype="china",
-        is_roam=True,
-        is_map_symbol_show=False,
-        name_map=None,
-        **kwargs
+        series_name: str,
+        data_pair: Sequence,
+        maptype: str = "china",
+        *,
+        choropleth_legend: Sequence = None,
+        **kwds
     ):
-        """
-        it must use piece wise's visual map，otherwise visual_range_color takes
-        no effect. visual_range_text default ['Legend'] and
-        visual_text_color defaults to ['black']
-
-        :param name:
-            series name for tooltip and legend
-        :param attr:
-            attributes
-        :param value:
-            values for corresponding attributes above
-        :param choropleth_legend:
-            custom legend names
-        :param maptype:
-            custom geo shape names.
-        :param is_roam:
-            mouse control, default true, scale & move
-            set 'scale' if zooming, set 'move' if moving
-        :param is_map_symbol_show:
-            remove red map symbol
-        :param name_map:
-            custom choropleth name instead of region name in the map.
-        :param kwargs:
-
-        """
-        _classes = list(set(value))
-        _class_indices = []
-        for __item__ in value:
-            # exchange text value with unique internal index
-            __index__ = _classes.index(__item__)
-            _class_indices.append(__index__)
-
         _piece_specs = []
         _piece_colors = []
-        for __label__ in choropleth_legend:
+        _classes = []
+        for __index, __label in enumerate(choropleth_legend):
             # associate label and color with the
             # unique internal index
-            __index__ = _classes.index(__label__["tag"])
+            _classes.append(__label["tag"])
             _piece_specs.append(
                 {
-                    "min": __index__,
-                    "max": __index__ + 0.1,
-                    "label": __label__["label"],
+                    "min": __index,
+                    "max": __index + 0.1,
+                    "label": __label["label"],
                 }
             )
-            _piece_colors.append(__label__["color"])
+            _piece_colors.append(__label["color"])
+
+        _old_data_pair = list(data_pair)
+        _new_data_pair = []
+        for key, value in _old_data_pair:
+            # exchange text value with unique internal index
+            __index__ = _classes.index(value)
+            _new_data_pair.append([key, __index__])
 
         # dictate the arguments for Map.add()
-        kwargs["is_piecewise"] = True
-        kwargs["is_visualmap"] = True
-        kwargs["visual_range_color"] = _piece_colors
-        if "visual_range_text" not in kwargs:
-            kwargs["visual_range_text"] = ["Legend"]
-        if "visual_text_color" not in kwargs:
-            kwargs["visual_text_color"] = ["black"]
+        custom = opts.VisualMapOpts(
+            is_piecewise=True,
+            range_text=["Legend"],
+            range_color=_piece_colors,
+            pieces=_piece_specs
+        )
+        self.options.update(visualMap=custom)
 
-        Map.add(
-            self,
-            name,
-            attr,
-            _class_indices,
-            maptype=maptype,
-            is_roam=is_roam,
-            is_map_symbol_show=is_map_symbol_show,
-            name_map=name_map,
-            pieces=_piece_specs,
-            **kwargs
+        super(ChoroplethMap, self).add(
+            series_name,
+            _new_data_pair,
+            maptype,
+            **kwds
         )
+        return self