@vtx/map 1.1.36 → 1.1.38

package/lib/VtxMap/BMap/Map.js

@@ -1,42 +1,69 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+
 var _react = _interopRequireDefault(require("react"));
+
 var _reactDom = require("react-dom");
+
 var _MapToolFunction = require("../MapToolFunction");
+
 var _immutable = _interopRequireDefault(require("immutable"));
+
 var _unionBy = _interopRequireDefault(require("lodash/unionBy"));
+
 var _default2 = _interopRequireDefault(require("../../default"));
+
 var _antd = require("antd");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-var Set = _immutable["default"].Set;
-//公共地址配置
+
+var Set = _immutable["default"].Set; //公共地址配置
 
 // 百度地图js文件内做了一些额外的http or https判断
 // 如果协议为Https，我们需要改动全局变量BMAP_PROTOCOL和BMap_loadScriptTime
@@ -44,6 +71,7 @@ if (window.location.protocol === 'https:') {
   window.BMAP_PROTOCOL = "https";
   window.BMap_loadScriptTime = new Date().getTime();
 }
+
 var gisMapConstant = {
   circle: 'BMAP_POINT_SHAPE_CIRCLE',
   //圆形
@@ -68,28 +96,47 @@ var gisMapConstant = {
   bigger: 6,
   //定义点的尺寸为很大，宽高为20px*20px
   huge: 7 //定义点的尺寸为超大，宽高为30px*30px
+
 };
+
 var BaiduMap = /*#__PURE__*/function (_React$Component) {
   _inherits(BaiduMap, _React$Component);
+
   var _super = _createSuper(BaiduMap);
+
   function BaiduMap(props) {
     var _this;
+
     _classCallCheck(this, BaiduMap);
+
     _this = _super.call(this, props);
     _this.GM = new _MapToolFunction.graphicManage(); //初始化 图元管理方法
+
     _this.getPolygonArea = _MapToolFunction.getPolygonArea;
     _this.initPointIndex = 0; //初始化地图时记录点当前位置
+
     _this._cluster = null; //点聚合对象
+
     _this._rangingTool = null; //测距对象
+
     _this._bmar = null; //区域限制对象
+
     _this._drawmanager = null; //图元绘制对象
+
     _this.editGraphicChange = null; //编辑方法回调
+
     _this.editTimeout = null; //圆编辑回调延迟时间对象
+
     _this._boundary = null; //获取行政区域数据的对象
+
     _this.moveToTimer = null; //moveTo时间对象
+
     _this.heatmap = null; //热力图对象
+
     _this.morepoints = []; //海量点数组
+
     _this.movePoints = []; //移动点的动画集合
+
     _this.popupWindow = null;
     _this.state = {
       gis: null,
@@ -120,13 +167,17 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       }
     };
     _this.frameSelectProps = {};
+
     _this.loadMapJs();
+
     return _this;
   }
+
   _createClass(BaiduMap, [{
     key: "loadPlugin",
     value: function loadPlugin() {
       var loadList = [];
+
       if (!window.BMapLib || !window.BMapLib.DistanceTool) {
         loadList.push(new Promise(function (resolve, reject) {
           $.getScript("".concat(_default2["default"].mapServerURL, "/DistanceTool_min.js"), function () {
@@ -134,6 +185,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           });
         }));
       }
+
       if (!window.BMapLib || !window.BMapLib.TrafficControl) {
         loadList.push(new Promise(function (resolve, reject) {
           $.getScript("".concat(_default2["default"].mapServerURL, "/TrafficControl_min.js"), function () {
@@ -141,6 +193,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           });
         }));
       }
+
       if (!window.BMapLib || !window.BMapLib.MarkerClusterer) {
         loadList.push(new Promise(function (resolve, reject) {
           $.getScript("".concat(_default2["default"].mapServerURL, "/MarkerClusterer_min.js"), function () {
@@ -148,6 +201,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           });
         }));
       }
+
       if (!window.BMapLib || !window.BMapLib.AreaRestriction) {
         loadList.push(new Promise(function (resolve, reject) {
           $.getScript("".concat(_default2["default"].mapServerURL, "/AreaRestriction_min.js"), function () {
@@ -155,6 +209,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           });
         }));
       }
+
       if (!window.BMapLib || !window.BMapLib.DrawingManager) {
         loadList.push(new Promise(function (resolve, reject) {
           $.getScript("".concat(_default2["default"].mapServerURL, "/DrawingManager_min.js"), function () {
@@ -162,6 +217,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           });
         }));
       }
+
       if (!window.BMapLib || !window.BMapLib.HeatmapOverlay) {
         loadList.push(new Promise(function (resolve, reject) {
           $.getScript("".concat(_default2["default"].mapServerURL, "/Heatmap_min.js"), function () {
@@ -169,6 +225,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           });
         }));
       }
+
       if (!window.BMapLib || !window.BMapLib.GeoUtils) {
         loadList.push(new Promise(function (resolve, reject) {
           $.getScript("".concat(_default2["default"].mapServerURL, "/GeoUtils_min.js"), function () {
@@ -176,6 +233,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           });
         }));
       }
+
       if (!window.BMapLib || !window.BMapLib.TextIconOverlay) {
         loadList.push(new Promise(function (resolve, reject) {
           $.getScript("".concat(_default2["default"].mapServerURL, "/TextIconOverlay_min.js"), function () {
@@ -183,6 +241,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           });
         }));
       }
+
       if (!window.BMapLib || !window.BMapLib.InfoBox) {
         loadList.push(new Promise(function (resolve, reject) {
           $.getScript("".concat(_default2["default"].mapServerURL, "/InfoBox_min.js"), function () {
@@ -191,6 +250,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         }));
         loadList.push();
       }
+
       loadList.push(new Promise(function (resolve, reject) {
         $.getScript("".concat(_default2["default"].mapServerURL, "/TextIconOverlay_min.js"), function () {
           resolve();
@@ -204,6 +264,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
     key: "loadMapJs",
     value: function loadMapJs() {
       var _this2 = this;
+
       this.loadMapComplete = new Promise(function (resolve, reject) {
         if (window.BMap) {
           resolve(_this2.loadPlugin());
@@ -219,149 +280,167 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           }).appendTo("head");
         }
       });
-    }
-    //初始化地图数据
+    } //初始化地图数据
+
   }, {
     key: "init",
     value: function init() {
-      var t = this;
-      //创建地图
+      var t = this; //创建地图
+
       t.createMap();
       var _this$props = this.props,
-        mapPoints = _this$props.mapPoints,
-        mapLines = _this$props.mapLines,
-        mapPolygons = _this$props.mapPolygons,
-        mapCircles = _this$props.mapCircles,
-        imageOverlays = _this$props.imageOverlays,
-        mapVisiblePoints = _this$props.mapVisiblePoints,
-        mapCluster = _this$props.mapCluster,
-        mapZoomLevel = _this$props.mapZoomLevel,
-        isOpenTrafficInfo = _this$props.isOpenTrafficInfo,
-        mapPointCollection = _this$props.mapPointCollection,
-        areaRestriction = _this$props.areaRestriction,
-        coverageType = _this$props.coverageType;
+          mapPoints = _this$props.mapPoints,
+          mapLines = _this$props.mapLines,
+          mapPolygons = _this$props.mapPolygons,
+          mapCircles = _this$props.mapCircles,
+          imageOverlays = _this$props.imageOverlays,
+          mapVisiblePoints = _this$props.mapVisiblePoints,
+          mapCluster = _this$props.mapCluster,
+          mapZoomLevel = _this$props.mapZoomLevel,
+          isOpenTrafficInfo = _this$props.isOpenTrafficInfo,
+          mapPointCollection = _this$props.mapPointCollection,
+          areaRestriction = _this$props.areaRestriction,
+          coverageType = _this$props.coverageType;
       var _this$props2 = this.props,
-        boundaryName = _this$props2.boundaryName,
-        heatMapData = _this$props2.heatMapData,
-        infoWindowData = _this$props2.infoWindowData,
-        customizedBoundary = _this$props2.customizedBoundary;
+          boundaryName = _this$props2.boundaryName,
+          heatMapData = _this$props2.heatMapData,
+          infoWindowData = _this$props2.infoWindowData,
+          customizedBoundary = _this$props2.customizedBoundary;
       var _this$state = this.state,
-        boundaryInfo = _this$state.boundaryInfo,
-        pointIds = _this$state.pointIds,
-        lineIds = _this$state.lineIds,
-        polygonIds = _this$state.polygonIds,
-        circleIds = _this$state.circleIds;
-      // 切换地图矢量图和卫星图背景
+          boundaryInfo = _this$state.boundaryInfo,
+          pointIds = _this$state.pointIds,
+          lineIds = _this$state.lineIds,
+          polygonIds = _this$state.polygonIds,
+          circleIds = _this$state.circleIds; // 切换地图矢量图和卫星图背景
+
       if (coverageType) {
         t.setMapType(coverageType);
-      }
-      //添加点
+      } //添加点
+
+
       if (mapPoints instanceof Array) {
         t.addPoint(mapPoints);
-      }
-      //添加线
+      } //添加线
+
+
       if (mapLines instanceof Array) {
         t.addLine(mapLines);
-      }
-      //添加面
+      } //添加面
+
+
       if (mapPolygons instanceof Array) {
         t.addPolygon(mapPolygons);
-      }
-      //添加圆
+      } //添加圆
+
+
       if (mapCircles instanceof Array) {
         t.addCircle(mapCircles);
-      }
-      //添加图片图层
+      } //添加图片图层
+
+
       if (imageOverlays instanceof Array) {
         t.imageUrlOverlay(imageOverlays);
-      }
-      //画边界线
+      } //画边界线
+
+
       if (boundaryName instanceof Array && boundaryName.length > 0) {
         t.addBaiduBoundary(boundaryName);
-      }
-      // 画热力图
+      } // 画热力图
+
+
       if (heatMapData) {
         t.heatMapOverlay(heatMapData);
-      }
-      // 打开信息窗体
+      } // 打开信息窗体
+
+
       if (infoWindowData) {
         t.infoWindow(infoWindowData);
       }
+
       if (mapPointCollection instanceof Array) {
         t.addPointCollection(mapPointCollection);
-      }
-      //初始展示的视野范围
+      } //初始展示的视野范围
+
+
       if (mapVisiblePoints) {
         t.setVisiblePoints(mapVisiblePoints);
-      }
-      //设置点聚合
+      } //设置点聚合
+
+
       if (mapCluster instanceof Array) {
         t.cluster(mapCluster);
-      }
-      //开关路况
+      } //开关路况
+
+
       if (isOpenTrafficInfo) {
         t.openTrafficInfo();
       } else {
         t.hideTrafficInfo();
-      }
-      //设置区域限制
+      } //设置区域限制
+
+
       if (areaRestriction && !!areaRestriction[0] && !!areaRestriction[1]) {
         t.setAreaRestriction(areaRestriction);
-      }
-      //是否设置比例尺
+      } //是否设置比例尺
+
+
       if (t.props.showControl) {
         t.showControl();
       }
       /*地图事件*/
       //初始化地图点击事件
-      t.clickMap();
-      //地图拖动之前事件
-      t.dragMapStart();
-      //地图拖动结束后事件
-      t.dragMapEnd();
-      //地图移动之前事件
-      t.moveStart();
-      //地图移动结束后事件
-      t.moveEnd();
-      //地图缩放开始前事件
-      t.zoomStart();
-      //地图缩放结束后事件
+
+
+      t.clickMap(); //地图拖动之前事件
+
+      t.dragMapStart(); //地图拖动结束后事件
+
+      t.dragMapEnd(); //地图移动之前事件
+
+      t.moveStart(); //地图移动结束后事件
+
+      t.moveEnd(); //地图缩放开始前事件
+
+      t.zoomStart(); //地图缩放结束后事件
+
       t.zoomEnd();
       t.setState({
         mapCreated: true
       });
-    }
-    //创建地图
+    } //创建地图
+
   }, {
     key: "createMap",
     value: function createMap() {
       var t = this;
       var _t$props = t.props,
-        mapCenter = _t$props.mapCenter,
-        mapStyle = _t$props.mapStyle,
-        mapId = _t$props.mapId,
-        mapZoomLevel = _t$props.mapZoomLevel,
-        minZoom = _t$props.minZoom,
-        maxZoom = _t$props.maxZoom;
+          mapCenter = _t$props.mapCenter,
+          mapStyle = _t$props.mapStyle,
+          mapId = _t$props.mapId,
+          mapZoomLevel = _t$props.mapZoomLevel,
+          minZoom = _t$props.minZoom,
+          maxZoom = _t$props.maxZoom;
       var options = {
         zoom: mapZoomLevel || 10,
         center: mapCenter || [116.404, 39.915],
         minZoom: minZoom,
         maxZoom: maxZoom
       };
+
       if (window.VtxMap) {
         window.VtxMap[mapId] = null;
       } else {
         window.VtxMap = {};
-      }
-      // 控件位置常量
+      } // 控件位置常量
+
+
       t.AnchorConstant = {
         tr: BMAP_ANCHOR_TOP_RIGHT,
         tl: BMAP_ANCHOR_TOP_LEFT,
         bl: BMAP_ANCHOR_BOTTOM_LEFT,
         br: BMAP_ANCHOR_BOTTOM_RIGHT
-      };
-      // 平移缩放控件大小
+      }; // 平移缩放控件大小
+
       t.NavigationConstant = {
         large: BMAP_NAVIGATION_CONTROL_LARGE,
         small: BMAP_NAVIGATION_CONTROL_SMALL,
@@ -373,73 +452,85 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         minZoom: options.minZoom,
         maxZoom: options.maxZoom
       });
+
       if (mapStyle) {
         if (typeof mapStyle === 'string') {
           t.state.gis.setMapStyle({
             style: mapStyle
           });
         }
+
         if (mapStyle instanceof Array) {
           t.state.gis.setMapStyle({
             styleJson: mapStyle
           });
         }
       }
