@vtx/map 1.1.48 → 1.1.49

package/lib/VtxMap/OlMap/Map.js

@@ -192,11 +192,11 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
       clusters: null,
       clusterCircles: null
     };
+    _this.mapCreated = false;
     _this.state = {
       gis: null,
       //地图对象
       mapId: props.mapId,
-      mapCreated: false,
       pointIds: [],
       //地图上点的ids
       lineIds: [],
@@ -259,6 +259,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "init",
     value: function init() {
+      var _this2 = this;
       var t = this;
       // 创建地图
       t.createMap();
@@ -321,9 +322,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         if (areaRestriction && !!areaRestriction[0] && !!areaRestriction[1]) {
           t.setAreaRestriction(areaRestriction);
         }
-        t.setState({
-          mapCreated: true
-        });
+        _this2.mapCreated = true;
       };
       var event = function event(e, status) {
         var gis = t.state.gis;
@@ -1963,13 +1962,13 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "addPoint",
     value: function addPoint(mapPoints, type) {
-      var _this2 = this;
+      var _this3 = this;
       var t = this;
       var ps = [];
       var psids = _toConsumableArray(t.state.pointIds);
       mapPoints.map(function (item, index) {
         //如果id重复,直接跳过不执行.
-        if (_this2.GM.isRepetition(item.id)) {
+        if (_this3.GM.isRepetition(item.id)) {
           console.warn("\u52A0\u70B9id: ".concat(item.id, " \u91CD\u590D"));
           return false;
         }
@@ -2120,7 +2119,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         }
         psids.push(item.id);
         //缓存图元的数据,偏于后期操作
-        _this2.GM.setGraphic(item.id, feature).setGraphicParam(item.id, {
+        _this3.GM.setGraphic(item.id, feature).setGraphicParam(item.id, {
           attributes: _objectSpread(_objectSpread({}, item), {}, {
             other: item
           }),
@@ -2144,12 +2143,12 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "updatePoint",
     value: function updatePoint() {
-      var _this3 = this;
+      var _this4 = this;
       var mapPoints = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       var t = this;
       var index = 0;
       var dealPoint = function dealPoint(item) {
-        if (_this3.GM.isRepetition(item.id)) {
+        if (_this4.GM.isRepetition(item.id)) {
           //点位数据不符合,直接跳过
           if (!item.longitude || !item.latitude) {
             console.warn("\u70B9 \u7ECF\u7EAC\u5EA6 \u6570\u636E\u9519\u8BEF");
@@ -2251,7 +2250,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
             }
           }
           gc.setGeometry(new ol.geom.Point([parseFloat(item.longitude), parseFloat(item.latitude)]));
-          _this3.GM.setGraphicParam(item.id, {
+          _this4.GM.setGraphicParam(item.id, {
             attributes: _objectSpread(_objectSpread({}, item), {}, {
               other: item
             }),
@@ -2295,14 +2294,14 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "addLine",
     value: function addLine(mapLines, type) {
-      var _this4 = this;
+      var _this5 = this;
       var t = this;
       var ls = [];
       var lsids = _toConsumableArray(t.state.lineIds);
       //遍历添加线(图元)
       mapLines.map(function (item, index) {
         //如果id重复,直接跳过不执行.
-        if (_this4.GM.isRepetition(item.id)) {
+        if (_this5.GM.isRepetition(item.id)) {
           console.warn("\u591A\u6298\u7EBFid: ".concat(item.id, " \u91CD\u590D"));
           return false;
         }
@@ -2349,7 +2348,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         var pts = item.paths.map(function (itt, ind) {
           return _toConsumableArray(itt);
         });
-        _this4.GM.setGraphic(item.id, polyline).setGraphicParam(item.id, {
+        _this5.GM.setGraphic(item.id, polyline).setGraphicParam(item.id, {
           attributes: _objectSpread(_objectSpread({}, item), {}, {
             paths: pts,
             other: item
@@ -2373,12 +2372,12 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "updateLine",
     value: function updateLine(mapLines) {
-      var _this5 = this;
+      var _this6 = this;
       var t = this;
       //遍历添加线(图元)
       mapLines.map(function (item, index) {
         //判断图元是否存在.
-        if (_this5.GM.isRepetition(item.id)) {
+        if (_this6.GM.isRepetition(item.id)) {
           //多折线点位数据不符合,直接跳过
           if (!(item.paths && item.paths.length >= 2)) {
             console.warn("\u591A\u6298\u7EBFpaths\u6570\u636E\u9519\u8BEF");
@@ -2394,8 +2393,8 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
             isHidden: false
           };
           //获取原有的图元
-          var gc = _this5.GM.getGraphic(item.id);
-          var gp = _this5.GM.getGraphicParam(item.id);
+          var gc = _this6.GM.getGraphic(item.id);
+          var gp = _this6.GM.getGraphicParam(item.id);
           //重新初始化值
           if (item.config) {
             cg = _objectSpread(_objectSpread({}, cg), item.config);
@@ -2415,7 +2414,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
             return style;
           });
           gc.setGeometry(new ol.geom.LineString(pts));
-          _this5.GM.setGraphicParam(item.id, {
+          _this6.GM.setGraphicParam(item.id, {
             attributes: _objectSpread(_objectSpread({}, item), {}, {
               paths: pts,
               other: item
@@ -2437,14 +2436,14 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "addPolygon",
     value: function addPolygon(mapPolygons) {
-      var _this6 = this;
+      var _this7 = this;
       var t = this;
       var pgs = [];
       var pgsids = _toConsumableArray(t.state.polygonIds);
       //遍历添加面(图元)
       mapPolygons.map(function (item, index) {
         //如果id重复,直接跳过不执行.
-        if (_this6.GM.isRepetition(item.id)) {
+        if (_this7.GM.isRepetition(item.id)) {
           console.warn("\u591A\u8FB9\u5F62id: ".concat(item.id, " \u91CD\u590D"));
           return false;
         }
@@ -2495,7 +2494,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         var pts = item.rings.map(function (itt, ind) {
           return _toConsumableArray(itt);
         });
-        _this6.GM.setGraphic(item.id, polygon).setGraphicParam(item.id, {
+        _this7.GM.setGraphic(item.id, polygon).setGraphicParam(item.id, {
           attributes: _objectSpread(_objectSpread({}, item), {}, {
             rings: pts,
             other: item
@@ -2516,18 +2515,18 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "updatePolygon",
     value: function updatePolygon(mapPolygons) {
-      var _this7 = this;
+      var _this8 = this;
       var t = this;
       mapPolygons.map(function (item, index) {
         //判断图元是否存在.
-        if (_this7.GM.isRepetition(item.id)) {
+        if (_this8.GM.isRepetition(item.id)) {
           //多边形点位数据不符合,直接跳过
           if (!(item.rings && item.rings.length >= 3)) {
             console.warn("\u591A\u8FB9\u5F62rings\u6570\u636E\u9519\u8BEF");
             return false;
           }
           //获取原有的图元
-          var gc = _this7.GM.getGraphic(item.id);
+          var gc = _this8.GM.getGraphic(item.id);
           var gp = t.GM.getGraphicParam(item.id);
           //获取原有的面属性,转换key值
           var cg = {
@@ -2556,7 +2555,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
               color: cg.pellucidity ? getRgbColor(cg.color, cg.pellucidity) : cg.color
             })
           }));
-          _this7.GM.setGraphicParam(item.id, {
+          _this8.GM.setGraphicParam(item.id, {
             attributes: _objectSpread(_objectSpread({}, item), {}, {
               rings: pts,
               other: item
@@ -3580,8 +3579,8 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
     }
     //已加载组件，收到新的参数时调用
   }, {
-    key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps, prevProps) {
+    key: "UNSAFE_componentWillReceiveProps",
+    value: function UNSAFE_componentWillReceiveProps(nextProps, prevProps) {
       var t = this;
       //点/线旧数据
       var _t$state2 = t.state,
@@ -3635,7 +3634,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         isClearAll = nextProps.isClearAll,
         olProps = nextProps.olProps;
       // 等待地图加载
-      if (!t.state.mapCreated) return;
+      if (!t.mapCreated) return;
       /*点数据处理
           pointData[2]相同的点,执行刷新
           pointData[1]的数据在idsForGraphicId中不存在的,执行新增
@@ -3924,7 +3923,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "getFeatureInfo",
     value: function getFeatureInfo(event, view, source) {
-      var _this8 = this;
+      var _this9 = this;
       var sourceParam = source.getParams();
       var url = source.getFeatureInfoUrl(event.coordinate, view.getResolution(), view.getProjection(), {
         cql_filter: sourceParam === null || sourceParam === void 0 ? void 0 : sourceParam.cql_filter,
@@ -3954,7 +3953,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
         if (data !== null && data !== void 0 && (_data$features = data.features) !== null && _data$features !== void 0 && _data$features.length) {
           features = geoJsonFormat.readFeatures(data);
           features.map(function (item) {
-            item.key = _this8 === null || _this8 === void 0 ? void 0 : _this8.key;
+            item.key = _this9 === null || _this9 === void 0 ? void 0 : _this9.key;
           });
         }
         return features;
@@ -4188,16 +4187,16 @@ var Popup = /*#__PURE__*/function (_React$Component2) {
   _inherits(Popup, _React$Component2);
   var _super2 = _createSuper(Popup);
   function Popup(props) {
-    var _this9;
+    var _this10;
     _classCallCheck(this, Popup);
-    _this9 = _super2.call(this);
-    _this9.map = props.map;
-    _this9.position = props.position;
-    _this9.overlay = null;
-    _this9.container = null;
-    _this9.innerHTML = props.innerHTML;
-    _this9.closeble = props.close;
-    return _this9;
+    _this10 = _super2.call(this);
+    _this10.map = props.map;
+    _this10.position = props.position;
+    _this10.overlay = null;
+    _this10.container = null;
+    _this10.innerHTML = props.innerHTML;
+    _this10.closeble = props.close;
+    return _this10;
   }
 
   // 弹出框