@vtx/map 1.1.30 → 1.1.32

package/lib/VtxMap/TMap/TMap.js

@@ -398,6 +398,10 @@ var TMap = /*#__PURE__*/function (_React$Component) {
       t.state.gis["clearFrameSelect"] = function () {
         return t.clearFrameSelect();
       };
+
+      t.state.gis["clearFrameSelectById"] = function (id) {
+        return t.clearFrameSelectById(id);
+      };
     } // 框选
 
   }, {
@@ -417,7 +421,7 @@ var TMap = /*#__PURE__*/function (_React$Component) {
       var t = this;
       var params = {},
           type = geometryType || 'polygon',
-          id = data.id || 'frameSelectFeature';
+          id = data.id || "frameSelectFeature_".concat(Math.random());
       params.color = parameter.color || 'red';
       params.lineColor = parameter.lineColor || 'red';
       params.lineOpacity = parameter.lineOpacity || 1;
@@ -431,7 +435,7 @@ var TMap = /*#__PURE__*/function (_React$Component) {
           id: id
         }
       });
-      t.frameSelectProps = {
+      t.frameSelectProps[id] = {
         callback: callback,
         id: id,
         type: geometryType
@@ -441,8 +445,19 @@ var TMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "clearFrameSelect",
     value: function clearFrameSelect() {
-      this.removeGraphic(this.frameSelectProps.id, this.frameSelectProps.type);
+      for (var key in this.frameSelectProps) {
+        this.removeGraphic(this.frameSelectProps[key].id, this.frameSelectProps[key].type);
+      }
+
       this.frameSelectProps = {};
+    } // 清除框选ById
+
+  }, {
+    key: "clearFrameSelectById",
+    value: function clearFrameSelectById(id) {
+      var obj = this.frameSelectProps[id];
+      this.removeGraphic(obj.id, obj.type);
+      delete this.frameSelectProps[id];
     }
   }, {
     key: "setMapType",
@@ -2070,7 +2085,7 @@ var TMap = /*#__PURE__*/function (_React$Component) {
           this.polygonTool = new T.PolygonTool(this.state.gis, paramgcr);
           this.polygonTool.open();
           this.polygonTool.addEventListener('draw', function (ob) {
-            var _t$frameSelectProps;
+            var _t$frameSelectProps$b;
 
             var type = ob.type,
                 target = ob.target,
@@ -2126,8 +2141,8 @@ var TMap = /*#__PURE__*/function (_React$Component) {
               t.props.drawEnd(backobj);
             }
 
-            if (((_t$frameSelectProps = t.frameSelectProps) === null || _t$frameSelectProps === void 0 ? void 0 : _t$frameSelectProps.callback) instanceof Function) {
-              t.frameSelectProps.callback(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);
             }
           });
           break;
@@ -2137,7 +2152,7 @@ var TMap = /*#__PURE__*/function (_React$Component) {
           this.circleTool = new T.CircleTool(this.state.gis, paramgcr);
           this.circleTool.open();
           this.circleTool.addEventListener('drawend', function (ob) {
-            var _t$frameSelectProps2;
+            var _t$frameSelectProps$b2;
 
             var type = ob.type,
                 target = ob.target,
@@ -2187,8 +2202,8 @@ var TMap = /*#__PURE__*/function (_React$Component) {
               t.props.drawEnd(backobj);
             }
 
-            if (((_t$frameSelectProps2 = t.frameSelectProps) === null || _t$frameSelectProps2 === void 0 ? void 0 : _t$frameSelectProps2.callback) instanceof Function) {
-              t.frameSelectProps.callback(backobj);
+            if (((_t$frameSelectProps$b2 = t.frameSelectProps[backobj.id]) === null || _t$frameSelectProps$b2 === void 0 ? void 0 : _t$frameSelectProps$b2.callback) instanceof Function) {
+              t.frameSelectProps[backobj.id].callback(backobj);
             }
           });
           break;
@@ -2198,7 +2213,7 @@ var TMap = /*#__PURE__*/function (_React$Component) {
           this.rectangleTool = new T.RectangleTool(this.state.gis, paramgcr);
           this.rectangleTool.open();
           this.rectangleTool.addEventListener('draw', function (ob) {
-            var _t$frameSelectProps3;
+            var _t$frameSelectProps$b3;
 
             var type = ob.type,
                 target = ob.target,
@@ -2261,8 +2276,8 @@ var TMap = /*#__PURE__*/function (_React$Component) {
               t.props.drawEnd(backobj);
             }
 
-            if (((_t$frameSelectProps3 = t.frameSelectProps) === null || _t$frameSelectProps3 === void 0 ? void 0 : _t$frameSelectProps3.callback) instanceof Function) {
-              t.frameSelectProps.callback(backobj);
+            if (((_t$frameSelectProps$b3 = t.frameSelectProps[backobj.id]) === null || _t$frameSelectProps$b3 === void 0 ? void 0 : _t$frameSelectProps$b3.callback) instanceof Function) {
+              t.frameSelectProps[backobj.id].callback(backobj);
             }
           });
           break;
@@ -3110,17 +3125,30 @@ var TMap = /*#__PURE__*/function (_React$Component) {
               ;
             } else {
               var list = result.pois.map(function (r) {
-                return {
-                  id: r.hotPointID,
-                  longitude: r.lonlat.split(' ')[0],
-                  latitude: r.lonlat.split(' ')[1],
+                var lnglat = {};
+
+                if (r.lonlat.indexOf(",") > -1) {
+                  lnglat = {
+                    longitude: r.lonlat.split(',')[0],
+                    latitude: r.lonlat.split(',')[1]
+                  };
+                } else {
+                  lnglat = {
+                    longitude: r.lonlat.split(' ')[0],
+                    latitude: r.lonlat.split(' ')[1]
+                  };
+                }
+
+                return _objectSpread(_objectSpread({
+                  id: r.hotPointID
+                }, lnglat), {}, {
                   canShowLabel: true,
                   config: {
                     labelContent: r.name,
                     labelPixelY: 27
                   },
                   other: 'search'
-                };
+                });
               });
               resolve(list);
             }