+
       setTimeout(function () {
         $('#myCanvasElement').parent().children('svg').css({
           'z-index': 1
         });
-      }, 500);
-      // 初始化地图,设置中心点坐标和地图级别
-      map.centerAndZoom(new BMap.Point(parseFloat(options.center[0]), parseFloat(options.center[1])), options.zoom);
-      //添加地图类型控件
+      }, 500); // 初始化地图,设置中心点坐标和地图级别
+
+      map.centerAndZoom(new BMap.Point(parseFloat(options.center[0]), parseFloat(options.center[1])), options.zoom); //添加地图类型控件
+
       if (t.props.satelliteSwitch) {
         t.showMapTypeControl();
-      }
-      //初始化路况控件
+      } //初始化路况控件
+
+
       if (!t._trafficCtrl) {
         t._trafficCtrl = new BMapLib.TrafficControl({
           // 是否显示路况提示面板
           showPanel: false
         });
         map.addControl(t._trafficCtrl);
+
         if (document.getElementById('tcBtn').remove) {
           document.getElementById('tcBtn').remove();
         } else {
           document.getElementById('tcBtn').removeNode();
         }
-      }
-      //开启鼠标滚轮缩放
-      map.enableScrollWheelZoom(true);
-      //初始化获取行政区域数据的对象
+      } //开启鼠标滚轮缩放
+
+
+      map.enableScrollWheelZoom(true); //初始化获取行政区域数据的对象
+
       if (!t._boundary) {
         t._boundary = new BMap.Boundary();
-      }
-      //初始化点聚合对象
+      } //初始化点聚合对象
+
+
       if (!t._cluster) {
         t._cluster = new BMapLib.MarkerClusterer(map, {
           maxZoom: 17
         });
-      }
-      //初始化测距对象
+      } //初始化测距对象
+
+
       if (!t._rangingTool) {
         t._rangingTool = new BMapLib.DistanceTool(map);
-      }
-      //初始化区域限制对象
+      } //初始化区域限制对象
+
+
       if (!t._bmar) {
         t._bmar = new BMapLib.AreaRestriction();
-      }
-      //初始化图元绘制对象
+      } //初始化图元绘制对象
+
+
       if (!t._drawmanager) {
-        t._drawmanager = new BMapLib.DrawingManager(map);
-        //监听绘制结束事件
+        t._drawmanager = new BMapLib.DrawingManager(map); //监听绘制结束事件
+
         t._drawmanager.addEventListener('overlaycomplete', function (e) {
           var _t$frameSelectProps$b;
+
           if (e.label) {
             t.state.gis.removeOverlay(e.label);
           }
-          var drawExtData = e.extData;
-          //保存绘制图元的id便于后期比对
+
+          var drawExtData = e.extData; //保存绘制图元的id便于后期比对
+
           t.state.drawIds[drawExtData.type].push(drawExtData.id);
           var backobj = {
             id: drawExtData.id,
@@ -449,51 +540,55 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             geometry: {
               type: drawExtData.type == 'rectangle' ? 'polygon' : drawExtData.type
             }
-          };
-          //点击事件
+          }; //点击事件
+
           e.overlay.addEventListener('click', function (e) {
             t.clickGraphic(drawExtData.id, e);
-          });
-          //鼠标移入事件
+          }); //鼠标移入事件
+
           e.overlay.addEventListener('mouseover', function (e) {
             t.mouseOverGraphic(drawExtData.id, e);
-          });
-          //鼠标移出事件
+          }); //鼠标移出事件
+
           e.overlay.addEventListener('mouseout', function (e) {
             t.mouseOutGraphic(drawExtData.id, e);
-          });
-          //缓存绘制的图元信息
-          t.GM.setGraphic(drawExtData.id, e.overlay);
+          }); //缓存绘制的图元信息
+
+          t.GM.setGraphic(drawExtData.id, e.overlay); //区别点和圆的经纬度数据处理
 
-          //区别点和圆的经纬度数据处理
           var _t$dealData = t.dealData(e.overlay),
-            lnglatAry = _t$dealData.lnglatAry,
-            _extent = _t$dealData._extent,
-            path = _t$dealData.path;
-          //处理返回数据
+              lnglatAry = _t$dealData.lnglatAry,
+              _extent = _t$dealData._extent,
+              path = _t$dealData.path; //处理返回数据
+
+
           switch (drawExtData.type) {
             case 'point':
               backobj.geometry.x = e.overlay.getPosition().lng;
               backobj.geometry.y = e.overlay.getPosition().lat;
               break;
+
             case 'polyline':
               backobj.distance = e.calculate;
               backobj.lnglatAry = lnglatAry;
               backobj.geometry.paths = path;
               backobj.geometry._extent = _extent;
               break;
+
             case 'polygon':
               backobj.area = e.calculate;
               backobj.lnglatAry = lnglatAry;
               backobj.geometry.rings = path;
               backobj.geometry._extent = _extent;
               break;
+
             case 'rectangle':
               backobj.area = e.calculate;
               backobj.lnglatAry = lnglatAry;
               backobj.geometry.rings = path;
               backobj.geometry._extent = _extent;
               break;
+
             case 'circle':
               backobj.geometry.x = e.overlay.getCenter().lng;
               backobj.geometry.y = e.overlay.getCenter().lat;
@@ -501,16 +596,21 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
               backobj.area = e.calculate;
               break;
           }
+
           t.GM.setGraphicParam(drawExtData.id, backobj);
+
           t._drawmanager.close();
+
           if ('drawEnd' in t.props) {
             t.props.drawEnd(backobj);
           }
+
           if (((_t$frameSelectProps$b = t.frameSelectProps[backobj.id]) === null || _t$frameSelectProps$b === void 0 ? void 0 : _t$frameSelectProps$b.callback) instanceof Function) {
             t.frameSelectProps[backobj.id].callback(backobj);
           }
         });
       }
+
       t.initPropsForUser();
     }
     /* 
@@ -520,6 +620,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             BMAP_SATELLITE_MAP 单卫星图  (暂定不用)
             BMAP_HYBRID_MAP 卫星路况图
     */
+
   }, {
     key: "setMapType",
     value: function setMapType(type) {
@@ -527,61 +628,69 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         case 'sl':
           this.state.gis.setMapType(BMAP_NORMAL_MAP);
           break;
+
         case 'wx':
           this.state.gis.setMapType(BMAP_HYBRID_MAP);
           break;
       }
-    }
-    //增加图片图层
+    } //增加图片图层
+
   }, {
     key: "imageUrlOverlay",
     value: function imageUrlOverlay(imageAry) {
       var t = this;
       imageAry.map(function (item, index) {
         var sw = item.sw,
-          ne = item.ne,
-          url = item.url,
-          opacity = item.opacity;
+            ne = item.ne,
+            url = item.url,
+            opacity = item.opacity;
+
         if (!url) {
           console.warn("\u56FE\u7247\u56FE\u5C42url\u6570\u636E\u9519\u8BEF");
           return false;
         }
+
         if (sw && ne && Array.isArray(sw) && Array.isArray(ne) && sw[0] && sw[1] && ne[0] && ne[1]) {
           var swp = new BMap.Point(sw[0], sw[1]),
-            nep = new BMap.Point(ne[0], ne[1]),
-            option = {
-              opacity: opacity || 1,
-              displayOnMinLevel: item.displayOnMinLevel || 3,
-              displayOnMaxLevel: item.displayOnMaxLevel || 19,
-              imageURL: url
-            },
-            swnep = new BMap.Bounds(swp, nep),
-            imageUrlOverlay = new BMap.GroundOverlay(swnep, option);
+              nep = new BMap.Point(ne[0], ne[1]),
+              option = {
+            opacity: opacity || 1,
+            displayOnMinLevel: item.displayOnMinLevel || 3,
+            displayOnMaxLevel: item.displayOnMaxLevel || 19,
+            imageURL: url
+          },
+              swnep = new BMap.Bounds(swp, nep),
+              imageUrlOverlay = new BMap.GroundOverlay(swnep, option);
           t.state.gis.addOverlay(imageUrlOverlay);
         } else {
           console.warn("\u533A\u57DF\u7ECF\u7EAC\u5EA6sw/ne\u6570\u636E\u9519\u8BEF");
           return false;
         }
       });
-    }
-    //新增点位
+    } //新增点位
+
   }, {
     key: "addPoint",
     value: function addPoint(mapPoints, type) {
       var _this3 = this;
+
       var t = this;
+
       var psids = _toConsumableArray(t.state.pointIds);
+
       mapPoints.map(function (item, index) {
         //如果id重复,直接跳过不执行.
         if (_this3.GM.isRepetition(item.id)) {
           console.warn("\u52A0\u70B9id: ".concat(item.id, " \u91CD\u590D"));
           return false;
-        }
-        //点位数据不符合,直接跳过
+        } //点位数据不符合,直接跳过
+
+
         if (!item.longitude || !item.latitude) {
           console.warn("\u70B9 \u7ECF\u7EAC\u5EA6 \u6570\u636E\u9519\u8BEF");
           return false;
         }
+
         var cg = {
           width: 30,
           height: 30,
@@ -595,6 +704,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           markerContentY: -30,
           deg: 0
         };
+
         if (item.markerContent) {
           cg = _objectSpread(_objectSpread({}, cg), {}, {
             markerContentX: 0,
@@ -602,13 +712,16 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             width: 100,
             height: 30
           });
-        }
-        //初始化默认数据
+        } //初始化默认数据
+
+
         if (item.config) {
           cg = _objectSpread(_objectSpread({}, cg), item.config);
         }
+
         var position = new BMap.Point(item.longitude, item.latitude);
         var marker = null;
+
         if (item.markerContent) {
           /*自定义html加点
            用Label来实现,无法再添加label(高德有判断,实现不同)*/
@@ -622,9 +735,8 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           markerOption = _objectSpread(_objectSpread({}, markerOption), {}, {
             icon: icon
           });
-          marker = new BMap.Marker(position, markerOption);
+          marker = new BMap.Marker(position, markerOption); //覆盖物参数
 
-          //覆盖物参数
           var markerLOption = {
             offset: new BMap.Size(0, 0)
           };
@@ -641,22 +753,26 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             offset: new BMap.Size(cg.markerContentX + cg.width / 2, cg.markerContentY + cg.height / 2),
             icon: null
           };
+
           var _icon = new BMap.Icon(item.url || "".concat(_default2["default"].mapServerURL, "/images/defaultMarker.png"), new BMap.Size(cg.width, cg.height));
+
           _icon.setImageSize(new BMap.Size(cg.width, cg.height));
+
           _markerOption = _objectSpread(_objectSpread({}, _markerOption), {}, {
             icon: _icon
           });
-          marker = new BMap.Marker(position, _markerOption);
-          //设置选择角度
-          marker.setRotation(cg.deg);
-          //添加label
+          marker = new BMap.Marker(position, _markerOption); //设置选择角度
+
+          marker.setRotation(cg.deg); //添加label
+
           if (item.canShowLabel && cg.labelContent) {
             //label默认样式
-            var labelClass = 'label-content';
-            //接受label自定义样式
+            var labelClass = 'label-content'; //接受label自定义样式
+
             if (item.labelClass) {
               labelClass = item.labelClass.split(',').join(' ');
             }
+
             var markerLabel = new BMap.Label("<div class='" + labelClass + "' style=\"margin-left: 0;\">" + cg.labelContent + "</div>", {
               offset: new BMap.Size(cg.labelPixelX, cg.labelPixelY)
             });
@@ -667,31 +783,35 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             marker.setLabel(markerLabel);
           }
         }
+
         if (cg.zIndex || cg.zIndex === 0) {
           marker.setZIndex(cg.zIndex);
-        }
-        //添加点到地图
+        } //添加点到地图
+
+
         t.state.gis.addOverlay(marker);
+
         if (!item.markerContent && cg.BAnimationType == 0) {
           marker.setAnimation(BMAP_ANIMATION_BOUNCE);
         } else if (!item.markerContent && cg.BAnimationType == 1) {
           marker.setAnimation(BMAP_ANIMATION_DROP);
-        }
-        //点击事件
+        } //点击事件
+
+
         marker.addEventListener('click', function (e) {
           t.clickGraphic(item.id, e);
-        });
-        //鼠标移入事件
+        }); //鼠标移入事件
+
         marker.addEventListener('mouseover', function (e) {
           t.mouseOverGraphic(item.id, e);
-        });
-        //鼠标移出事件
+        }); //鼠标移出事件
+
         marker.addEventListener('mouseout', function (e) {
           t.mouseOutGraphic(item.id, e);
-        });
-        //缓存所有点的id
-        psids.push(item.id);
-        //缓存当前点的图元对象和基本数据
+        }); //缓存所有点的id
+
+        psids.push(item.id); //缓存当前点的图元对象和基本数据
+
         t.GM.setGraphic(item.id, marker).setGraphicParam(item.id, {
           attributes: _objectSpread(_objectSpread({}, item), {}, {
             other: item
@@ -704,6 +824,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           }
         });
       });
+
       if (type !== 'defined') {
         //所有点缓存在state中
         // t.setState({
@@ -711,14 +832,15 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         // });
         t.state.pointIds = psids;
       }
-    }
-    //更新点位
+    } //更新点位
+
   }, {
     key: "updatePoint",
     value: function updatePoint(mapPoints) {
       var _this4 = this;
-      var t = this;
-      // let dpoints = [],apoints = [];
+
+      var t = this; // let dpoints = [],apoints = [];
+
       mapPoints.map(function (item, index) {
         //判断图元是否存在.
         if (_this4.GM.isRepetition(item.id)) {
@@ -726,8 +848,9 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           if (!item.longitude || !item.latitude) {
             console.warn("\u70B9 \u7ECF\u7EAC\u5EA6 \u6570\u636E\u9519\u8BEF");
             return false;
-          }
-          //获取原有的图元
+          } //获取原有的图元
+
+
           var gc = t.GM.getGraphic(item.id);
           var cg = {
             width: 30,
@@ -742,6 +865,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             markerContentY: -30,
             deg: 0
           };
+
           if (item.markerContent) {
             cg = _objectSpread(_objectSpread({}, cg), {}, {
               markerContentX: 0,
@@ -750,14 +874,17 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
               height: 30
             });
           }
+
           if (item.config) {
             cg = _objectSpread(_objectSpread({}, cg), item.config);
           }
+
           if (item.markerContent) {
             gc.setOffset(new BMap.Size(cg.markerContentX + cg.width / 2, cg.markerContentY + cg.height / 2));
             var icon = new BMap.Icon("".concat(_default2["default"].mapServerURL, "/images/touming.png"), new BMap.Size(cg.width, cg.height));
             icon.setImageSize(new BMap.Size(cg.width, cg.height));
             gc.setIcon(icon);
+
             if (!!gc.getLabel()) {
               gc.getLabel().setContent(item.markerContent);
               gc.getLabel().setOffset(new BMap.Size(0, 0));
@@ -775,25 +902,29 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             }
           } else {
             cg.width = cg.width || gc.getIcon().size.width;
-            cg.height = cg.height || gc.getIcon().size.height;
-            //未改变方式的点 直接修改数据
+            cg.height = cg.height || gc.getIcon().size.height; //未改变方式的点 直接修改数据
+
             var _icon2 = new BMap.Icon(item.url || "".concat(_default2["default"].mapServerURL, "/images/defaultMarker.png"), new BMap.Size(cg.width, cg.height));
+
             _icon2.setImageSize(new BMap.Size(cg.width, cg.height));
+
             gc.setIcon(_icon2);
-            gc.setOffset(new BMap.Size((cg.markerContentX || -15) + cg.width / 2, (cg.markerContentY || -30) + cg.height / 2));
-            //修改角度
-            gc.setRotation(cg.deg || 0);
-            //添加label
+            gc.setOffset(new BMap.Size((cg.markerContentX || -15) + cg.width / 2, (cg.markerContentY || -30) + cg.height / 2)); //修改角度
+
+            gc.setRotation(cg.deg || 0); //添加label
+
             if (item.canShowLabel && cg.labelContent) {
               var markerLabel = gc.getLabel(),
-                //label默认样式
-                labelClass = 'label-content';
-              //接受label自定义样式
+                  //label默认样式
+              labelClass = 'label-content'; //接受label自定义样式
+
               if (item.labelClass) {
                 labelClass = item.labelClass.split(',').join(' ');
               }
+
               var labelContent = "<div class='" + labelClass + "' style=\"margin-left: 0;\">" + cg.labelContent + "</div>",
-                labelOffset = new BMap.Size(cg.labelPixelX, cg.labelPixelY);
+                  labelOffset = new BMap.Size(cg.labelPixelX, cg.labelPixelY);
+
               if (markerLabel) {
                 markerLabel.setContent(labelContent);
                 markerLabel.setOffset(labelOffset);
@@ -812,6 +943,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
                 gc.getLabel().setContent('');
               }
             }
+
             if (cg.BAnimationType == 0) {
               gc.setAnimation(BMAP_ANIMATION_BOUNCE);
             } else if (cg.BAnimationType == 1) {
@@ -820,17 +952,21 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
               gc.setAnimation(null);
             }
             /*moveTo*/
-          }
-          //动画效果会延迟执行经纬度的切换
+
+          } //动画效果会延迟执行经纬度的切换
+
+
           if (cg.isAnimation) {
             t.moveTo(item.id, [item.longitude, item.latitude], cg.animationDelay, cg.autoRotation, item.url, item.urlleft);
           } else {
             //修改经纬度
             gc.setPosition(new BMap.Point(item.longitude, item.latitude));
           }
+
           if (cg.zIndex || cg.zIndex === 0) {
             gc.setZIndex(cg.zIndex);
           }
+
           t.GM.setGraphicParam(item.id, {
             attributes: _objectSpread(_objectSpread({}, item), {}, {
               other: item
@@ -847,8 +983,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           return false;
         }
       });
-      t.moveAnimation();
-      // //删除改变了加载方式的点
+      t.moveAnimation(); // //删除改变了加载方式的点
       // dpoints.map((item,index)=>{
       //     t.removeGraphic(item,'point');
       // });
@@ -858,71 +993,78 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       //         t.addPoint(apoints);
       //     },100);
       // }
-    }
-    //添加线
+    } //添加线
+
   }, {
     key: "addLine",
     value: function addLine(mapLines, type) {
       var t = this;
-      var lsids = _toConsumableArray(t.state.lineIds);
-      //遍历添加线(图元)
+
+      var lsids = _toConsumableArray(t.state.lineIds); //遍历添加线(图元)
+
+
       mapLines.map(function (item, index) {
         //如果id重复,直接跳过不执行.
         if (t.GM.isRepetition(item.id)) {
           console.warn("\u591A\u6298\u7EBFid: ".concat(item.id, " \u91CD\u590D"));
           return false;
-        }
-        //多折线点位数据不符合,直接跳过
+        } //多折线点位数据不符合,直接跳过
+
+
         if (!(item.paths && item.paths.length >= 2)) {
           console.warn("\u591A\u6298\u7EBFpaths\u6570\u636E\u9519\u8BEF");
           return false;
-        }
-        //初始化默认参数
+        } //初始化默认参数
+
+
         var cg = {
           color: '#277ffa',
           pellucidity: 0.9,
           lineWidth: 5,
           lineType: 'solid',
           isHidden: false
-        };
-        //合并参数
+        }; //合并参数
+
         if (item.config) {
           cg = _objectSpread(_objectSpread({}, cg), item.config);
-        }
-        //处理线的点数组
+        } //处理线的点数组
+
+
         var linePath = item.paths.map(function (item, index) {
-            return new BMap.Point(item[0], item[1]);
-          }),
-          //处理线的参数
-          lineOption = {
-            strokeColor: cg.color,
-            // 线颜色
-            strokeWeight: cg.lineWidth,
-            // 线宽
-            strokeOpacity: cg.pellucidity,
-            // 线透明度
-            strokeStyle: cg.lineType // 线样式
-          };
-        //创建线对象
-        var line = new BMap.Polyline(linePath, lineOption);
-        //判断线显示和隐藏
+          return new BMap.Point(item[0], item[1]);
+        }),
+            //处理线的参数
+        lineOption = {
+          strokeColor: cg.color,
+          // 线颜色
+          strokeWeight: cg.lineWidth,
+          // 线宽
+          strokeOpacity: cg.pellucidity,
+          // 线透明度
+          strokeStyle: cg.lineType // 线样式
+
+        }; //创建线对象
+
+        var line = new BMap.Polyline(linePath, lineOption); //判断线显示和隐藏
+
         if (cg.isHidden) {
           line.hide();
         } else {
           line.show();
         }
