@vtx/map 1.2.32 → 2.0.0-beta.1

package/lib/VtxMap/BMap/Map.js

@@ -9,9 +9,10 @@ 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 _unionBy = _interopRequireDefault(require("lodash-es/unionBy"));
+var _default2 = _interopRequireWildcard(require("../../default"));
 var _antd = require("antd");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 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; }
@@ -128,70 +129,70 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       var loadList = [];
       if (!window.BMapLib || !window.BMapLib.DistanceTool) {
         loadList.push(new Promise(function (resolve, reject) {
-          $.getScript("".concat(_default2["default"].mapServerURL, "/DistanceTool_min.js"), function () {
+          (0, _default2.loadScript)("".concat(_default2["default"].mapServerURL, "/DistanceTool_min.js"), function () {
             resolve();
           });
         }));
       }
       if (!window.BMapLib || !window.BMapLib.TrafficControl) {
         loadList.push(new Promise(function (resolve, reject) {
-          $.getScript("".concat(_default2["default"].mapServerURL, "/TrafficControl_min.js"), function () {
+          (0, _default2.loadScript)("".concat(_default2["default"].mapServerURL, "/TrafficControl_min.js"), function () {
             resolve();
           });
         }));
       }
       if (!window.BMapLib || !window.BMapLib.MarkerClusterer) {
         loadList.push(new Promise(function (resolve, reject) {
-          $.getScript("".concat(_default2["default"].mapServerURL, "/MarkerClusterer_min.js"), function () {
+          (0, _default2.loadScript)("".concat(_default2["default"].mapServerURL, "/MarkerClusterer_min.js"), function () {
             resolve();
           });
         }));
       }
       if (!window.BMapLib || !window.BMapLib.AreaRestriction) {
         loadList.push(new Promise(function (resolve, reject) {
-          $.getScript("".concat(_default2["default"].mapServerURL, "/AreaRestriction_min.js"), function () {
+          (0, _default2.loadScript)("".concat(_default2["default"].mapServerURL, "/AreaRestriction_min.js"), function () {
             resolve();
           });
         }));
       }
       if (!window.BMapLib || !window.BMapLib.DrawingManager) {
         loadList.push(new Promise(function (resolve, reject) {
-          $.getScript("".concat(_default2["default"].mapServerURL, "/DrawingManager_min.js"), function () {
+          (0, _default2.loadScript)("".concat(_default2["default"].mapServerURL, "/DrawingManager_min.js"), function () {
             resolve();
           });
         }));
       }
       if (!window.BMapLib || !window.BMapLib.HeatmapOverlay) {
         loadList.push(new Promise(function (resolve, reject) {
-          $.getScript("".concat(_default2["default"].mapServerURL, "/Heatmap_min.js"), function () {
+          (0, _default2.loadScript)("".concat(_default2["default"].mapServerURL, "/Heatmap_min.js"), function () {
             resolve();
           });
         }));
       }
       if (!window.BMapLib || !window.BMapLib.GeoUtils) {
         loadList.push(new Promise(function (resolve, reject) {
-          $.getScript("".concat(_default2["default"].mapServerURL, "/GeoUtils_min.js"), function () {
+          (0, _default2.loadScript)("".concat(_default2["default"].mapServerURL, "/GeoUtils_min.js"), function () {
             resolve();
           });
         }));
       }
       if (!window.BMapLib || !window.BMapLib.TextIconOverlay) {
         loadList.push(new Promise(function (resolve, reject) {
-          $.getScript("".concat(_default2["default"].mapServerURL, "/TextIconOverlay_min.js"), function () {
+          (0, _default2.loadScript)("".concat(_default2["default"].mapServerURL, "/TextIconOverlay_min.js"), function () {
             resolve();
           });
         }));
       }
       if (!window.BMapLib || !window.BMapLib.InfoBox) {
         loadList.push(new Promise(function (resolve, reject) {
-          $.getScript("".concat(_default2["default"].mapServerURL, "/InfoBox_min.js"), function () {
+          (0, _default2.loadScript)("".concat(_default2["default"].mapServerURL, "/InfoBox_min.js"), function () {
             resolve();
           });
         }));
         loadList.push();
       }
       loadList.push(new Promise(function (resolve, reject) {
-        $.getScript("".concat(_default2["default"].mapServerURL, "/TextIconOverlay_min.js"), function () {
+        (0, _default2.loadScript)("".concat(_default2["default"].mapServerURL, "/TextIconOverlay_min.js"), function () {
           resolve();
         });
       }));
@@ -204,19 +205,21 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
     value: function loadMapJs() {
       var _this2 = this;
       this.loadMapComplete = new Promise(function (resolve, reject) {
-        if (window.BMap) {
-          resolve(_this2.loadPlugin());
-        } else {
-          // EVlFc6DZzAzU5avIjoxNcFgQ
-          $.getScript(_default2["default"].bmapScriptUrl, function () {
+        (0, _default2.ensurejQuery)().then(function () {
+          if (window.BMap) {
             resolve(_this2.loadPlugin());
-          });
-          $("<link>").attr({
-            rel: "stylesheet",
-            type: "text/css",
-            href: '//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.css'
-          }).appendTo("head");
-        }
+          } else {
+            // EVlFc6DZzAzU5avIjoxNcFgQ
+            $.getScript(_default2["default"].bmapScriptUrl, function () {
+              resolve(_this2.loadPlugin());
+            });
+            $("<link>").attr({
+              rel: "stylesheet",
+              type: "text/css",
+              href: '//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.css'
+            }).appendTo("head");
+          }
+        });
       });
     }
     //初始化地图数据
@@ -510,12 +513,12 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       }
       t.initPropsForUser();
     }
-    /* 
-        切换地图矢量图和卫星图背景
-        type: 
-            BMAP_NORMAL_MAP  矢量图
-            BMAP_SATELLITE_MAP 单卫星图  (暂定不用)
-            BMAP_HYBRID_MAP 卫星路况图
+    /* 
+        切换地图矢量图和卫星图背景
+        type: 
+            BMAP_NORMAL_MAP  矢量图
+            BMAP_SATELLITE_MAP 单卫星图  (暂定不用)
+            BMAP_HYBRID_MAP 卫星路况图
     */
   }, {
     key: "setMapType",
@@ -607,7 +610,7 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         var position = new BMap.Point(item.longitude, item.latitude);
         var marker = null;
         if (item.markerContent) {
-          /*自定义html加点
+          /*自定义html加点
            用Label来实现,无法再添加label(高德有判断,实现不同)*/
           //覆盖物参数
           var markerOption = {
@@ -1686,10 +1689,10 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       t.state.gis.setZoom(zoom);
     }
     //将制定图元展示在视野内 (强制改变地图中心位置)
-    /*
-        参数arg格式如下1,2
-        1.string   格式如:'1,a,2,3,4'
-        2.数组 ['1','2']
+    /*
+        参数arg格式如下1,2
+        1.string   格式如:'1,a,2,3,4'
+        2.数组 ['1','2']
     */
   }, {
     key: "setVisiblePoints",
@@ -1720,17 +1723,17 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
           break;
       }
 
-      /**
-       * 用法
-       * map.setVisiblePoints('lng,lat;lng,lat')
+      /**
+       * 用法
+       * map.setVisiblePoints('lng,lat;lng,lat')
        */
       if (typeof arg === 'string') {
         ary = arg.split(',');
         obj = t.getFitView(ary);
       } else if (arg instanceof Array) {
-        /**
-         * 用法
-         * map.setVisiblePoints([[lng,lat],[lng,lat]])
+        /**
+         * 用法
+         * map.setVisiblePoints([[lng,lat],[lng,lat]])
         */
         if (arg[0] instanceof Array) {
           var a = [];
@@ -1738,9 +1741,9 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
             a.push(new BMap.Point(arg[i][0], arg[i][1]));
           }
           obj = t.state.gis.getViewport(a);
-          /**
-           * 用法
-           * map.setVisiblePoints(['lng,lat','lng,lat'])
+          /**
+           * 用法
+           * map.setVisiblePoints(['lng,lat','lng,lat'])
           */
         } else {
           obj = t.getFitView(arg);
@@ -3028,10 +3031,10 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
       if (typeof isclearAllPointCollection == 'boolean' && isclearAllPointCollection || isclearAllPointCollection && isclearAllPointCollection !== t.props.isclearAllPointCollection) {
         t.clearAllPointCollection();
       }
-      /*点数据处理
-          pointData[2]相同的点,执行刷新
-          pointData[1]的数据在idsForGraphicId中不存在的,执行新增
-          pointData[0]数据中多余的id,执行删除
+      /*点数据处理
+          pointData[2]相同的点,执行刷新
+          pointData[1]的数据在idsForGraphicId中不存在的,执行新增
+          pointData[0]数据中多余的id,执行删除
       */
       if (mapPoints instanceof Array && props.mapPoints instanceof Array && !t.deepEqual(mapPoints, props.mapPoints)) {
         var oldMapPoints = props.mapPoints;
@@ -3073,9 +3076,9 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         //更新
         t.updatePoint([].concat(_toConsumableArray(upds), _toConsumableArray(otherupds)));
       }
-      /*
-          面数据处理
-          先全删除,再新增
+      /*
+          面数据处理
+          先全删除,再新增
       */
       if (mapPolygons instanceof Array && props.mapPolygons instanceof Array && !t.deepEqual(mapPolygons, props.mapPolygons)) {
         var oldMapPolygons = props.mapPolygons;
@@ -3116,9 +3119,9 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         //更新
         t.updatePolygon([].concat(_toConsumableArray(_upds), _toConsumableArray(_otherupds)));
       }
-      /*
-          圆数据处理
-          先全删除,再新增
+      /*
+          圆数据处理
+          先全删除,再新增
       */
       if (mapCircles instanceof Array && props.mapCircles instanceof Array && !t.deepEqual(mapCircles, props.mapCircles)) {
         var oldMapCircles = props.mapCircles;
@@ -3159,9 +3162,9 @@ var BaiduMap = /*#__PURE__*/function (_React$Component) {
         //更新
         t.updateCircle([].concat(_toConsumableArray(_upds2), _toConsumableArray(_otherupds2)));
       }
-      /*
-          线数据处理
-          先全删除,再新增
+      /*
+          线数据处理
+          先全删除,再新增
       */
       if (mapLines instanceof Array && props.mapLines instanceof Array && !t.deepEqual(mapLines, props.mapLines)) {
         var oldMapLines = props.mapLines;