bbj-screen-widget 2.4.74 → 2.4.76

package/bundles/bbj-screen-widget.umd.js

@@ -16088,7 +16088,7 @@
     ], exports.ɵdd);
 
     var EARTH_RADIUS$1 = 6371393;
-    var ɵ0$c = { type: 'string', title: 'ID' };
+    var ɵ0$c = { type: 'string', title: 'ID' }, ɵ1$c = { type: 'string', title: 'ID' };
     exports.ɵde = /** @class */ (function (_super_1) {
         __extends(BaiduFenceComponent, _super_1);
         function BaiduFenceComponent(parent, zone, message) {
@@ -16125,6 +16125,7 @@
                 },
             ];
             _this.create = new i0.EventEmitter();
+            _this.update = new i0.EventEmitter();
             _this.editData = [];
             _this.stopEdit$ = new rxjs.Subject();
             return _this;
@@ -16167,80 +16168,96 @@
             return [this.layer];
         };
         BaiduFenceComponent.prototype.updateData = function () {
+            var e_1, _b;
             var data = [];
-            this.data.forEach(function (r) {
-                if (r.type === 'circle') {
-                    if (!r.radius || !r.lnglat) {
-                        return;
+            try {
+                for (var _c = __values(this.data), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var r = _d.value;
+                    if (r.id && r.id === this.editId) {
+                        continue;
                     }
-                    var pointsCount = 90;
-                    var radius = r.radius;
-                    var lnglat = r.lnglat.split(',');
-                    var centerLng = +lnglat[0];
-                    var centerLat = +lnglat[1];
-                    // 转换中心点纬度为弧度
-                    var centerLatRad = (centerLat * Math.PI) / 180;
-                    // 存储轨迹点的数组
-                    var trajectory = [];
-                    // 遍历 0~360°，生成等间隔的点
-                    for (var i = 0; i < pointsCount; i++) {
-                        // 计算当前点的方位角（弧度）：从0°到360°，均分pointsCount份
-                        var angleRad = (((i * 360) / pointsCount) * Math.PI) / 180;
-                        // 计算当前点相对于中心点的经纬度增量（弧度）
-                        var deltaLatRad = (radius * Math.cos(angleRad)) / EARTH_RADIUS$1;
-                        var deltaLngRad = (radius * Math.sin(angleRad)) / (EARTH_RADIUS$1 * Math.cos(centerLatRad));
-                        // 转换为角度，并计算新坐标
-                        var newLat = centerLat + (deltaLatRad * 180) / Math.PI;
-                        var newLng = centerLng + (deltaLngRad * 180) / Math.PI;
-                        // 添加到轨迹数组（保留6位小数，经纬度常规精度）
-                        trajectory.push([parseFloat(newLng.toFixed(6)), parseFloat(newLat.toFixed(6))]);
+                    if (r.type === 'circle') {
+                        if (!r.radius || !r.lnglat) {
+                            return;
+                        }
+                        var pointsCount = 90;
+                        var radius = r.radius;
+                        var lnglat = r.lnglat.split(',');
+                        var centerLng = +lnglat[0];
+                        var centerLat = +lnglat[1];
+                        // 转换中心点纬度为弧度
+                        var centerLatRad = (centerLat * Math.PI) / 180;
+                        // 存储轨迹点的数组
+                        var coordinates = [];
+                        // 遍历 0~360°，生成等间隔的点
+                        for (var i = 0; i < pointsCount; i++) {
+                            // 计算当前点的方位角（弧度）：从0°到360°，均分pointsCount份
+                            var angleRad = (((i * 360) / pointsCount) * Math.PI) / 180;
+                            // 计算当前点相对于中心点的经纬度增量（弧度）
+                            var deltaLatRad = (radius * Math.cos(angleRad)) / EARTH_RADIUS$1;
+                            var deltaLngRad = (radius * Math.sin(angleRad)) / (EARTH_RADIUS$1 * Math.cos(centerLatRad));
+                            // 转换为角度，并计算新坐标
+                            var newLat = centerLat + (deltaLatRad * 180) / Math.PI;
+                            var newLng = centerLng + (deltaLngRad * 180) / Math.PI;
+                            // 添加到轨迹数组（保留6位小数，经纬度常规精度）
+                            coordinates.push([parseFloat(newLng.toFixed(6)), parseFloat(newLat.toFixed(6))]);
+                        }
+                        data.push({
+                            geometry: {
+                                type: 'Polygon',
+                                coordinates: [coordinates],
+                            },
+                        });
                     }
-                    data.push({
-                        geometry: {
-                            type: 'Polygon',
-                            coordinates: [trajectory],
-                        },
-                    });
-                }
-                else {
-                    if (!r.lnglat) {
-                        return;
+                    else {
+                        if (!r.lnglat) {
+                            return;
+                        }
+                        // const coordinates = r.lnglat.split(';').map((r) => {
+                        //   const lnglat = r.split(',');
+                        //   return [+lnglat[0], +lnglat[1]];
+                        // });
+                        var coordinates = r.lnglat.split('\n').map(function (r) { return r.split(';').map(function (r) {
+                            var lnglat = r.split(',');
+                            return [+lnglat[0], +lnglat[1]];
+                        }); });
+                        data.push({
+                            id: r.id,
+                            geometry: {
+                                type: 'Polygon',
+                                coordinates: coordinates,
+                            },
+                        });
                     }
-                    // const coordinates = r.lnglat.split(';').map((r) => {
-                    //   const lnglat = r.split(',');
-                    //   return [+lnglat[0], +lnglat[1]];
-                    // });
-                    var coordinates = r.lnglat.split('\n').map(function (r) { return r.split(';').map(function (r) {
-                        var lnglat = r.split(',');
-                        return [+lnglat[0], +lnglat[1]];
-                    }); });
-                    data.push({
-                        geometry: {
-                            type: 'Polygon',
-                            coordinates: coordinates,
-                        },
-                    });
                 }
-            });
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
             this.layer.setData(data);
         };
-        BaiduFenceComponent.prototype.startDraw = function (type) {
+        BaiduFenceComponent.prototype.createScene = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var _b, DrawScene, PolygonDraw, CircleDraw, OperateEventType;
+                var _b, DrawScene, OperateEventType;
                 var _this = this;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0: return [4 /*yield*/, import('bmap-draw')];
                         case 1:
-                            _b = _c.sent(), DrawScene = _b.DrawScene, PolygonDraw = _b.PolygonDraw, CircleDraw = _b.CircleDraw, OperateEventType = _b.OperateEventType;
+                            _b = _c.sent(), DrawScene = _b.DrawScene, OperateEventType = _b.OperateEventType;
                             if (!this.scene) {
                                 this.scene = new DrawScene(this.parent.map, { noLimit: true });
                                 this.scene.addEventListener(OperateEventType.COMPLETE, function (e) {
                                     console.log(e);
+                                    var data;
                                     if (e.target.overlay.radius) {
                                         var radius = e.target.overlay.radius;
                                         var lnglat = e.target.overlay.latLng;
-                                        var data = {
+                                        data = {
                                             type: 'circle',
                                             lnglat: lnglat.lng + "," + lnglat.lat,
                                             radius: radius,
@@ -16249,14 +16266,12 @@
                                         //   this.parent.map.removeOverlay(r);
                                         // });
                                         _this.create.emit(data);
-                                        _this.editOverlay = null;
                                     }
                                     else {
                                         var points = e.target.overlay.getPoints();
                                         if (!_this.data) {
                                             _this.data = [];
                                         }
-                                        var data = void 0;
                                         if (points.length && Array.isArray(points[0])) {
                                             data = {
                                                 type: 'polygon',
@@ -16266,20 +16281,64 @@
                                         else {
                                             data = {
                                                 type: 'polygon',
-                                                lnglat: points.map(function (p) { return p.latLng.lng + "," + p.latLng.lat; }).join(';'),
+                                                lnglat: points
+                                                    .map(function (p) {
+                                                    var latLng = p.latLng;
+                                                    if (!latLng) {
+                                                        var _b = __read(_this.parent.map.mercatorToLnglat(p.lng, p.lat), 2), lng = _b[0], lat = _b[1];
+                                                        return lng + "," + lat;
+                                                    }
+                                                    else {
+                                                        return latLng.lng + "," + latLng.lat;
+                                                    }
+                                                })
+                                                    .join(';'),
                                             };
                                         }
+                                    }
+                                    _this.editOverlay = null;
+                                    _this.parent.map.removeOverlay(e.target.overlay);
+                                    if (_this.editId) {
+                                        data.id = _this.editId;
+                                        var index = _this.data.findIndex(function (r) { return r.id === _this.editId; });
+                                        if (index !== -1) {
+                                            _this.data[index] = data;
+                                        }
+                                        _this.editId = null;
+                                        _this.updateData();
+                                    }
+                                    else {
+                                        _this.data.push(data);
+                                        _this.updateData();
                                         _this.create.emit(data);
                                     }
                                 });
                                 this.scene.addEventListener(OperateEventType.CANCEL, function (e) {
-                                    console.log(e);
                                     if (_this.editOverlay) {
                                         _this.parent.map.removeOverlay(_this.editOverlay);
                                         _this.editOverlay = null;
                                     }
+                                    if (_this.editId) {
+                                        _this.editId = null;
+                                        _this.updateData();
+                                    }
                                 });
                             }
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        BaiduFenceComponent.prototype.startDraw = function (type) {
+            return __awaiter(this, void 0, void 0, function () {
+                var _b, PolygonDraw, CircleDraw;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            this.createScene();
+                            return [4 /*yield*/, import('bmap-draw')];
+                        case 1:
+                            _b = _c.sent(), PolygonDraw = _b.PolygonDraw, CircleDraw = _b.CircleDraw;
                             switch (type) {
                                 case 'polygon':
                                     if (!this.polygon) {
@@ -16375,47 +16434,79 @@
             // }
             // this.editData = null;
         };
-        BaiduFenceComponent.prototype.search = function () {
+        BaiduFenceComponent.prototype.editPolygon = function (boundaries) {
             return __awaiter(this, void 0, void 0, function () {
-                var PolygonEdit, boundary;
-                var _this = this;
+                var PolygonEdit, points, overlay;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0: return [4 /*yield*/, import('bmap-draw')];
                         case 1:
                             PolygonEdit = (_b.sent()).PolygonEdit;
-                            if (this.areaName) {
-                                boundary = new BMapGL.Boundary();
-                                // 百度地图 Geocoder.getLocation 回调签名：(results, status)
-                                boundary.get(this.areaName, function (results) {
-                                    console.log('边界坐标数组：', results);
-                                    // 检查状态是否成功
-                                    if (results && results.boundaries && results.boundaries.length) {
-                                        _this.stopDraw();
-                                        if (!_this.polygonEdit) {
-                                            _this.polygonEdit = new PolygonEdit(_this.scene);
-                                        }
-                                        var points = results.boundaries.map(function (boundary) { return boundary.split(';').map(function (p) {
-                                            var _b = __read(p.split(','), 2), lng = _b[0], lat = _b[1];
-                                            return new BMapGL.Point(Number(lng), Number(lat));
-                                        }); });
-                                        var overlay = new BMapGL.Polygon(points, _this.getOptions());
-                                        console.log(overlay);
-                                        _this.editOverlay = overlay;
-                                        _this.parent.map.addOverlay(overlay);
-                                        _this.parent.map.setViewport([].concat.apply([], points));
-                                        _this.polygonEdit.edit(overlay);
-                                    }
-                                    else {
-                                        _this.message.error('行政区域不存在');
-                                    }
-                                });
+                            this.stopDraw();
+                            if (!this.polygonEdit) {
+                                this.polygonEdit = new PolygonEdit(this.scene);
+                            }
+                            points = boundaries.map(function (boundary) { return boundary.split(';').map(function (p) {
+                                var _b = __read(p.split(','), 2), lng = _b[0], lat = _b[1];
+                                return new BMapGL.Point(Number(lng), Number(lat));
+                            }); });
+                            overlay = new BMapGL.Polygon(points, this.getOptions());
+                            console.log(overlay);
+                            this.editOverlay = overlay;
+                            this.parent.map.addOverlay(overlay);
+                            this.parent.map.setViewport([].concat.apply([], points));
+                            this.polygonEdit.edit(overlay);
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        BaiduFenceComponent.prototype.editCircle = function (lng, lat, r) {
+            return __awaiter(this, void 0, void 0, function () {
+                var CircleEdit, center, overlay;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, import('bmap-draw')];
+                        case 1:
+                            CircleEdit = (_b.sent()).CircleEdit;
+                            if (!this.circleEdit) {
+                                this.circleEdit = new CircleEdit(this.scene);
                             }
+                            center = new BMapGL.Point(lng, lat);
+                            this.moveCircleToView(lng, lat, r);
+                            overlay = new BMapGL.Circle(center, r, this.getOptions());
+                            this.editOverlay = overlay;
+                            this.parent.map.addOverlay(overlay);
+                            this.circleEdit.open(overlay);
                             return [2 /*return*/];
                     }
                 });
             });
         };
+        BaiduFenceComponent.prototype.search = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var boundary;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    // 如果正在绘制多边形围栏，获取地名边界并绘制
+                    if (this.areaName) {
+                        boundary = new BMapGL.Boundary();
+                        // 百度地图 Geocoder.getLocation 回调签名：(results, status)
+                        boundary.get(this.areaName, function (results) {
+                            console.log('边界坐标数组：', results);
+                            // 检查状态是否成功
+                            if (results && results.boundaries && results.boundaries.length) {
+                                _this.editPolygon(results.boundaries);
+                            }
+                            else {
+                                _this.message.error('行政区域不存在');
+                            }
+                        });
+                    }
+                    return [2 /*return*/];
+                });
+            });
+        };
         BaiduFenceComponent.prototype.initSearch = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var _b, PolygonEdit, CircleEdit, ac;
@@ -16435,15 +16526,7 @@
                                 console.log(e);
                                 // 如果正在绘制圆形围栏
                                 if (_this.circle) {
-                                    if (!_this.circleEdit) {
-                                        _this.circleEdit = new CircleEdit(_this.scene);
-                                    }
-                                    var center = new BMapGL.Point(value.location.lng, value.location.lat);
-                                    _this.parent.map.centerAndZoom(center, 16);
-                                    var overlay = new BMapGL.Circle(center, 300, _this.getOptions());
-                                    _this.editOverlay = overlay;
-                                    _this.parent.map.addOverlay(overlay);
-                                    _this.circleEdit.open(overlay);
+                                    _this.editCircle(value.location.lng, value.location.lat, 300);
                                     _this.searchText = null;
                                 }
                             });
@@ -16462,27 +16545,7 @@
             }
             if (data.type === 'circle') {
                 var _b = __read(data.lnglat.split(','), 2), lng = _b[0], lat = _b[1];
-                var centerLng = Number(lng);
-                var centerLat = Number(lat);
-                var radius = Number(data.radius);
-                // 转换中心点纬度为弧度
-                var centerLatRad = (centerLat * Math.PI) / 180;
-                // 计算经度方向的偏移（弧度）
-                var deltaLngRad = radius / (EARTH_RADIUS$1 * Math.cos(centerLatRad));
-                // 计算纬度方向的偏移（弧度）
-                var deltaLatRad = radius / EARTH_RADIUS$1;
-                // 转换为角度偏移
-                var deltaLng = (deltaLngRad * 180) / Math.PI;
-                var deltaLat = (deltaLatRad * 180) / Math.PI;
-                // 计算圆形的四个边界点（上、下、左、右）
-                var points = [
-                    new BMapGL.Point(centerLng, centerLat + deltaLat),
-                    new BMapGL.Point(centerLng, centerLat - deltaLat),
-                    new BMapGL.Point(centerLng - deltaLng, centerLat),
-                    new BMapGL.Point(centerLng + deltaLng, centerLat),
-                ];
-                // 使用 setViewport 方法调整视图，使整个圆形可见
-                this.parent.map.setViewport(points);
+                this.moveCircleToView(Number(lng), Number(lat), Number(data.radius));
             }
             else {
                 this.parent.map.setViewport(data.lnglat.split(/[;\n\r]+/).map(function (p) {
@@ -16491,12 +16554,78 @@
                 }));
             }
         };
+        BaiduFenceComponent.prototype.moveCircleToView = function (lng, lat, r) {
+            var centerLng = Number(lng);
+            var centerLat = Number(lat);
+            var radius = Number(r);
+            // 转换中心点纬度为弧度
+            var centerLatRad = (centerLat * Math.PI) / 180;
+            // 计算经度方向的偏移（弧度）
+            var deltaLngRad = radius / (EARTH_RADIUS$1 * Math.cos(centerLatRad));
+            // 计算纬度方向的偏移（弧度）
+            var deltaLatRad = radius / EARTH_RADIUS$1;
+            // 转换为角度偏移
+            var deltaLng = (deltaLngRad * 180) / Math.PI;
+            var deltaLat = (deltaLatRad * 180) / Math.PI;
+            // 计算圆形的四个边界点（上、下、左、右）
+            var points = [
+                new BMapGL.Point(centerLng, centerLat + deltaLat),
+                new BMapGL.Point(centerLng, centerLat - deltaLat),
+                new BMapGL.Point(centerLng - deltaLng, centerLat),
+                new BMapGL.Point(centerLng + deltaLng, centerLat),
+            ];
+            // 使用 setViewport 方法调整视图，使整个圆形可见
+            this.parent.map.setViewport(points);
+        };
+        BaiduFenceComponent.prototype.edit = function (id) {
+            return __awaiter(this, void 0, void 0, function () {
+                var item, _b, _c, lng, lat;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            if (!this.data) {
+                                console.log('没有数据');
+                                return [2 /*return*/];
+                            }
+                            item = this.data.find(function (item) { return item.id === id; });
+                            if (!item) {
+                                console.log('找不到id', id);
+                                return [2 /*return*/];
+                            }
+                            if (!item.lnglat) {
+                                console.log('没有经纬度', item);
+                                return [2 /*return*/];
+                            }
+                            this.createScene();
+                            _b = item.type;
+                            switch (_b) {
+                                case 'circle': return [3 /*break*/, 1];
+                            }
+                            return [3 /*break*/, 3];
+                        case 1:
+                            _c = __read(item.lnglat.split(','), 2), lng = _c[0], lat = _c[1];
+                            return [4 /*yield*/, this.editCircle(Number(lng), Number(lat), Number(item.radius))];
+                        case 2:
+                            _d.sent();
+                            return [3 /*break*/, 5];
+                        case 3: return [4 /*yield*/, this.editPolygon(item.lnglat.split('\r'))];
+                        case 4:
+                            _d.sent();
+                            _d.label = 5;
+                        case 5:
+                            this.editId = id;
+                            this.updateData();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         return BaiduFenceComponent;
     }(BaseLayer));
     exports.ɵde.decorators = [
         { type: i0.Component, args: [{
                     selector: 'sc-baidu-fence',
-                    template: "<ng-container *ngIf=\"showDrawButton\">\n  <button nz-button (click)=\"startDraw('polygon')\">\u7ED8\u5236\u591A\u8FB9\u5F62</button>\n  <button nz-button (click)=\"startDraw('circle')\">\u7ED8\u5236\u5706\u5F62</button>\n  <button nz-button (click)=\"stopDraw()\">\u7ED3\u675F\u7ED8\u5236</button>\n  <button nz-button (click)=\"moveToView('1')\">\u79FB\u52A8\u5230\u4E2D\u5FC31</button>\n  <button nz-button (click)=\"moveToView('2')\">\u79FB\u52A8\u5230\u4E2D\u5FC32</button>\n</ng-container>\n<input\n  nz-input\n  [ngClass]=\"{ hidden: !circle?.isOpen }\"\n  #suggest\n  type=\"text\"\n  [(ngModel)]=\"searchText\"\n  placeholder=\"\u8BF7\u8F93\u5165\u4E2D\u5FC3\u70B9\u4F4D\u7F6E\"\n  class=\"input\"\n/>\n<ng-container *ngIf=\"polygon?.isOpen\">\n  <input nz-input type=\"text\" placeholder=\"\u8BF7\u8F93\u5165\u884C\u653F\u533A\u540D\u79F0\" [(ngModel)]=\"areaName\" class=\"input\" />\n  <button nz-button (click)=\"search()\" style=\"margin-left: 12px\">\u786E\u8BA4</button>\n</ng-container>\n<!-- <input type=\"text\" placeholder=\"\u8BF7\u8F93\u5165\u5730\u70B9\" [(ngModel)]=\"searchText\" />\n<button nz-button (click)=\"search()\">\u67E5\u8BE2</button> -->\n",
+                    template: "<ng-container *ngIf=\"showDrawButton\">\n  <button nz-button (click)=\"startDraw('polygon')\">\u7ED8\u5236\u591A\u8FB9\u5F62</button>\n  <button nz-button (click)=\"startDraw('circle')\">\u7ED8\u5236\u5706\u5F62</button>\n  <button nz-button (click)=\"stopDraw()\">\u7ED3\u675F\u7ED8\u5236</button>\n  <!-- <button nz-button (click)=\"edit('1')\">\u7F16\u8F91</button>\n  <button nz-button (click)=\"edit('2')\">\u7F16\u8F912</button> -->\n</ng-container>\n<input\n  nz-input\n  [ngClass]=\"{ hidden: !circle?.isOpen }\"\n  #suggest\n  type=\"text\"\n  [(ngModel)]=\"searchText\"\n  placeholder=\"\u8BF7\u8F93\u5165\u4E2D\u5FC3\u70B9\u4F4D\u7F6E\"\n  class=\"input\"\n/>\n<ng-container *ngIf=\"polygon?.isOpen\">\n  <input nz-input type=\"text\" placeholder=\"\u8BF7\u8F93\u5165\u884C\u653F\u533A\u540D\u79F0\" [(ngModel)]=\"areaName\" class=\"input\" />\n  <button nz-button (click)=\"search()\" style=\"margin-left: 12px\">\u786E\u8BA4</button>\n</ng-container>\n<!-- <input type=\"text\" placeholder=\"\u8BF7\u8F93\u5165\u5730\u70B9\" [(ngModel)]=\"searchText\" />\n<button nz-button (click)=\"search()\">\u67E5\u8BE2</button> -->\n",
                     styles: [":host{position:absolute;display:block;left:0;top:0;z-index:100;padding:12px;pointer-events:auto}button{transition:none}.hidden{display:none}.input{width:300px;margin-left:12px}"]
                 },] }
     ];
@@ -16560,6 +16689,19 @@
         }),
         __metadata("design:type", Object)
     ], exports.ɵde.prototype, "create", void 0);
+    __decorate([
+        bbjWidgetBase.Event('编辑围栏', {
+            params: {
+                properties: {
+                    id: ɵ1$c,
+                    type: { type: 'string', title: '围栏类型' },
+                    lnglat: { type: 'string', title: '经纬度' },
+                    radius: { type: 'number', title: '半径' },
+                },
+            },
+        }),
+        __metadata("design:type", Object)
+    ], exports.ɵde.prototype, "update", void 0);
     __decorate([
         bbjWidgetBase.Method('开始绘制'),
         __param(0, bbjWidgetBase.Param('类型', {
@@ -16586,6 +16728,13 @@
         __metadata("design:paramtypes", [String]),
         __metadata("design:returntype", void 0)
     ], exports.ɵde.prototype, "moveToView", null);
+    __decorate([
+        bbjWidgetBase.Method('编辑'),
+        __param(0, bbjWidgetBase.Param('id')),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [String]),
+        __metadata("design:returntype", Promise)
+    ], exports.ɵde.prototype, "edit", null);
     exports.ɵde = __decorate([
         bbjWidgetBase.Widget('电子围栏', {
             group: 'component',
@@ -16662,24 +16811,53 @@
             this.clear();
         };
         BaiduLushuComponent.prototype.update = function () {
-            var _this = this;
+            var e_1, _b;
             var _a;
             this.clear();
             if (!((_a = this.data) === null || _a === void 0 ? void 0 : _a.length)) {
                 return;
             }
             var landmarkPois = [];
-            var arrPois = this.data.map(function (item) {
-                if (item.landmark || item.pauseTime) {
-                    landmarkPois.push({
-                        lng: Number(item.lng),
-                        lat: Number(item.lat),
-                        html: item.landmark || _this.defaultContent,
-                        pauseTime: item.pauseTime ? Number(item.pauseTime) : 0,
-                    });
+            var arrPois = [];
+            var lastPoint = null;
+            var lastLandmark = null;
+            try {
+                for (var _c = __values(this.data), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var item = _d.value;
+                    var lng = Number(item.lng);
+                    var lat = Number(item.lat);
+                    // 去掉重复的点，重复的点会导致乱跳
+                    if (lastPoint && lastPoint.lng === lng && lastPoint.lat === lat) {
+                        if (lastLandmark && item.pauseTime) {
+                            lastLandmark.pauseTime += Number(item.pauseTime);
+                        }
+                        continue;
+                    }
+                    var point = new BMapGL.Point(lng, lat);
+                    arrPois.push(point);
+                    lastPoint = point;
+                    if (item.landmark || item.pauseTime) {
+                        var landmark = {
+                            lng: lng,
+                            lat: lat,
+                            html: item.landmark || this.defaultContent,
+                            pauseTime: item.pauseTime ? Number(item.pauseTime) : 0,
+                        };
+                        landmarkPois.push(landmark);
+                        lastLandmark = landmark;
+                    }
+                    else {
+                        lastLandmark = null;
+                    }
                 }
-                return new BMapGL.Point(item.lng, item.lat);
-            });
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
             if (this.showPolyline) {
                 this.polyline = new BMapGL.Polyline(arrPois, { strokeColor: this.polylineColor });
                 this.parent.map.addOverlay(this.polyline);
@@ -16717,11 +16895,13 @@
         };
         BaiduLushuComponent.prototype.clear = function () {
             if (this.lushu) {
+                this.lushu.stop();
                 this.lushu.clear();
                 this.lushu = null;
             }
             if (this.polyline) {
                 this.parent.map.removeOverlay(this.polyline);
+                this.polyline = null;
             }
         };
         BaiduLushuComponent.prototype.setSpeed = function (speed) {
@@ -16811,6 +16991,7 @@
     ], exports.ɵdf.prototype, "pause", null);
     __decorate([
         bbjWidgetBase.Method('设置速度'),
+        __param(0, bbjWidgetBase.Param('速度')),
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [Number]),
         __metadata("design:returntype", void 0)
@@ -20982,7 +21163,7 @@
         { type: i0.NgZone }
     ]; };
 
-    var ɵ0$e = { type: 'string', title: 'id' }, ɵ1$c = { type: 'string', title: 'id' }, ɵ2$a = { type: 'string', title: 'id' };
+    var ɵ0$e = { type: 'string', title: 'id' }, ɵ1$d = { type: 'string', title: 'id' }, ɵ2$a = { type: 'string', title: 'id' };
     exports.ɵec = /** @class */ (function (_super_1) {
         __extends(TiandituMarkerComponent, _super_1);
         function TiandituMarkerComponent(parent, zone, fileUrlService, nzContextMenuService) {
@@ -21617,7 +21798,7 @@
         bbjWidgetBase.Event('选中值改变', {
             params: {
                 properties: {
-                    id: ɵ1$c,
+                    id: ɵ1$d,
                     address: { type: 'string', title: '地点' },
                     lng: { type: 'number', title: '经度' },
                     lat: { type: 'number', title: '纬度' },