-        lsids.push(item.id);
-        //添加线至地图
-        t.state.gis.addOverlay(line);
-        //点击事件
+
+        lsids.push(item.id); //添加线至地图
+
+        t.state.gis.addOverlay(line); //点击事件
+
         line.addEventListener('click', function (e) {
           t.clickGraphic(item.id, e);
-        });
-        //鼠标移入事件
+        }); //鼠标移入事件
+
         line.addEventListener('mouseover', function (e) {
           t.mouseOverGraphic(item.id, e);
-        });
-        //鼠标移出事件
+        }); //鼠标移出事件
+
         line.addEventListener('mouseout', function (e) {
           t.mouseOutGraphic(item.id, e);
         });
@@ -938,19 +1080,19 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           }
         });
       });
+
       if (type !== 'defined') {
-        t.state.lineIds = lsids;
-        // t.setState({
+        t.state.lineIds = lsids; // t.setState({
         //     lineIds: lsids
         // });
       }
-    }
-    //更新线
+    } //更新线
+
   }, {
     key: "updateLine",
     value: function updateLine(mapLines) {
-      var t = this;
-      //遍历添加线(图元)
+      var t = this; //遍历添加线(图元)
+
       mapLines.map(function (item, index) {
         //判断图元是否存在.
         if (t.GM.isRepetition(item.id)) {
@@ -963,8 +1105,9 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           console.warn("\u66F4\u65B0\u7684\u591A\u6298\u7EBFid\u4E0D\u5B58\u5728!");
           return false;
         }
-        var gc = t.GM.getGraphic(item.id);
-        //初始化默认参数
+
+        var gc = t.GM.getGraphic(item.id); //初始化默认参数
+
         var cg = {
           color: '#277ffa',
           pellucidity: 0.9,
@@ -972,31 +1115,33 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           lineType: 'solid',
           //'solid'  'dashed'
           isHidden: false
-        };
-        //合并参数
+        }; //合并参数
+
         if (item.config) {
           cg = _objectSpread(_objectSpread({}, cg), item.config);
-        }
-        //处理线的点数组
+        } //处理线的点数组
+
+
         var linePath = item.paths.map(function (item, index) {
           return new BMap.Point(item[0], item[1]);
-        });
-        //修改线点位数据
-        gc.setPath(linePath);
-        //修改线颜色
-        gc.setStrokeColor(cg.color);
-        //修改透明度
-        gc.setStrokeOpacity(cg.pellucidity);
-        //修改线宽度
-        gc.setStrokeWeight(cg.lineWidth);
-        //修改线的类型
-        gc.setStrokeStyle(cg.lineType);
-        //判断线显示和隐藏
+        }); //修改线点位数据
+
+        gc.setPath(linePath); //修改线颜色
+
+        gc.setStrokeColor(cg.color); //修改透明度
+
+        gc.setStrokeOpacity(cg.pellucidity); //修改线宽度
+
+        gc.setStrokeWeight(cg.lineWidth); //修改线的类型
+
+        gc.setStrokeStyle(cg.lineType); //判断线显示和隐藏
+
         if (cg.isHidden) {
           gc.hide();
         } else {
           gc.show();
         }
+
         t.GM.setGraphicParam(item.id, {
           attributes: _objectSpread(_objectSpread({}, item), {}, {
             paths: item.paths,
@@ -1009,69 +1154,75 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           }
         });
       });
-    }
-    //添加面
+    } //添加面
+
   }, {
     key: "addPolygon",
     value: function addPolygon(mapPolygons) {
       var t = this;
-      var pgsids = _toConsumableArray(t.state.polygonIds);
-      //遍历添加面(图元)
+
+      var pgsids = _toConsumableArray(t.state.polygonIds); //遍历添加面(图元)
+
+
       mapPolygons.map(function (item, index) {
         //如果id重复,直接跳过不执行.
         if (t.GM.isRepetition(item.id)) {
           console.warn("\u591A\u8FB9\u5F62id: ".concat(item.id, " \u91CD\u590D"));
           return false;
-        }
-        //多边形点位数据不符合,直接跳过
+        } //多边形点位数据不符合,直接跳过
+
+
         if (!(item.rings && item.rings.length >= 3)) {
           console.warn("\u591A\u8FB9\u5F62rings\u6570\u636E\u9519\u8BEF");
           return false;
-        }
-        //初始化参数
+        } //初始化参数
+
+
         var cg = {
           lineType: 'solid',
           lineWidth: 5,
           lineColor: '#277ffa',
           lineOpacity: 1,
           color: '#fff',
-          pellucidity: 0.5
-          // isHidden: false  //后期需要再加
+          pellucidity: 0.5 // isHidden: false  //后期需要再加
+
         };
+
         if (item.config) {
           cg = _objectSpread(_objectSpread({}, cg), item.config);
-        }
-        //面的参数
+        } //面的参数
+
+
         var polygonOption = {
-            strokeColor: cg.lineColor,
-            strokeOpacity: cg.lineOpacity,
-            strokeWeight: cg.lineWidth,
-            strokeStyle: cg.lineType,
-            fillColor: cg.color,
-            fillOpacity: cg.pellucidity
-          },
-          polygonPath = item.rings.map(function (item, index) {
-            return new BMap.Point(item[0], item[1]);
-          });
-        //创建面对象
-        var polygon = new BMap.Polygon(polygonPath, polygonOption);
-        //添加面至地图
-        t.state.gis.addOverlay(polygon);
-        //点击事件
+          strokeColor: cg.lineColor,
+          strokeOpacity: cg.lineOpacity,
+          strokeWeight: cg.lineWidth,
+          strokeStyle: cg.lineType,
+          fillColor: cg.color,
+          fillOpacity: cg.pellucidity
+        },
+            polygonPath = item.rings.map(function (item, index) {
+          return new BMap.Point(item[0], item[1]);
+        }); //创建面对象
+
+        var polygon = new BMap.Polygon(polygonPath, polygonOption); //添加面至地图
+
+        t.state.gis.addOverlay(polygon); //点击事件
+
         polygon.addEventListener('click', function (e) {
           t.clickGraphic(item.id, e);
-        });
-        //鼠标移入事件
+        }); //鼠标移入事件
+
         polygon.addEventListener('mouseover', function (e) {
           t.mouseOverGraphic(item.id, e);
-        });
-        //鼠标移出事件
+        }); //鼠标移出事件
+
         polygon.addEventListener('mouseout', function (e) {
           t.mouseOutGraphic(item.id, e);
-        });
-        //缓存面id
-        pgsids.push(item.id);
-        //缓存面图元对象和对于传入数据
+        }); //缓存面id
+
+        pgsids.push(item.id); //缓存面图元对象和对于传入数据
+
         t.GM.setGraphic(item.id, polygon).setGraphicParam(item.id, {
           attributes: _objectSpread(_objectSpread({}, item), {}, {
             rings: item.rings,
@@ -1084,12 +1235,11 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           }
         });
       });
-      t.state.polygonIds = pgsids;
-      // t.setState({
+      t.state.polygonIds = pgsids; // t.setState({
       //     polygonIds: pgsids
       // });
-    }
-    //更新面
+    } //更新面
+
   }, {
     key: "updatePolygon",
     value: function updatePolygon(mapPolygons) {
@@ -1101,38 +1251,41 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           if (!(item.rings && item.rings.length >= 3)) {
             console.warn("\u591A\u8FB9\u5F62rings\u6570\u636E\u9519\u8BEF");
             return false;
-          }
-          //获取原有的图元
-          var gc = t.GM.getGraphic(item.id);
-          //初始化参数
+          } //获取原有的图元
+
+
+          var gc = t.GM.getGraphic(item.id); //初始化参数
+
           var cg = {
             lineType: 'solid',
             lineWidth: 5,
             lineColor: '#277ffa',
             lineOpacity: 1,
             color: '#fff',
-            pellucidity: 0.5
-            // isHidden: false  //后期需要再加
+            pellucidity: 0.5 // isHidden: false  //后期需要再加
+
           };
+
           if (item.config) {
             cg = _objectSpread(_objectSpread({}, cg), item.config);
           }
+
           var polygonPath = item.rings.map(function (item, index) {
             return new BMap.Point(item[0], item[1]);
-          });
-          //更新经纬度
-          gc.setPath(polygonPath);
-          //更新边框线颜色
-          gc.setStrokeColor(cg.lineColor);
-          //更新填充色
-          gc.setFillColor(cg.color);
-          //更新变线透明度
-          gc.setStrokeOpacity(cg.lineOpacity);
-          //更新填充色透明度
-          gc.setFillOpacity(cg.pellucidity);
-          //更新边线宽度
-          gc.setStrokeWeight(cg.lineWidth);
-          //更新边线类型
+          }); //更新经纬度
+
+          gc.setPath(polygonPath); //更新边框线颜色
+
+          gc.setStrokeColor(cg.lineColor); //更新填充色
+
+          gc.setFillColor(cg.color); //更新变线透明度
+
+          gc.setStrokeOpacity(cg.lineOpacity); //更新填充色透明度
+
+          gc.setFillOpacity(cg.pellucidity); //更新边线宽度
+
+          gc.setStrokeWeight(cg.lineWidth); //更新边线类型
+
           gc.setStrokeStyle(cg.lineType);
           t.GM.setGraphicParam(item.id, {
             attributes: _objectSpread(_objectSpread({}, item), {}, {
@@ -1150,64 +1303,70 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           return false;
         }
       });
-    }
-    //添加圆  circle
+    } //添加圆  circle
+
   }, {
     key: "addCircle",
     value: function addCircle(mapCircles) {
       var t = this;
+
       var ccsids = _toConsumableArray(t.state.circleIds);
+
       mapCircles.map(function (item, index) {
         //如果id重复,直接跳过不执行.
         if (t.GM.isRepetition(item.id)) {
           console.warn("\u5706id: ".concat(item.id, " \u91CD\u590D"));
           return false;
-        }
-        //圆 点位数据不符合,直接跳过
+        } //圆 点位数据不符合,直接跳过
+
+
         if (!item.longitude || !item.latitude) {
           console.warn("\u5706 \u7ECF\u7EAC\u5EA6 \u6570\u636E\u9519\u8BEF");
           return false;
         }
+
         var cg = {
           lineType: 'solid',
           lineWidth: 5,
           lineColor: '#277ffa',
           lineOpacity: 1,
           color: '#fff',
-          pellucidity: 0.5
-          // isHidden: false  //后期需要在加
+          pellucidity: 0.5 // isHidden: false  //后期需要在加
+
         };
+
         if (item.config) {
           cg = _objectSpread(_objectSpread({}, cg), item.config);
-        }
-        //初始化配置数据
+        } //初始化配置数据
+
+
         var circleOption = {
-            strokeColor: cg.lineColor,
-            strokeOpacity: cg.lineOpacity,
-            strokeWeight: cg.lineWidth,
-            strokeStyle: cg.lineType,
-            fillColor: cg.color,
-            fillOpacity: cg.pellucidity
-          },
-          centerPoint = new BMap.Point(item.longitude, item.latitude);
-        //创建圆图元实例
-        var circle = new BMap.Circle(centerPoint, item.radius, circleOption);
-        //添加圆至地图
-        t.state.gis.addOverlay(circle);
-        //点击事件
+          strokeColor: cg.lineColor,
+          strokeOpacity: cg.lineOpacity,
+          strokeWeight: cg.lineWidth,
+          strokeStyle: cg.lineType,
+          fillColor: cg.color,
+          fillOpacity: cg.pellucidity
+        },
+            centerPoint = new BMap.Point(item.longitude, item.latitude); //创建圆图元实例
+
+        var circle = new BMap.Circle(centerPoint, item.radius, circleOption); //添加圆至地图
+
+        t.state.gis.addOverlay(circle); //点击事件
+
         circle.addEventListener('click', function (e) {
           t.clickGraphic(item.id, e);
-        });
-        //鼠标移入事件
+        }); //鼠标移入事件
+
         circle.addEventListener('mouseover', function (e) {
           t.mouseOverGraphic(item.id, e);
-        });
-        //鼠标移出事件
+        }); //鼠标移出事件
+
         circle.addEventListener('mouseout', function (e) {
           t.mouseOutGraphic(item.id, e);
         });
-        ccsids.push(item.id);
-        //缓存数据
+        ccsids.push(item.id); //缓存数据
+
         t.GM.setGraphic(item.id, circle).setGraphicParam(item.id, {
           attributes: _objectSpread(_objectSpread({}, item), {}, {
             other: item
@@ -1221,12 +1380,11 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           }
         });
       });
-      t.state.circleIds = ccsids;
-      // t.setState({
+      t.state.circleIds = ccsids; // t.setState({
       //     circleIds: ccsids
       // });
-    }
-    //更新圆
+    } //更新圆
+
   }, {
     key: "updateCircle",
     value: function updateCircle(mapCircles) {
@@ -1238,40 +1396,43 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           if (!item.longitude || !item.latitude) {
             console.warn("\u5706 \u7ECF\u7EAC\u5EA6 \u6570\u636E\u9519\u8BEF");
             return false;
-          }
-          //获取原有的图元
-          var gc = t.GM.getGraphic(item.id);
-          //获取原有的面属性,转换key值
+          } //获取原有的图元
+
+
+          var gc = t.GM.getGraphic(item.id); //获取原有的面属性,转换key值
+
           var cg = {
             lineType: 'solid',
             lineWidth: 5,
             lineColor: '#277ffa',
             lineOpacity: 1,
             color: '#fff',
-            pellucidity: 0.5
-            // isHidden: false  //后期需要在加
+            pellucidity: 0.5 // isHidden: false  //后期需要在加
+
           };
+
           if (item.config) {
             cg = _objectSpread(_objectSpread({}, cg), item.config);
           }
-          var centerPoint = new BMap.Point(item.longitude, item.latitude);
-          //修改中心点
-          gc.setCenter(centerPoint);
-          //修改半径
-          gc.setRadius(item.radius);
-          //修改边线颜色
-          gc.setStrokeColor(cg.lineColor);
-          //修改填充颜色
-          gc.setFillColor(cg.color);
-          //修改边线透明度
-          gc.setStrokeOpacity(cg.lineOpacity);
-          //修改填充透明度
-          gc.setFillOpacity(cg.pellucidity);
-          //修改边线宽度
-          gc.setStrokeWeight(cg.lineWidth);
-          //修改边线样式
-          gc.setStrokeStyle(cg.lineType);
-          //缓存图元的数据,便于后期操作
+
+          var centerPoint = new BMap.Point(item.longitude, item.latitude); //修改中心点
+
+          gc.setCenter(centerPoint); //修改半径
+
+          gc.setRadius(item.radius); //修改边线颜色
+
+          gc.setStrokeColor(cg.lineColor); //修改填充颜色
+
+          gc.setFillColor(cg.color); //修改边线透明度
+
+          gc.setStrokeOpacity(cg.lineOpacity); //修改填充透明度
+
+          gc.setFillOpacity(cg.pellucidity); //修改边线宽度
+
+          gc.setStrokeWeight(cg.lineWidth); //修改边线样式
+
+          gc.setStrokeStyle(cg.lineType); //缓存图元的数据,便于后期操作
+
           t.GM.setGraphicParam(item.id, {
             attributes: _objectSpread(_objectSpread({}, item), {}, {
               other: item
@@ -1289,8 +1450,8 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           return false;
         }
       });
-    }
-    //画出对应边界线 name区域名
+    } //画出对应边界线 name区域名
+
   }, {
     key: "addBaiduBoundary",
     value: function addBaiduBoundary(bdNames) {
@@ -1317,8 +1478,8 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           t.addPolygon(arr);
         });
       });
-    }
-    //删除对应应边界线 name区域名
+    } //删除对应应边界线 name区域名
+
   }, {
     key: "removeBaiduBoundary",
     value: function removeBaiduBoundary(removedBDNames) {
@@ -1336,8 +1497,8 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       removedBDIds.forEach(function (id) {
         t.removeGraphic(id, 'polygon');
       });
-    }
-    //热力图
+    } //热力图
+
   }, {
     key: "heatMapOverlay",
     value: function heatMapOverlay() {
@@ -1349,36 +1510,42 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         visible: true,
         opacity: 0.7
       };
+
       if (d.config) {
         cg = _objectSpread(_objectSpread({}, cg), d.config);
       }
+
       if (!t.heatmap) {
         t.heatmap = new BMapLib.HeatmapOverlay({
           visible: cg.visible
         });
         t.state.gis.addOverlay(t.heatmap);
       }
+
       var option = {
         radius: cg.radius,
         //百度是1-100,高德是0-1
         opacity: eval(cg.opacity) * 100,
         visible: cg.visible
       };
+
       if (cg.gradient) {
         option.gradient = cg.gradient;
       }
+
       t.heatmap.setDataSet({
         max: cg.max,
         data: d.data || []
       });
       t.heatmap.setOptions(option);
+
       if (cg.visible) {
         t.heatmap.show();
       } else {
         t.heatmap.hide();
       }
-    }
-    //信息窗体
+    } //信息窗体
+
   }, {
     key: "infoWindow",
     value: function infoWindow() {
@@ -1388,26 +1555,30 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         width: 300,
         height: 172
       };
+
       if (d.config) {
         cg = _objectSpread(_objectSpread({}, cg), d.config);
       }
+
       var sContent = document.createElement('div');
       var infowindow = new BMap.InfoWindow(sContent);
       infowindow.setWidth(cg.width);
       infowindow.setHeight(cg.height);
+
       if (d.onClose instanceof Function) {
         infowindow.addEventListener("clickclose", function (e) {
           d.onClose(e);
         });
       }
+
       if (d.lat && d.lng && d.content) {
         (0, _reactDom.render)(d.content, sContent);
         t.state.gis.openInfoWindow(infowindow, new BMap.Point(d.lng, d.lat));
       } else {
         infowindow && t.state.gis.closeInfoWindow();
       }
-    }
-    //添加海量点   
+    } //添加海量点   
+
   }, {
     key: "addPointCollection",
     value: function addPointCollection() {
@@ -1425,10 +1596,11 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           size: gisMapConstant[d.size] || gisMapConstant['normal'],
           shape: gisMapConstant[d.shape] || gisMapConstant['circle'],
           color: d.color || '#d340c3'
-        };
-        // 初始化PointCollection
+        }; // 初始化PointCollection
+
         var VotexpointCollection = new BMap.PointCollection(points, options);
         t.state.gis.addOverlay(VotexpointCollection); // 添加Overlay
+
         t.morepoints.push({
           id: d.id,
           value: VotexpointCollection
@@ -1440,12 +1612,13 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             }, e.point), {}, {
               mapLayer: VotexpointCollection
             });
+
             t.props.clickPointCollection(obj);
           }
         });
       });
-    }
-    //更新海量点
+    } //更新海量点
+
   }, {
     key: "updatePointCollection",
     value: function updatePointCollection() {
@@ -1469,8 +1642,8 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           }
         });
       });
-    }
-    //清空单个海量点
+    } //清空单个海量点
+
   }, {
     key: "clearPointCollection",
     value: function clearPointCollection(ids) {
@@ -1482,8 +1655,8 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           }
         });
       });
-    }
-    //清空海量点
+    } //清空海量点
+
   }, {
     key: "clearAllPointCollection",
     value: function clearAllPointCollection() {
@@ -1494,12 +1667,14 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
     }
     /*图元事件处理*/
     //点击图元事件
+
   }, {
     key: "clickGraphic",
     value: function clickGraphic(id, e) {
-      var t = this;
-      //编辑中的图元关闭其他事件返回
+      var t = this; //编辑中的图元关闭其他事件返回
+
       if (t.state.editId == id) return false;
+
       if (typeof t.props.clickGraphic === "function") {
         var param = t.getGraphic(id);
         var obj = {
@@ -1517,14 +1692,15 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         };
         t.props.clickGraphic(obj);
       }
-    }
-    //图元鼠标悬浮事件
+    } //图元鼠标悬浮事件
+
   }, {
     key: "mouseOverGraphic",
     value: function mouseOverGraphic(id, e) {
-      var t = this;
-      //编辑中的图元关闭其他事件返回
+      var t = this; //编辑中的图元关闭其他事件返回
+
       if (t.state.editId == id) return false;
+
       if (typeof t.props.mouseOverGraphic === 'function') {
         var obj = {
           e: e,
@@ -1536,14 +1712,15 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         };
         t.props.mouseOverGraphic(obj);
       }
-    }
-    //图元鼠标移开事件
+    } //图元鼠标移开事件
+
   }, {
     key: "mouseOutGraphic",
     value: function mouseOutGraphic(id, e) {
-      var t = this;
-      //编辑中的图元关闭其他事件返回
+      var t = this; //编辑中的图元关闭其他事件返回
+
       if (t.state.editId == id) return false;
+
       if (typeof t.props.mouseOutGraphic === "function") {
         var obj = {
           e: e,
@@ -1558,10 +1735,12 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
     }
     /*地图事件处理*/
     //地图点击事件
+
   }, {
     key: "clickMap",
     value: function clickMap() {
       var t = this;
+
       if (typeof t.props.clickMap === "function") {
         t.state.gis.addEventListener('click', function (e) {
           var obj = t.getMapExtent();
@@ -1571,12 +1750,13 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           t.props.clickMap(obj);
         });
       }
-    }
-    //地图拖动之前事件
+    } //地图拖动之前事件
+
   }, {
     key: "dragMapStart",
     value: function dragMapStart() {
       var t = this;
+
       if (typeof t.props.dragMapStart === 'function') {
         t.state.gis.addEventListener('dragstart', function (e) {
           var obj = t.getMapExtent();
@@ -1584,12 +1764,13 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           t.props.dragMapStart(obj);
         });
       }
-    }
-    //地图拖动结束后事件
+    } //地图拖动结束后事件
+
   }, {
     key: "dragMapEnd",
     value: function dragMapEnd() {
       var t = this;
+
       if (typeof t.props.dragMapEnd === 'function') {
         t.state.gis.addEventListener('dragend', function (e) {
           var obj = t.getMapExtent();
@@ -1597,12 +1778,13 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           t.props.dragMapEnd(obj);
         });
       }
-    }
-    //地图移动之前事件
+    } //地图移动之前事件
+
   }, {
     key: "moveStart",
     value: function moveStart() {
       var t = this;
+
       if (typeof t.props.moveStart === 'function') {
         t.state.gis.addEventListener('movestart', function (e) {
           var obj = t.getMapExtent();
@@ -1610,12 +1792,13 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           t.props.moveStart(obj);
         });
       }
-    }
-    //地图移动结束后事件
+    } //地图移动结束后事件
+
   }, {
     key: "moveEnd",
     value: function moveEnd() {
       var t = this;
+
       if (typeof t.props.moveEnd === 'function') {
         t.state.gis.addEventListener('moveend', function (e) {
           var obj = t.getMapExtent();
@@ -1623,12 +1806,13 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           t.props.moveEnd(obj);
         });
       }
-    }
-    //地图更改缩放级别开始时触发触发此事件
+    } //地图更改缩放级别开始时触发触发此事件
+
   }, {
     key: "zoomStart",
     value: function zoomStart() {
       var t = this;
+
       if (typeof t.props.zoomStart === 'function') {
         t.state.gis.addEventListener('zoomstart', function (e) {
           var obj = t.getMapExtent();
@@ -1636,12 +1820,13 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           t.props.zoomStart(obj);
         });
       }
-    }
-    //地图更改缩放级别结束时触发触发此事件
+    } //地图更改缩放级别结束时触发触发此事件
+
   }, {
     key: "zoomEnd",
     value: function zoomEnd() {
       var t = this;
+
       if (typeof t.props.zoomEnd === 'function') {
         t.state.gis.addEventListener('zoomend', function (e) {
           var obj = t.getMapExtent();
@@ -1652,45 +1837,59 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
     }
     /*set方法*/
     //设置地图中心位置 lng/经度  lat/纬度
+
   }, {
     key: "setCenter",
     value: function setCenter(gt) {
       var t = this;
+
+      if (!t.state.gis) {
+        return;
+      }
+
       var mgt = [116.404, 39.915];
+
       if (gt) {
         //经纬度 必须存在 否则不操作
         if (!gt[0] || !gt[1]) {
           return false;
-        }
-        //如果设置的经纬度 与当前中心点一样 不操作
+        } //如果设置的经纬度 与当前中心点一样 不操作
+
+
         var c = t.state.gis.getCenter();
+
         if (c.lng == gt[0] && c.lat == gt[1]) {
           return false;
         }
+
         mgt = gt;
       }
+
       t.state.gis.setCenter(new BMap.Point(mgt[0], mgt[1]));
       t.setState({
         center: mgt
       });
-    }
-    //设置地图比例尺
+    } //设置地图比例尺
+
   }, {
     key: "setZoomLevel",
     value: function setZoomLevel(zoom) {
       var t = this;
       var z = t.getZoomLevel();
+
       if (z == zoom) {
         return false;
       }
+
       t.state.gis.setZoom(zoom);
-    }
-    //将制定图元展示在视野内 (强制改变地图中心位置)
+    } //将制定图元展示在视野内 (强制改变地图中心位置)
+
     /*
         参数arg格式如下1,2
         1.string   格式如:'1,a,2,3,4'
         2.数组 ['1','2']
     */
+
   }, {
     key: "setVisiblePoints",
     value: function setVisiblePoints(mapVisiblePoints) {
@@ -1699,31 +1898,38 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       var type = mapVisiblePoints.type;
       var ary = [];
       var obj = null;
+
       switch (mapVisiblePoints.fitView) {
         case 'point':
           arg = this.state.pointIds;
           break;
+
         case 'line':
           arg = this.state.lineIds;
           break;
+
         case 'polygon':
           arg = this.state.polygonIds;
           break;
+
         case 'circle':
           arg = this.state.circleIds;
           break;
+
         case 'all':
           arg = this.state.pointIds.concat(this.state.lineIds).concat(this.state.polygonIds).concat(this.state.circleIds);
           break;
+
         default:
           arg = mapVisiblePoints.fitView;
           break;
       }
-
       /**
        * 用法
        * map.setVisiblePoints('lng,lat;lng,lat')
        */
+
+
       if (typeof arg === 'string') {
         ary = arg.split(',');
         obj = t.getFitView(ary);
@@ -1734,9 +1940,11 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         */
         if (arg[0] instanceof Array) {
           var a = [];
+
           for (var i = 0; i < arg.length; i++) {
             a.push(new BMap.Point(arg[i][0], arg[i][1]));
           }
+
           obj = t.state.gis.getViewport(a);
           /**
            * 用法
@@ -1746,9 +1954,11 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           obj = t.getFitView(arg);
         }
       }
+
       if (!obj) {
         return false;
       }
+
       if (!type || type == 'all') {
         t.state.gis.centerAndZoom(obj.center, obj.zoom);
       } else if (type == 'zoom') {
@@ -1759,68 +1969,82 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
     }
     /*get方法*/
     //获取当前地图的中心位置
+
   }, {
     key: "getCurrentCenter",
     value: function getCurrentCenter() {
       var t = this;
       return t.state.gis.getCenter();
-    }
-    //获取当前比例尺
+    } //获取当前比例尺
+
   }, {
     key: "getZoomLevel",
     value: function getZoomLevel() {
       var t = this;
       return t.state.gis.getZoom();
-    }
-    //获取对应经纬的最优 zoomLevel和center
+    } //获取对应经纬的最优 zoomLevel和center
+
   }, {
     key: "getFitView",
     value: function getFitView(ids) {
       var t = this;
+
       if (ids.length > 0) {
         var allLayers = [];
+
         for (var i = 0; i < ids.length; i++) {
           switch ((t.GM.getGraphicParam(ids[i]) || {}).geometryType) {
             case 'point':
               if (t.GM.getGraphic(ids[i])) {
                 allLayers.push(t.GM.getGraphic(ids[i]).getPosition());
               }
+
               break;
+
             case 'polyline':
             case 'polygon':
               if (t.GM.getGraphic(ids[i])) {
                 allLayers = [].concat(_toConsumableArray(allLayers), _toConsumableArray(t.GM.getGraphic(ids[i]).getPath()));
               }
+
               break;
+
             case 'circle':
               if (t.GM.getGraphic(ids[i])) {
                 allLayers.push(t.GM.getGraphic(ids[i]).getCenter());
               }
+
               break;
           }
         }
+
         if (allLayers.length > 0) {
           return t.state.gis.getViewport(allLayers);
         }
       }
-    }
-    //获取图元数据
+    } //获取图元数据
+
   }, {
     key: "getGraphic",
     value: function getGraphic(id) {
       var t = this;
+
       if (!id) {
         return false;
       }
+
       var gp = t.GM.getGraphicParam(id);
       var gg = t.GM.getGraphic(id);
+
       if (!gg) {
         return false;
       }
+
       var p = {},
-        pts = [],
-        lng = 0,
-        lat = 0;
+          pts = [],
+          lng = 0,
+          lat = 0;
+
       switch (gp.geometryType) {
         case 'point':
           lng = gg.getPosition().lng;
@@ -1841,6 +2065,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             })
           });
           break;
+
         case 'polyline':
           pts = gg.getPath().map(function (item, index) {
             return [item.lng, item.lat];
@@ -1858,6 +2083,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             })
           });
           break;
+
         case 'polygon':
           // fix: 编辑图元时面积计算不正确，需要过滤一下重复的经纬度
           pts = (0, _unionBy["default"])(gg.getPath(), function (res) {
@@ -1878,6 +2104,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             })
           });
           break;
+
         case 'circle':
           lng = gg.getCenter().lng;
           lat = gg.getCenter().lat;
@@ -1902,108 +2129,134 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           });
           break;
       }
+
       return p;
     }
     /*功能方法*/
     //单个删除图元
+
   }, {
     key: "removeGraphic",
     value: function removeGraphic(id, type) {
       var t = this;
       var graphic = t.GM.getGraphic(id);
+
       if (!!graphic) {
         //清除聚合点 避免异常
-        t._cluster.removeMarker(this.GM.getGraphic(id));
-        //清除地图中图元
-        t.state.gis.removeOverlay(graphic);
-        //清除对应id的图元数据缓存
-        t.GM.removeGraphic(id);
+        t._cluster.removeMarker(this.GM.getGraphic(id)); //清除地图中图元
+
+
+        t.state.gis.removeOverlay(graphic); //清除对应id的图元数据缓存
+
+        t.GM.removeGraphic(id);
       } else {
         return false;
       }
+
       for (var i = 0; i < t.movePoints.length; i++) {
         if (t.movePoints[i].id == id) {
           t.movePoints.splice(i, 1);
           continue;
         }
       }
+
       var ids = [];
+
       switch (type) {
         case 'point':
           ids = t.state.pointIds;
           break;
+
         case 'line':
           ids = t.state.lineIds;
           break;
+
         case 'polygon':
           ids = t.state.polygonIds;
           break;
+
         case 'circle':
           ids = t.state.circleIds;
           break;
+
         case 'draw':
           if (t.state.drawIds.point.indexOf(id) > -1) {
             t.state.drawIds.point.splice(t.state.drawIds.point.indexOf(id), 1);
           }
+
           if (t.state.drawIds.polyline.indexOf(id) > -1) {
             t.state.drawIds.polyline.splice(t.state.drawIds.polyline.indexOf(id), 1);
           }
+
           if (t.state.drawIds.polygon.indexOf(id) > -1) {
             t.state.drawIds.polygon.splice(t.state.drawIds.polygon.indexOf(id), 1);
           }
+
           if (t.state.drawIds.circle.indexOf(id) > -1) {
             t.state.drawIds.circle.splice(t.state.drawIds.circle.indexOf(id), 1);
           }
+
           if (t.state.drawIds.rectangle.indexOf(id) > -1) {
             t.state.drawIds.rectangle.splice(t.state.drawIds.rectangle.indexOf(id), 1);
           }
+
           break;
+
         default:
           if (t.state.pointIds.indexOf(id) > -1) {
             t.state.pointIds.splice(t.state.pointIds.indexOf(id), 1);
           }
+
           if (t.state.lineIds.indexOf(id) > -1) {
             t.state.lineIds.splice(t.state.lineIds.indexOf(id), 1);
           }
+
           if (t.state.polygonIds.indexOf(id) > -1) {
             t.state.polygonIds.splice(t.state.polygonIds.indexOf(id), 1);
           }
+
           if (t.state.circleIds.indexOf(id) > -1) {
             t.state.circleIds.splice(t.state.circleIds.indexOf(id), 1);
           }
+
           break;
       }
+
       if (id == t.state.editId) {
         t.state.editId = '';
       }
+
       if (ids.indexOf(id) != -1) {
         ids.splice(ids.indexOf(id), 1);
       }
     }
     /*根据图元id,使图元变成可编辑状态*/
+
   }, {
     key: "doEdit",
     value: function doEdit(id) {
-      var t = this;
-      //获取编辑点的图元和参数
+      var t = this; //获取编辑点的图元和参数
+
       var graphic = t.GM.getGraphic(id);
       var gtp = t.GM.getGraphicParam(id);
-      if (!graphic) return false;
-      //关闭先前编辑的图元
+      if (!graphic) return false; //关闭先前编辑的图元
+
       if (!!t.state.editId) {
         t.endEdit();
       }
+
       if (!t.editGraphicChange) {
         //编辑变动后
         t.editGraphicChange = function (e) {
           var id = t.state.editId,
-            param = t.getGraphic(id),
-            obj = {
-              param: param,
-              e: e,
-              id: id,
-              geometry: param.geometry
-            };
+              param = t.getGraphic(id),
+              obj = {
+            param: param,
+            e: e,
+            id: id,
+            geometry: param.geometry
+          };
+
           if (param.geometry.type == 'polygon') {
             // obj.area = BMapLib.GeoUtils.getPolygonArea(param.mapLayer);
             // fix: 只能是数组计算之前的计算因为重复的经纬度导致面积为NAN
@@ -2011,14 +2264,18 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
               return new BMap.Point(item[0], item[1]);
             }));
           }
+
           if (param.geometry.type == 'polyline') {
             obj.distance = t.calculateDistance(param.geometry.paths);
           }
+
           if (param.geometry.type == 'circle') {
             obj.area = Math.pow(param.geometry.radius, 2) * Math.PI;
+
             if (t.editTimeout) {
               clearTimeout(t.editTimeout);
             }
+
             t.editTimeout = setTimeout(function () {
               t.setState({
                 editGraphic: obj
@@ -2035,51 +2292,59 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           }
         };
       }
+
       switch (gtp.geometryType) {
         case 'point':
           graphic.enableDragging();
           graphic.addEventListener("dragend", t.editGraphicChange);
           break;
+
         case 'polyline':
         case 'polygon':
         case 'rectangle':
           graphic.enableEditing();
           graphic.addEventListener("lineupdate", t.editGraphicChange);
           break;
+
         case 'circle':
           graphic.enableEditing();
           graphic.addEventListener("lineupdate", t.editGraphicChange);
           break;
       }
+
       t.setState({
         editId: id
       });
-    }
-    //关闭编辑
+    } //关闭编辑
+
   }, {
     key: "endEdit",
     value: function endEdit() {
-      var t = this;
-      //获取编辑点的图元和参数
+      var t = this; //获取编辑点的图元和参数
+
       var graphic = t.GM.getGraphic(t.state.editId);
       var gtp = t.GM.getGraphicParam(t.state.editId);
       if (!graphic) return false;
+
       switch (gtp.geometryType) {
         case 'point':
           graphic.disableDragging();
           graphic.removeEventListener("dragend", t.editGraphicChange);
           break;
+
         case 'polyline':
         case 'polygon':
         case 'rectangle':
           graphic.disableEditing();
           graphic.removeEventListener("lineupdate", t.editGraphicChange);
           break;
+
         case 'circle':
           graphic.disableEditing();
           graphic.removeEventListener("lineupdate", t.editGraphicChange);
           break;
       }
+
       var editGraphic = t.state.editGraphic;
       t.setState({
         editId: '',
@@ -2089,29 +2354,33 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           t.props.editGraphicChange(editGraphic);
         }
       });
-    }
-    //绘制图元
+    } //绘制图元
+
   }, {
     key: "draw",
     value: function draw(obj) {
       var t = this,
-        drawParam = {};
-      //先关闭(防止连点)
-      t._drawmanager.close();
-      //初始化参数
+          drawParam = {}; //先关闭(防止连点)
+
+      t._drawmanager.close(); //初始化参数
+
+
       drawParam.geometryType = obj.geometryType || 'point';
       drawParam.parameter = obj.parameter ? _objectSpread({}, obj.parameter) : {};
       drawParam.data = obj.data ? _objectSpread({}, obj.data) : {};
-      drawParam.data.id = (obj.data || {}).id || "draw".concat(new Date().getTime());
-      //判断id是否存在
+      drawParam.data.id = (obj.data || {}).id || "draw".concat(new Date().getTime()); //判断id是否存在
+
       var len = t.state.drawIds[drawParam.geometryType].indexOf(drawParam.data.id);
+
       if (len > -1) {
         //如果id存在 删除存在的图元,清除drawId中的id数据
         t.removeGraphic(drawParam.data.id);
         t.state.drawIds[drawParam.geometryType].splice(len, 1);
       }
+
       var param = {};
       var paramgcr = {};
+
       if (drawParam.geometryType == 'polygon' || drawParam.geometryType == 'circle' || drawParam.geometryType == 'rectangle') {
         paramgcr.fillColor = drawParam.parameter.color;
         paramgcr.strokeColor = drawParam.parameter.lineColor;
@@ -2134,6 +2403,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           type: drawParam.geometryType
         };
       }
+
       switch (drawParam.geometryType) {
         case 'point':
           param.offset = new BMap.Size((drawParam.parameter.markerContentX || -15) + (drawParam.parameter.width || 30) / 2, (drawParam.parameter.markerContentY || -30) + (drawParam.parameter.height || 30) / 2);
@@ -2152,11 +2422,15 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             },
             type: 'point'
           };
+
           t._drawmanager.setDrawingMode('marker');
+
           t._drawmanager.open({
             markerOptions: param
           });
+
           break;
+
         case 'polyline':
           param.strokeColor = drawParam.parameter.color;
           param.strokeOpacity = drawParam.parameter.pellucidity;
@@ -2174,62 +2448,77 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             },
             type: 'polyline'
           };
+
           t._drawmanager.open({
             polylineOptions: param,
             enableCalculate: true
           });
+
           t._drawmanager.setDrawingMode('polyline');
+
           break;
+
         case 'polygon':
           t._drawmanager.open({
             polygonOptions: paramgcr,
             enableCalculate: true
           });
+
           t._drawmanager.setDrawingMode('polygon');
+
           break;
+
         case 'circle':
           t._drawmanager.open({
             circleOptions: paramgcr,
             enableCalculate: true
           });
+
           t._drawmanager.setDrawingMode('circle');
+
           break;
+
         case 'rectangle':
           t._drawmanager.open({
             rectangleOptions: paramgcr,
             enableCalculate: true
           });
+
           t._drawmanager.setDrawingMode('rectangle');
+
           break;
       }
-    }
-    //关闭绘制图元
+    } //关闭绘制图元
+
   }, {
     key: "closeDraw",
     value: function closeDraw() {
       var t = this;
+
       t._drawmanager.close();
-    }
-    //清空地图图元
+    } //清空地图图元
+
   }, {
     key: "clearAll",
     value: function clearAll() {
-      var t = this;
-      //清空聚合
+      var t = this; //清空聚合
+
       if (t._cluster) {
         t._cluster.clearMarkers();
-      }
-      //关闭测距
+      } //关闭测距
+
+
       if (t._rangingTool) {
         t._rangingTool.close();
-      }
-      //清空地图
-      t.state.gis.clearOverlays();
-      //清空缓存数据
-      t.GM.clearAll();
-      //关闭编辑
-      t.endEdit();
-      //清空历史数据记录
+      } //清空地图
+
+
+      t.state.gis.clearOverlays(); //清空缓存数据
+
+      t.GM.clearAll(); //关闭编辑
+
+      t.endEdit(); //清空历史数据记录
+
       t.setState({
         pointIds: [],
         lineIds: [],
@@ -2247,36 +2536,48 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
     }
     /*工具方法*/
     //聚合地图图元(arg为空时聚合全部点)
+
   }, {
     key: "cluster",
     value: function cluster(arg) {
       var t = this;
-      var ary = t.clusterToolFunction(arg);
+      var ary = t.clusterToolFunction(arg || t.state.pointIds);
+
       t._cluster.addMarkers(ary);
-    }
-    //删除点聚合效果
+    } //删除点聚合效果
+
   }, {
     key: "removeCluster",
     value: function removeCluster(arg) {
       var t = this;
-      var ary = t.clusterToolFunction(arg);
+      var ids = arg !== null && arg !== void 0 ? arg : t.state.pointIds;
+      var ary = t.clusterToolFunction(ids);
+
       if (ary.length > 0) {
         t._cluster.removeMarkers(ary);
       }
-    }
-    //清空聚合效果
+
+      ids.map(function (id) {
+        t.GM.removeGraphic(id);
+      }); // 重新加点
+
+      t.addPoint(t.props.mapPoints);
+    } //清空聚合效果
+
   }, {
     key: "clearClusters",
     value: function clearClusters() {
       var t = this;
+
       t._cluster.clearMarkers();
-    }
-    //聚合功能公共方法(获取图元集合)
+    } //聚合功能公共方法(获取图元集合)
+
   }, {
     key: "clusterToolFunction",
     value: function clusterToolFunction(arg) {
       var t = this;
       var ary = [];
+
       if (!arg) {
         var pointIds = t.state.pointIds;
         ary = pointIds;
@@ -2286,87 +2587,106 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         } else if (typeof arg === 'string') {
           ary = arg.split(',');
         }
-      }
-      //过滤moveTo的点位
+      } //过滤moveTo的点位
       //缓存所有聚合的点位
+
+
       var allps = [];
+
       for (var i = 0; i < ary.length; i++) {
         allps.push(t.GM.getGraphic(ary[i]));
       }
+
       return allps;
-    }
-    //测距
+    } //测距
+
   }, {
     key: "vtxRangingTool",
     value: function vtxRangingTool(callback) {
       var t = this;
+
       var cb = function cb(e) {
         //关闭测距
-        t._rangingTool.close();
-        //注销事件(避免重复)
+        t._rangingTool.close(); //注销事件(避免重复)
+
+
         t._rangingTool.removeEventListener('drawend', cb);
+
         if (typeof callback === "function") {
           var obj = {
             distance: e.distance
           };
           var objLngLats = new Array();
+
           for (var i = 0; i < e.points.length; i++) {
             objLngLats.push([e.points[i].lng, e.points[i].lat]);
           }
+
           obj.lnglats = objLngLats;
           callback(obj);
         }
       };
+
       t._rangingTool.addEventListener('drawend', cb);
+
       t._rangingTool.open(this.state.gis);
-    }
-    //开启路况
+    } //开启路况
+
   }, {
     key: "openTrafficInfo",
     value: function openTrafficInfo() {
       var t = this;
+
       t._trafficCtrl.showTraffic();
-    }
-    //关闭路况
+    } //关闭路况
+
   }, {
     key: "hideTrafficInfo",
     value: function hideTrafficInfo() {
       var t = this;
+
       t._trafficCtrl.hideTraffic();
-    }
-    //展示比例尺
+    } //展示比例尺
+
   }, {
     key: "showControl",
     value: function showControl(props) {
       var t = this,
-        location = t.AnchorConstant['tr'],
-        type = '',
-        offset = null,
-        scaleOffset = null;
+          location = t.AnchorConstant['tr'],
+          type = '',
+          offset = null,
+          scaleOffset = null;
       var config = props || t.props;
+
       if (t.scaleControl) {
         t.state.gis.removeControl(t.scaleControl);
       }
+
       if (t.navigationControl) {
         t.state.gis.removeControl(t.navigationControl);
       }
+
       if (config.showControl.location) {
         location = t.AnchorConstant[config.showControl.location];
       }
+
       if (config.showControl.type) {
         type = t.NavigationConstant[config.showControl.type];
       }
+
       if (config.showControl.offset && config.showControl.offset.length > 0) {
         offset = new BMap.Size(config.showControl.offset[0], config.showControl.offset[1]);
         scaleOffset = new BMap.Size(config.showControl.offset[0] + 70, config.showControl.offset[1]);
-      }
-      // 左上角，添加比例尺
+      } // 左上角，添加比例尺
+
+
       var control = new BMap.ScaleControl({
         anchor: location,
         offset: scaleOffset
       });
       t.state.gis.addControl(control);
       t.scaleControl = control;
+
       if (type !== 'null') {
         //右上角，仅包含平移和缩放按钮
         var navigation = new BMap.NavigationControl({
@@ -2377,40 +2697,46 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         t.state.gis.addControl(navigation);
         t.navigationControl = navigation;
       }
-    }
-    // 移除比例尺
+    } // 移除比例尺
+
   }, {
     key: "removeControl",
     value: function removeControl() {
       var t = this;
+
       if (t.scaleControl) {
         t.state.gis.removeControl(t.scaleControl);
         t.scaleControl = null;
       }
+
       if (t.navigationControl) {
         t.state.gis.removeControl(t.navigationControl);
         t.navigationControl = null;
       }
-    }
-    //展示地图切换控件
+    } //展示地图切换控件
+
   }, {
     key: "showMapTypeControl",
     value: function showMapTypeControl(props) {
       var t = this,
-        location = t.AnchorConstant['br'],
-        offset = null;
+          location = t.AnchorConstant['br'],
+          offset = null;
       var config = props || t.props;
+
       if (t.mapTypeControl) {
         t.state.gis.removeControl(t.mapTypeControl);
       }
+
       if (config.satelliteSwitch.location) {
         location = t.AnchorConstant[config.satelliteSwitch.location];
       }
+
       if (config.satelliteSwitch.offset && config.satelliteSwitch.offset.length > 0) {
         offset = new BMap.Size(config.satelliteSwitch.offset[0], config.satelliteSwitch.offset[1]);
       }
-      var mapTypes = [BMAP_NORMAL_MAP, BMAP_SATELLITE_MAP, BMAP_HYBRID_MAP];
-      // 地图切换控件
+
+      var mapTypes = [BMAP_NORMAL_MAP, BMAP_SATELLITE_MAP, BMAP_HYBRID_MAP]; // 地图切换控件
+
       var control = new BMap.MapTypeControl({
         mapTypes: mapTypes,
         anchor: location,
@@ -2421,22 +2747,26 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       t.mapTypeControl = control;
     }
     /*设置显示区域*/
+
   }, {
     key: "setAreaRestriction",
     value: function setAreaRestriction(sw_ne) {
-      var t = this;
-      //修改了区域限制的js文件.
+      var t = this; //修改了区域限制的js文件.
+
       var bounds = new BMap.Bounds(new BMap.Point(sw_ne[0][0], sw_ne[0][1]), new BMap.Point(sw_ne[1][0], sw_ne[1][1]));
+
       t._bmar.setBounds(this.state.gis, bounds);
     }
     /*取消显示区域*/
+
   }, {
     key: "clearAreaRestriction",
     value: function clearAreaRestriction() {
       var t = this;
+
       t._bmar.clearBounds();
-    }
-    //渲染
+    } //渲染
+
   }, {
     key: "render",
     value: function render() {
@@ -2451,50 +2781,60 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       });
     }
     /*公共方法*/
+
   }, {
     key: "moveAnimation",
     value: function moveAnimation() {
       var t = this;
+
       if (t.moveToTimer) {
         clearInterval(t.moveToTimer);
       }
+
       t.moveToTimer = setInterval(function () {
         for (var i = 0; i < t.movePoints.length; i++) {
           t.movePoints[i].waitTime += 10;
           t.movePoints[i].deleteTime -= 10;
         }
+
         t.movePoints.sort(function (x, y) {
           return y.waitTime - x.waitTime;
         });
         var nowMovePoints = t.movePoints.slice(0, 10),
-          deleteIndex = [];
+            deleteIndex = [];
+
         for (var _i = 0; _i < nowMovePoints.length; _i++) {
           var _nowMovePoints$_i = nowMovePoints[_i],
-            id = _nowMovePoints$_i.id,
-            rx = _nowMovePoints$_i.rx,
-            ry = _nowMovePoints$_i.ry,
-            waitTime = _nowMovePoints$_i.waitTime,
-            deleteTime = _nowMovePoints$_i.deleteTime;
+              id = _nowMovePoints$_i.id,
+              rx = _nowMovePoints$_i.rx,
+              ry = _nowMovePoints$_i.ry,
+              waitTime = _nowMovePoints$_i.waitTime,
+              deleteTime = _nowMovePoints$_i.deleteTime;
           var gc = t.GM.getGraphic(id);
+
           if (!gc) {
             clearInterval(t.moveToTimer);
           } else {
             var gg = gc.getPosition();
             var tx = gg.lng + rx,
-              ty = gg.lat + ry;
+                ty = gg.lat + ry;
             gc.setPosition(new BMap.Point(tx, ty));
             t.movePoints[_i].waitTime = 0;
+
             if (deleteTime <= 0) {
               deleteIndex.push(_i);
             }
           }
         }
+
         deleteIndex.sort(function (a, b) {
           return b - a;
         });
+
         for (var _i2 = 0; _i2 < deleteIndex.length; _i2++) {
           t.movePoints.splice(deleteIndex[_i2], 1);
         }
+
         if (nowMovePoints.length == 0) {
           clearInterval(t.moveToTimer);
         }
@@ -2505,34 +2845,39 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
     value: function moveTo(id, lnglat, delay, autoRotation, urlright, urlleft) {
       delay = delay || 3;
       var t = this,
-        timer = 10,
-        gc = t.GM.getGraphic(id);
+          timer = 10,
+          gc = t.GM.getGraphic(id);
       delay = eval(delay) * 1000;
       var count = delay / timer;
       var s = gc.getPosition(),
-        e = new BMap.Point(lnglat[0], lnglat[1]);
+          e = new BMap.Point(lnglat[0], lnglat[1]);
+
       if (s.equals(e)) {
         return false;
       } else {
-        var url = null;
-        //计算角度,旋转
+        var url = null; //计算角度,旋转
+
         if (autoRotation) {
           var ddeg = t.rotateDeg(gc.getPosition(), lnglat);
+
           if (urlleft && ddeg < -90 && ddeg > -270) {
             ddeg += 180;
             url = urlleft;
           } else {
             url = urlright;
           }
+
           var gcicon = gc.getIcon();
           gcicon.setImageUrl(url);
           gc.setIcon(gcicon);
           gc.setRotation(ddeg);
-        }
-        //拆分延迟移动定位
+        } //拆分延迟移动定位
+
+
         var rx = (e.lng - s.lng) / count,
-          ry = (e.lat - s.lat) / count;
+            ry = (e.lat - s.lat) / count;
         var isHave = false;
+
         for (var i = 0; i < t.movePoints.length; i++) {
           if (t.movePoints[i].id == id) {
             t.movePoints.splice(i, 1, {
@@ -2545,6 +2890,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             isHave = true;
           }
         }
+
         if (!isHave) {
           t.movePoints.push({
             id: id,
@@ -2555,30 +2901,34 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           });
         }
       }
-    }
-    //点位角度旋转(以指向东(右)为0°)
+    } //点位角度旋转(以指向东(右)为0°)
+
   }, {
     key: "rotateDeg",
     value: function rotateDeg(sp, ep) {
       var t = this;
       var spLngLat = sp;
+
       if (Array.isArray(sp)) {
         spLngLat = new BMap.Point(sp[0], sp[1]);
       }
+
       var s = t.state.gis.pointToPixel(spLngLat),
-        //获取当前点位的经纬度
-        e = t.state.gis.pointToPixel(new BMap.Point(ep[0], ep[1])),
-        deg = 0;
+          //获取当前点位的经纬度
+      e = t.state.gis.pointToPixel(new BMap.Point(ep[0], ep[1])),
+          deg = 0;
+
       if (e.x != s.x) {
         var tan = (e.y - s.y) / (e.x - s.x),
-          atan = Math.atan(tan);
-        deg = atan * 360 / (2 * Math.PI);
-        //degree  correction;
+            atan = Math.atan(tan);
+        deg = atan * 360 / (2 * Math.PI); //degree  correction;
+
         if (e.x < s.x) {
           deg = -deg + 90 + 90;
         } else {
           deg = -deg;
         }
+
         deg = -deg;
       } else {
         var disy = e.y - s.y;
@@ -2587,38 +2937,45 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         if (disy == 0) bias = 0;
         deg = -bias * 90;
       }
+
       return deg;
-    }
-    //处理线和面的 经纬度数据
+    } //处理线和面的 经纬度数据
+
   }, {
     key: "dealData",
     value: function dealData(ms) {
       //区别点和圆的经纬度数据处理
       var lnglatAry = [],
-        _extent = {
-          xmax: 0,
-          xmin: 0,
-          ymax: 0,
-          ymin: 0
-        },
-        path = [];
+          _extent = {
+        xmax: 0,
+        xmin: 0,
+        ymax: 0,
+        ymin: 0
+      },
+          path = [];
+
       if ('getPath' in ms) {
         path = ms.getPath();
         path = path.map(function (item, index) {
           var lng = item.lng,
-            lat = item.lat;
+              lat = item.lat;
+
           if (lng > _extent.xmax) {
             _extent.xmax = lng;
           }
+
           if (lng < _extent.xmin || _extent.xmin == 0) {
             _extent.xmin = lng;
           }
+
           if (lat > _extent.ymax) {
             _extent.ymax = lat;
           }
+
           if (lat < _extent.ymin || _extent.ymin == 0) {
             _extent.ymin = lat;
           }
+
           lnglatAry.push({
             lngX: lng,
             latX: lat
@@ -2626,31 +2983,34 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           return [lng, lat];
         });
       }
+
       return {
         lnglatAry: lnglatAry,
         _extent: _extent,
         path: path
       };
-    }
-    //显示隐藏的图元
+    } //显示隐藏的图元
+
   }, {
     key: "showGraphicById",
     value: function showGraphicById(id) {
       var t = this;
+
       if (t.GM.getGraphic(id)) {
         t.GM.getGraphic(id).show();
       }
-    }
-    //隐藏图元
+    } //隐藏图元
+
   }, {
     key: "hideGraphicById",
     value: function hideGraphicById(id) {
       var t = this;
+
       if (t.GM.getGraphic(id)) {
         t.GM.getGraphic(id).hide();
       }
-    }
-    //获取地图当前的位置状态信息
+    } //获取地图当前的位置状态信息
+
   }, {
     key: "getMapExtent",
     value: function getMapExtent() {
@@ -2670,43 +3030,46 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       obj.mapSize = t.state.gis.getSize();
       obj.radius = t.calculatePointsDistance([obj.nowCenter.lng, obj.nowCenter.lat], [obj.northEast.lng, obj.northEast.lat]);
       return obj;
-    }
-    //计算2点间距离 单位m 精确到2位小数
+    } //计算2点间距离 单位m 精确到2位小数
+
   }, {
     key: "calculatePointsDistance",
     value: function calculatePointsDistance(fp, ep) {
       return Math.round(this.state.gis.getDistance(new BMap.Point(fp[0], fp[1]), new BMap.Point(ep[0], ep[1])) * 100) / 100;
-    }
-    //计算多个点的距离(常用于线计算)
+    } //计算多个点的距离(常用于线计算)
+
   }, {
     key: "calculateDistance",
     value: function calculateDistance(ps) {
       var t = this,
-        totalDistance = 0;
+          totalDistance = 0;
+
       if (ps.length < 0) {
         return false;
       }
+
       for (var i = 0; i < ps.length; i++) {
         if (i < ps.length - 1) {
           totalDistance += t.calculatePointsDistance(ps[i], ps[i + 1]);
         }
       }
+
       return Math.round(totalDistance * 100) / 100;
-    }
-    //计算图元面积(面,圆)
+    } //计算图元面积(面,圆)
+
   }, {
     key: "calculateArea",
     value: function calculateArea(id) {
       var t = this;
       return t.state.gis.calculateArea(t.getGraphic(id));
-    }
-    //对比对象数据是否相等
+    } //对比对象数据是否相等
+
   }, {
     key: "deepEqual",
     value: function deepEqual(a, b) {
       return _immutable["default"].is(_immutable["default"].fromJS(a), _immutable["default"].fromJS(b));
-    }
-    //数据解析(分析,新增,更新,删除对应的数据)
+    } //数据解析(分析,新增,更新,删除对应的数据)
+
   }, {
     key: "dataMatch",
     value: function dataMatch(oldData, newData, type) {
@@ -2737,13 +3100,14 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         updatedData: updatedData,
         replacedData: replacedData
       };
-    }
-    //处理需要增加图元的数据(避免意外问题)
+    } //处理需要增加图元的数据(避免意外问题)
+
   }, {
     key: "dealAdd",
     value: function dealAdd(ary, ids) {
       var ads = [],
-        otherupds = [];
+          otherupds = [];
+
       for (var i = 0; i < ary.length; i++) {
         if (ids.indexOf(ary[i].id) > -1) {
           otherupds.push(ary[i]);
@@ -2751,17 +3115,19 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           ads.push(ary[i]);
         }
       }
+
       return {
         ads: ads,
         otherupds: otherupds
       };
-    }
-    //处理需要更新图元的数据(避免意外问题)
+    } //处理需要更新图元的数据(避免意外问题)
+
   }, {
     key: "dealUpdate",
     value: function dealUpdate(ary, ids) {
       var upds = [],
-        otherads = [];
+          otherads = [];
+
       for (var i = 0; i < ary.length; i++) {
         if (ids.indexOf(ary[i].id) > -1) {
           upds.push(ary[i]);
@@ -2769,19 +3135,22 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           otherads.push(ary[i]);
         }
       }
+
       return {
         upds: upds,
         otherads: otherads
       };
-    }
-    // 信息窗口
+    } // 信息窗口
+
   }, {
     key: "showInfoWindow",
     value: function showInfoWindow(params) {
       var t = this;
+
       if (t.popupWindow) {
         t.hideInfoWindow();
       }
+
       var poi = new BMap.Point(params.position[0], params.position[1]);
       t.popupWindow = new BMapLib.InfoBox(t.state.gis, params.content, {
         boxStyle: params.boxStyle,
@@ -2792,24 +3161,27 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       });
       var marker = new BMap.Marker(poi);
       t.popupWindow.open(marker);
-    }
-    // 框选
+    } // 框选
+
   }, {
     key: "frameSelect",
     value: function frameSelect(_ref, callback) {
       var geometryType = _ref.geometryType,
-        _ref$parameter = _ref.parameter,
-        parameter = _ref$parameter === void 0 ? {} : _ref$parameter,
-        _ref$data = _ref.data,
-        data = _ref$data === void 0 ? {} : _ref$data;
+          _ref$parameter = _ref.parameter,
+          parameter = _ref$parameter === void 0 ? {} : _ref$parameter,
+          _ref$data = _ref.data,
+          data = _ref$data === void 0 ? {} : _ref$data;
+
       if (!['polygon', 'circle', 'rectangle'].includes(geometryType)) {
         _antd.message.warn("传入的类型不支持框选！");
+
         return false;
       }
+
       var t = this;
       var params = {},
-        type = geometryType || 'polygon',
-        id = data.id || "frameSelectFeature_".concat(Math.random());
+          type = geometryType || 'polygon',
+          id = data.id || "frameSelectFeature_".concat(Math.random());
       params.color = parameter.color || 'red';
       params.lineColor = parameter.lineColor || 'red';
       params.lineOpacity = parameter.lineOpacity || 1;
@@ -2828,39 +3200,43 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         id: id,
         type: geometryType
       };
-    }
-    // 清除框选
+    } // 清除框选
+
   }, {
     key: "clearFrameSelect",
     value: function clearFrameSelect() {
       for (var key in this.frameSelectProps) {
         this.removeGraphic(this.frameSelectProps[key].id, this.frameSelectProps[key].type);
       }
+
       this.frameSelectProps = {};
-    }
-    // 清除框选ById
+    } // 清除框选ById
+
   }, {
     key: "clearFrameSelectById",
     value: function clearFrameSelectById(id) {
       var obj = this.frameSelectProps[id];
       this.removeGraphic(obj.id, obj.type);
       delete this.frameSelectProps[id];
-    }
-    // 关闭信息窗口
+    } // 关闭信息窗口
+
   }, {
     key: "hideInfoWindow",
     value: function hideInfoWindow() {
       var t = this;
+
       if (t.popupWindow) {
         t.popupWindow.close();
       }
+
       t.popupWindow = null;
-    }
-    //百度搜索功能
+    } //百度搜索功能
+
   }, {
     key: "searchPoints",
     value: function searchPoints(searchValue) {
       var _this5 = this;
+
       var pageSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
       var pageIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
       return new Promise(function (resolve) {
@@ -2872,9 +3248,11 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
               psc.gotoPage(pageIndex);
             } else {
               var res_arr = [];
+
               for (var i = 0, len = result.getCurrentNumPois(); i < len; i++) {
                 res_arr.push(result.getPoi(i));
               }
+
               resolve(res_arr.map(function (r) {
                 return {
                   id: r.uid,
@@ -2888,15 +3266,15 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
                   other: 'search'
                 };
               }));
-            }
-            // console.log(result,result.getNumPages(),result.getPageIndex());                    
+            } // console.log(result,result.getNumPages(),result.getPageIndex());                    
+
           },
           pageCapacity: pageSize
         });
         psc.search(searchValue);
       });
-    }
-    //初始化
+    } //初始化
+
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
@@ -2904,102 +3282,106 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       t.loadMapComplete.then(function () {
         t.init();
       });
-    }
-    //重新渲染结束
+    } //重新渲染结束
+
   }, {
     key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps, prevState) {}
-    //已加载组件，收到新的参数时调用
+    value: function componentDidUpdate(prevProps, prevState) {} //已加载组件，收到新的参数时调用
+
   }, {
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {
-      var t = this;
-      //点/线旧数据
+      var t = this; //点/线旧数据
+
       var _t$state = t.state,
-        pointIds = _t$state.pointIds,
-        lineIds = _t$state.lineIds,
-        polygonIds = _t$state.polygonIds,
-        circleIds = _t$state.circleIds,
-        drawIds = _t$state.drawIds;
+          pointIds = _t$state.pointIds,
+          lineIds = _t$state.lineIds,
+          polygonIds = _t$state.polygonIds,
+          circleIds = _t$state.circleIds,
+          drawIds = _t$state.drawIds;
       var point = drawIds.point,
-        polyline = drawIds.polyline,
-        polygon = drawIds.polygon,
-        circle = drawIds.circle,
-        rectangle = drawIds.rectangle;
-      //点/线新数据
+          polyline = drawIds.polyline,
+          polygon = drawIds.polygon,
+          circle = drawIds.circle,
+          rectangle = drawIds.rectangle; //点/线新数据
+
       var _nextProps$mapPoints = nextProps.mapPoints,
-        mapPoints = _nextProps$mapPoints === void 0 ? [] : _nextProps$mapPoints,
-        _nextProps$mapLines = nextProps.mapLines,
-        mapLines = _nextProps$mapLines === void 0 ? [] : _nextProps$mapLines,
-        _nextProps$mapPolygon = nextProps.mapPolygons,
-        mapPolygons = _nextProps$mapPolygon === void 0 ? [] : _nextProps$mapPolygon,
-        _nextProps$mapCircles = nextProps.mapCircles,
-        mapCircles = _nextProps$mapCircles === void 0 ? [] : _nextProps$mapCircles,
-        _nextProps$customized = nextProps.customizedBoundary,
-        customizedBoundary = _nextProps$customized === void 0 ? [] : _nextProps$customized,
-        isOpenTrafficInfo = nextProps.isOpenTrafficInfo,
-        boundaryName = nextProps.boundaryName,
-        heatMapData = nextProps.heatMapData,
-        imageOverlays = nextProps.imageOverlays,
-        mapVisiblePoints = nextProps.mapVisiblePoints,
-        setVisiblePoints = nextProps.setVisiblePoints,
-        setCenter = nextProps.setCenter,
-        mapCenter = nextProps.mapCenter,
-        setZoomLevel = nextProps.setZoomLevel,
-        mapZoomLevel = nextProps.mapZoomLevel,
-        setCluster = nextProps.setCluster,
-        mapCluster = nextProps.mapCluster,
-        isRangingTool = nextProps.isRangingTool,
-        mapRangingTool = nextProps.mapRangingTool,
-        isRemove = nextProps.isRemove,
-        mapRemove = nextProps.mapRemove,
-        mapDraw = nextProps.mapDraw,
-        isDraw = nextProps.isDraw,
-        isCloseDraw = nextProps.isCloseDraw,
-        editGraphicId = nextProps.editGraphicId,
-        isDoEdit = nextProps.isDoEdit,
-        isEndEdit = nextProps.isEndEdit,
-        mapPointCollection = nextProps.mapPointCollection,
-        isclearAllPointCollection = nextProps.isclearAllPointCollection,
-        isSetAreaRestriction = nextProps.isSetAreaRestriction,
-        areaRestriction = nextProps.areaRestriction,
-        isClearAreaRestriction = nextProps.isClearAreaRestriction,
-        isClearAll = nextProps.isClearAll,
-        mapStyle = nextProps.mapStyle,
-        coverageType = nextProps.coverageType,
-        infoWindowData = nextProps.infoWindowData;
-      var props = t.props;
-
-      // 设置地图地图样式
+          mapPoints = _nextProps$mapPoints === void 0 ? [] : _nextProps$mapPoints,
+          _nextProps$mapLines = nextProps.mapLines,
+          mapLines = _nextProps$mapLines === void 0 ? [] : _nextProps$mapLines,
+          _nextProps$mapPolygon = nextProps.mapPolygons,
+          mapPolygons = _nextProps$mapPolygon === void 0 ? [] : _nextProps$mapPolygon,
+          _nextProps$mapCircles = nextProps.mapCircles,
+          mapCircles = _nextProps$mapCircles === void 0 ? [] : _nextProps$mapCircles,
+          _nextProps$customized = nextProps.customizedBoundary,
+          customizedBoundary = _nextProps$customized === void 0 ? [] : _nextProps$customized,
+          isOpenTrafficInfo = nextProps.isOpenTrafficInfo,
+          boundaryName = nextProps.boundaryName,
+          heatMapData = nextProps.heatMapData,
+          imageOverlays = nextProps.imageOverlays,
+          mapVisiblePoints = nextProps.mapVisiblePoints,
+          setVisiblePoints = nextProps.setVisiblePoints,
+          setCenter = nextProps.setCenter,
+          mapCenter = nextProps.mapCenter,
+          setZoomLevel = nextProps.setZoomLevel,
+          mapZoomLevel = nextProps.mapZoomLevel,
+          setCluster = nextProps.setCluster,
+          mapCluster = nextProps.mapCluster,
+          isRangingTool = nextProps.isRangingTool,
+          mapRangingTool = nextProps.mapRangingTool,
+          isRemove = nextProps.isRemove,
+          mapRemove = nextProps.mapRemove,
+          mapDraw = nextProps.mapDraw,
+          isDraw = nextProps.isDraw,
+          isCloseDraw = nextProps.isCloseDraw,
+          editGraphicId = nextProps.editGraphicId,
+          isDoEdit = nextProps.isDoEdit,
+          isEndEdit = nextProps.isEndEdit,
+          mapPointCollection = nextProps.mapPointCollection,
+          isclearAllPointCollection = nextProps.isclearAllPointCollection,
+          isSetAreaRestriction = nextProps.isSetAreaRestriction,
+          areaRestriction = nextProps.areaRestriction,
+          isClearAreaRestriction = nextProps.isClearAreaRestriction,
+          isClearAll = nextProps.isClearAll,
+          mapStyle = nextProps.mapStyle,
+          coverageType = nextProps.coverageType,
+          infoWindowData = nextProps.infoWindowData;
+      var props = t.props; // 设置地图地图样式
+
       if (mapStyle && !t.deepEqual(mapStyle, props.mapStyle)) {
         if (typeof mapStyle === 'string') {
           t.state.gis.setMapStyle({
             style: mapStyle
           });
         }
+
         if (mapStyle instanceof Array) {
           t.state.gis.setMapStyle({
             styleJson: mapStyle
           });
         }
-      }
-      // 切换地图矢量图和卫星图背景
+      } // 切换地图矢量图和卫星图背景
+
+
       if (coverageType && !t.deepEqual(coverageType, props.coverageType)) {
         t.setMapType(coverageType);
-      }
-      // 等待地图加载
-      if (!t.state.mapCreated) return;
+      } // 等待地图加载
 
+
+      if (!t.state.mapCreated) return;
       /*添加海量点*/
+
       if (mapPointCollection instanceof Array && props.mapPointCollection instanceof Array && !t.deepEqual(mapPointCollection, props.mapPointCollection)) {
         var _t$dataMatch = t.dataMatch(props.mapPointCollection, mapPointCollection, 'id'),
-          deletedDataIDs = _t$dataMatch.deletedDataIDs,
-          addedData = _t$dataMatch.addedData,
-          updatedData = _t$dataMatch.updatedData;
+            deletedDataIDs = _t$dataMatch.deletedDataIDs,
+            addedData = _t$dataMatch.addedData,
+            updatedData = _t$dataMatch.updatedData;
+
         t.clearPointCollection(deletedDataIDs);
         t.addPointCollection(addedData);
         t.updatePointCollection(updatedData);
       }
+
       if (typeof isclearAllPointCollection == 'boolean' && isclearAllPointCollection || isclearAllPointCollection && isclearAllPointCollection !== t.props.isclearAllPointCollection) {
         t.clearAllPointCollection();
       }
@@ -3008,10 +3390,12 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           pointData[1]的数据在idsForGraphicId中不存在的,执行新增
           pointData[0]数据中多余的id,执行删除
       */
+
+
       if (mapPoints instanceof Array && props.mapPoints instanceof Array && !t.deepEqual(mapPoints, props.mapPoints)) {
         var oldMapPoints = props.mapPoints;
-        var newMapPoints = mapPoints;
-        //过滤编辑的图元
+        var newMapPoints = mapPoints; //过滤编辑的图元
+
         if (!!t.state.editId) {
           oldMapPoints = props.mapPoints.filter(function (item) {
             return item.id !== editGraphicId;
@@ -3020,41 +3404,50 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             return item.id !== editGraphicId;
           });
         }
+
         var _t$dataMatch2 = t.dataMatch(oldMapPoints, newMapPoints, 'id'),
-          _deletedDataIDs = _t$dataMatch2.deletedDataIDs,
-          _addedData = _t$dataMatch2.addedData,
-          _updatedData = _t$dataMatch2.updatedData;
+            _deletedDataIDs = _t$dataMatch2.deletedDataIDs,
+            _addedData = _t$dataMatch2.addedData,
+            _updatedData = _t$dataMatch2.updatedData;
+
         var _t$dealAdd = t.dealAdd(_addedData, [].concat(_toConsumableArray(pointIds), _toConsumableArray(point))),
-          ads = _t$dealAdd.ads,
-          otherupds = _t$dealAdd.otherupds;
+            ads = _t$dealAdd.ads,
+            otherupds = _t$dealAdd.otherupds;
+
         var _t$dealUpdate = t.dealUpdate(_updatedData, [].concat(_toConsumableArray(pointIds), _toConsumableArray(point))),
-          upds = _t$dealUpdate.upds,
-          otherads = _t$dealUpdate.otherads;
-        //删在增之前,(因为增加后会刷新pointIds的值,造成多删的问题)
+            upds = _t$dealUpdate.upds,
+            otherads = _t$dealUpdate.otherads; //删在增之前,(因为增加后会刷新pointIds的值,造成多删的问题)
+
+
         var _iterator = _createForOfIteratorHelper(_deletedDataIDs),
-          _step;
+            _step;
+
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var id = _step.value;
             t.removeGraphic(id, 'point');
-          }
-          //增加
+          } //增加
+
         } catch (err) {
           _iterator.e(err);
         } finally {
           _iterator.f();
         }
-        t.addPoint([].concat(_toConsumableArray(ads), _toConsumableArray(otherads)));
-        //更新
+
+        t.addPoint([].concat(_toConsumableArray(ads), _toConsumableArray(otherads))); //更新
+
         t.updatePoint([].concat(_toConsumableArray(upds), _toConsumableArray(otherupds)));
       }
       /*
           面数据处理
           先全删除,再新增
       */
+
+
       if (mapPolygons instanceof Array && props.mapPolygons instanceof Array && !t.deepEqual(mapPolygons, props.mapPolygons)) {
         var oldMapPolygons = props.mapPolygons;
         var newMapPolygons = mapPolygons;
+
         if (!!t.state.editId) {
           oldMapPolygons = props.mapPolygons.filter(function (item) {
             return item.id !== editGraphicId;
@@ -3063,41 +3456,50 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             return item.id !== editGraphicId;
           });
         }
+
         var _t$dataMatch3 = t.dataMatch(oldMapPolygons, newMapPolygons, 'id'),
-          _deletedDataIDs2 = _t$dataMatch3.deletedDataIDs,
-          _addedData2 = _t$dataMatch3.addedData,
-          _updatedData2 = _t$dataMatch3.updatedData;
+            _deletedDataIDs2 = _t$dataMatch3.deletedDataIDs,
+            _addedData2 = _t$dataMatch3.addedData,
+            _updatedData2 = _t$dataMatch3.updatedData;
+
         var _t$dealAdd2 = t.dealAdd(_addedData2, [].concat(_toConsumableArray(rectangle), _toConsumableArray(polygon), _toConsumableArray(polygonIds))),
-          _ads = _t$dealAdd2.ads,
-          _otherupds = _t$dealAdd2.otherupds;
+            _ads = _t$dealAdd2.ads,
+            _otherupds = _t$dealAdd2.otherupds;
+
         var _t$dealUpdate2 = t.dealUpdate(_updatedData2, [].concat(_toConsumableArray(rectangle), _toConsumableArray(polygon), _toConsumableArray(polygonIds))),
-          _upds = _t$dealUpdate2.upds,
-          _otherads = _t$dealUpdate2.otherads;
-        //删在增之前,(因为增加后会刷新pointIds的值,造成多删的问题)
+            _upds = _t$dealUpdate2.upds,
+            _otherads = _t$dealUpdate2.otherads; //删在增之前,(因为增加后会刷新pointIds的值,造成多删的问题)
+
+
         var _iterator2 = _createForOfIteratorHelper(_deletedDataIDs2),
-          _step2;
+            _step2;
+
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var _id = _step2.value;
             t.removeGraphic(_id, 'polygon');
-          }
-          //增加
+          } //增加
+
         } catch (err) {
           _iterator2.e(err);
         } finally {
           _iterator2.f();
         }
-        t.addPolygon([].concat(_toConsumableArray(_ads), _toConsumableArray(_otherads)));
-        //更新
+
+        t.addPolygon([].concat(_toConsumableArray(_ads), _toConsumableArray(_otherads))); //更新
+
         t.updatePolygon([].concat(_toConsumableArray(_upds), _toConsumableArray(_otherupds)));
       }
       /*
           圆数据处理
           先全删除,再新增
       */
+
+
       if (mapCircles instanceof Array && props.mapCircles instanceof Array && !t.deepEqual(mapCircles, props.mapCircles)) {
         var oldMapCircles = props.mapCircles;
         var newMapCircles = mapCircles;
+
         if (!!t.state.editId) {
           oldMapCircles = props.mapCircles.filter(function (item) {
             return item.id !== editGraphicId;
@@ -3106,41 +3508,50 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             return item.id !== editGraphicId;
           });
         }
+
         var _t$dataMatch4 = t.dataMatch(oldMapCircles, newMapCircles, 'id'),
-          _deletedDataIDs3 = _t$dataMatch4.deletedDataIDs,
-          _addedData3 = _t$dataMatch4.addedData,
-          _updatedData3 = _t$dataMatch4.updatedData;
+            _deletedDataIDs3 = _t$dataMatch4.deletedDataIDs,
+            _addedData3 = _t$dataMatch4.addedData,
+            _updatedData3 = _t$dataMatch4.updatedData;
+
         var _t$dealAdd3 = t.dealAdd(_addedData3, [].concat(_toConsumableArray(circleIds), _toConsumableArray(circle))),
-          _ads2 = _t$dealAdd3.ads,
-          _otherupds2 = _t$dealAdd3.otherupds;
+            _ads2 = _t$dealAdd3.ads,
+            _otherupds2 = _t$dealAdd3.otherupds;
+
         var _t$dealUpdate3 = t.dealUpdate(_updatedData3, [].concat(_toConsumableArray(circleIds), _toConsumableArray(circle))),
-          _upds2 = _t$dealUpdate3.upds,
-          _otherads2 = _t$dealUpdate3.otherads;
-        //删在增之前,(因为增加后会刷新pointIds的值,造成多删的问题)
+            _upds2 = _t$dealUpdate3.upds,
+            _otherads2 = _t$dealUpdate3.otherads; //删在增之前,(因为增加后会刷新pointIds的值,造成多删的问题)
+
+
         var _iterator3 = _createForOfIteratorHelper(_deletedDataIDs3),
-          _step3;
+            _step3;
+
         try {
           for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
             var _id2 = _step3.value;
             t.removeGraphic(_id2, 'circle');
-          }
-          //增加
+          } //增加
+
         } catch (err) {
           _iterator3.e(err);
         } finally {
           _iterator3.f();
         }
-        t.addCircle([].concat(_toConsumableArray(_ads2), _toConsumableArray(_otherads2)));
-        //更新
+
+        t.addCircle([].concat(_toConsumableArray(_ads2), _toConsumableArray(_otherads2))); //更新
+
         t.updateCircle([].concat(_toConsumableArray(_upds2), _toConsumableArray(_otherupds2)));
       }
       /*
           线数据处理
           先全删除,再新增
       */
+
+
       if (mapLines instanceof Array && props.mapLines instanceof Array && !t.deepEqual(mapLines, props.mapLines)) {
         var oldMapLines = props.mapLines;
         var newMapLines = mapLines;
+
         if (!!t.state.editId) {
           oldMapLines = props.mapLines.filter(function (item) {
             return item.id !== editGraphicId;
@@ -3149,43 +3560,52 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             return item.id !== editGraphicId;
           });
         }
+
         var _t$dataMatch5 = t.dataMatch(oldMapLines, newMapLines, 'id'),
-          _deletedDataIDs4 = _t$dataMatch5.deletedDataIDs,
-          _addedData4 = _t$dataMatch5.addedData,
-          _updatedData4 = _t$dataMatch5.updatedData;
+            _deletedDataIDs4 = _t$dataMatch5.deletedDataIDs,
+            _addedData4 = _t$dataMatch5.addedData,
+            _updatedData4 = _t$dataMatch5.updatedData;
+
         var _t$dealAdd4 = t.dealAdd(_addedData4, [].concat(_toConsumableArray(lineIds), _toConsumableArray(polyline))),
-          _ads3 = _t$dealAdd4.ads,
-          _otherupds3 = _t$dealAdd4.otherupds;
+            _ads3 = _t$dealAdd4.ads,
+            _otherupds3 = _t$dealAdd4.otherupds;
+
         var _t$dealUpdate4 = t.dealUpdate(_updatedData4, [].concat(_toConsumableArray(lineIds), _toConsumableArray(polyline))),
-          _upds3 = _t$dealUpdate4.upds,
-          _otherads3 = _t$dealUpdate4.otherads;
-        //删在增之前,(因为增加后会刷新pointIds的值,造成多删的问题)
+            _upds3 = _t$dealUpdate4.upds,
+            _otherads3 = _t$dealUpdate4.otherads; //删在增之前,(因为增加后会刷新pointIds的值,造成多删的问题)
+
+
         var _iterator4 = _createForOfIteratorHelper(_deletedDataIDs4),
-          _step4;
+            _step4;
+
         try {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
             var _id3 = _step4.value;
             t.removeGraphic(_id3, 'line');
-          }
-          //增加
+          } //增加
+
         } catch (err) {
           _iterator4.e(err);
         } finally {
           _iterator4.f();
         }
-        t.addLine([].concat(_toConsumableArray(_ads3), _toConsumableArray(_otherads3)));
-        //更新
+
+        t.addLine([].concat(_toConsumableArray(_ads3), _toConsumableArray(_otherads3))); //更新
+
         t.updateLine([].concat(_toConsumableArray(_upds3), _toConsumableArray(_otherupds3)));
-      }
-      //画其他特例线专用
+      } //画其他特例线专用
+
+
       if (customizedBoundary instanceof Array && props.customizedBoundary instanceof Array && !t.deepEqual(customizedBoundary, props.customizedBoundary)) {
         var _t$dataMatch6 = t.dataMatch(props.customizedBoundary, customizedBoundary, 'id'),
-          _deletedDataIDs5 = _t$dataMatch6.deletedDataIDs,
-          _addedData5 = _t$dataMatch6.addedData,
-          _updatedData5 = _t$dataMatch6.updatedData;
-        //删在增之前,(因为增加后会刷新pointIds的值,造成多删的问题)
+            _deletedDataIDs5 = _t$dataMatch6.deletedDataIDs,
+            _addedData5 = _t$dataMatch6.addedData,
+            _updatedData5 = _t$dataMatch6.updatedData; //删在增之前,(因为增加后会刷新pointIds的值,造成多删的问题)
+
+
         var _iterator5 = _createForOfIteratorHelper(_deletedDataIDs5),
-          _step5;
+            _step5;
+
         try {
           for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
             var _id4 = _step5.value;
@@ -3196,10 +3616,12 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         } finally {
           _iterator5.f();
         }
+
         t.addLine(_addedData5);
         t.updateLine(_updatedData5);
-      }
-      //绘制边界线
+      } //绘制边界线
+
+
       if (boundaryName instanceof Array && props.boundaryName instanceof Array && !t.deepEqual(boundaryName, props.boundaryName)) {
         var newBDName = Set(boundaryName);
         var oldBDName = Set(props.boundaryName);
@@ -3207,123 +3629,155 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         var addedBoundaryName = newBDName.subtract(oldBDName).toJS();
         t.removeBaiduBoundary(removedBoundaryName);
         t.addBaiduBoundary(addedBoundaryName);
-      }
-      // 获取热力图
+      } // 获取热力图
+
+
       if (heatMapData && !t.deepEqual(heatMapData, props.heatMapData)) {
         t.heatMapOverlay(heatMapData);
-      }
-      // 打开信息窗体
+      } // 打开信息窗体
+
+
       if (infoWindowData && !t.deepEqual(infoWindowData, props.infoWindowData)) {
         t.infoWindow(infoWindowData);
-      }
-      //添加图片图层
+      } //添加图片图层
+
+
       if (imageOverlays instanceof Array && props.imageOverlays instanceof Array && !t.deepEqual(imageOverlays, props.imageOverlays)) {
         t.imageUrlOverlay(imageOverlays);
-      }
-      //图元编辑调用
+      } //图元编辑调用
+
+
       if (typeof isDoEdit == 'boolean' && isDoEdit || isDoEdit && isDoEdit !== t.props.isDoEdit) {
         t.doEdit(editGraphicId);
-      }
-      //关闭图元编辑
+      } //关闭图元编辑
+
+
       if (typeof isEndEdit == 'boolean' && isEndEdit || isEndEdit && isEndEdit !== t.props.isEndEdit) {
         t.endEdit();
-      }
-      //开启图元绘制
+      } //开启图元绘制
+
+
       if (typeof isDraw == 'boolean' && isDraw || isDraw && isDraw !== t.props.isDraw) {
         t.draw(mapDraw);
-      }
-      //关闭图元绘制
+      } //关闭图元绘制
+
+
       if (typeof isCloseDraw == 'boolean' && isCloseDraw || isCloseDraw && isCloseDraw !== t.props.isCloseDraw) {
         t.closeDraw();
-      }
-      //设置中心点
+      } //设置中心点
+
+
       if (typeof setCenter == 'boolean' && setCenter || setCenter && setCenter !== t.props.setCenter) {
         t.setCenter(mapCenter);
-      }
-      //设置点聚合
+      } //设置点聚合
+
+
       if (typeof setCluster == 'boolean' && setCluster || setCluster && setCluster !== t.props.setCluster) {
         t.cluster(mapCluster);
-      }
-      //设置比例尺
+      } // 清除聚合
+
+
+      if (!setCluster && setCluster !== t.props.setCluster) {
+        t.removeCluster(mapCluster);
+      } //设置比例尺
+
+
       if (typeof setZoomLevel == 'boolean' && setZoomLevel || setZoomLevel && setZoomLevel !== t.props.setZoomLevel) {
         t.setZoomLevel(mapZoomLevel);
-      }
-      //设置最优视野
+      } //设置最优视野
+
+
       if (typeof setVisiblePoints == 'boolean' && setVisiblePoints || setVisiblePoints && setVisiblePoints !== t.props.setVisiblePoints) {
         t.setVisiblePoints(mapVisiblePoints);
-      }
-      //测距工具调用
+      } //测距工具调用
+
+
       if (typeof isRangingTool == 'boolean' && isRangingTool || isRangingTool && isRangingTool !== t.props.isRangingTool) {
         t.vtxRangingTool(mapRangingTool);
-      }
-      //开关路况
+      } //开关路况
+
+
       if (isOpenTrafficInfo) {
         t.openTrafficInfo();
       } else {
         t.hideTrafficInfo();
-      }
-      //设置区域限制
+      } //设置区域限制
+
+
       if (typeof isSetAreaRestriction == 'boolean' && isSetAreaRestriction || isSetAreaRestriction && isSetAreaRestriction !== t.props.isSetAreaRestriction && areaRestriction && !!areaRestriction[0] && !!areaRestriction[1]) {
         t.setAreaRestriction(areaRestriction);
-      }
-      //关闭区域限制
+      } //关闭区域限制
+
+
       if (typeof isClearAreaRestriction == 'boolean' && isClearAreaRestriction || isClearAreaRestriction && isClearAreaRestriction !== t.props.isClearAreaRestriction) {
         t.clearAreaRestriction();
-      }
-      //清空地图
+      } //清空地图
+
+
       if (typeof isClearAll == 'boolean' && isClearAll || isClearAll && isClearAll !== t.props.isClearAll) {
         t.clearAll();
-      }
-      //删除指定图元
+      } //删除指定图元
+
+
       if (typeof isRemove == 'boolean' && isRemove || isRemove && isRemove !== t.props.isRemove) {
         mapRemove.map(function (item, index) {
           t.removeGraphic(item.id, item.type);
         });
-      }
-      // 比例尺控件位置改变
+      } // 比例尺控件位置改变
+
+
       if (nextProps.showControl && JSON.stringify(nextProps.showControl) != JSON.stringify(t.props.showControl)) {
         t.showControl(nextProps);
-      }
-      // 比例尺移除
+      } // 比例尺移除
+
+
       if (!nextProps.showControl) {
         t.removeControl();
-      }
-      // 地图类型控件位置改变
+      } // 地图类型控件位置改变
+
+
       if (nextProps.satelliteSwitch && JSON.stringify(nextProps.satelliteSwitch) != JSON.stringify(t.props.satelliteSwitch)) {
         t.showMapTypeControl(nextProps);
       }
-    }
-    // 初始化对外方法
+    } // 初始化对外方法
+
   }, {
     key: "initPropsForUser",
     value: function initPropsForUser() {
-      var t = this;
-      // t.state.gis["getCenter"] = () => {
+      var t = this; // t.state.gis["getCenter"] = () => {
       //     return t.getCurrentCenter();
       // }
+
       t.state.gis["setMapCenter"] = function (gt) {
         t.setCenter(gt);
       };
+
       t.state.gis["getZoomLevel"] = function () {
         return t.getZoomLevel();
       };
+
       t.state.gis["showInfoWindow"] = function (obj) {
         return t.showInfoWindow(obj);
       };
+
       t.state.gis["hideInfoWindow"] = function () {
         return t.hideInfoWindow();
       };
+
       t.state.gis["frameSelect"] = function () {
         var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         var callback = arguments.length > 1 ? arguments[1] : undefined;
         return t.frameSelect(obj, callback);
       };
+
       t.state.gis["clearFrameSelect"] = function () {
         return t.clearFrameSelect();
       };
+
       t.state.gis["clearFrameSelectById"] = function (id) {
         return t.clearFrameSelectById(id);
       };
+
       t.state.gis["refresh"] = function () {
         t.refresh();
       };
@@ -3333,18 +3787,25 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
     value: function componentWillUnmount() {
       //关闭moveTo定时
       var t = this;
+
       if (t.state.gis) {
         t.state.gis.clearOverlays();
       }
+
       t.state.gis = null;
+
       if (t.moveToTimer) {
         clearInterval(t.moveToTimer);
       }
+
       window.VtxMap && (window.VtxMap[t.state.mapId] = null);
     }
   }]);
+
   return BaiduMap;
 }(_react["default"].Component);
-var _default = exports["default"] = BaiduMap;
+
+var _default = BaiduMap;
+exports["default"] = _default;
 module.exports = exports["default"];
 //# sourceMappingURL=Map.js.map