fix ut leaflet fgblayer 修复无法绑定事件

Author: xilanhuaweidapao

src/common/iServer/DataFlowService.js

@@ -67,9 +67,7 @@ export class DataFlowService extends CommonServiceBase {
         var me = this;
         this.broadcastWebSocket = this._connect(Util.urlPathAppend(me.url, 'broadcast'));
         this.broadcastWebSocket.onopen = function (e) {
-            if (me.broadcastWebSocket) {
-              me.broadcastWebSocket.isOpen = true;
-            }
+            me.broadcastWebSocket.isOpen = true;
             e.eventType = 'broadcastSocketConnected';
             me.callback(e);
         };
@@ -97,7 +95,7 @@ export class DataFlowService extends CommonServiceBase {
             this.callback({ eventType: 'broadcastFailed' });
             return;
         }
-        this.subscribeWebSocket && this.broadcastWebSocket.send(JSON.stringify(geoJSONFeature));
+        this.broadcastWebSocket.send(JSON.stringify(geoJSONFeature));
         this.callback({ eventType: 'broadcastSucceeded' });
     }
 
@@ -110,7 +108,7 @@ export class DataFlowService extends CommonServiceBase {
         var me = this;
         this.subscribeWebSocket = this._connect(Util.urlPathAppend(me.url, 'subscribe'));
         this.subscribeWebSocket.onopen = function (e) {
-            me.subscribeWebSocket && me.subscribeWebSocket.send(me._getFilterParams());
+            me.subscribeWebSocket.send(me._getFilterParams());
             e.eventType = 'subscribeSocketConnected';
             me.callback(e);
         };

src/leaflet/overlay/FGBLayer.js

@@ -42,7 +42,7 @@ import { deserialize } from 'flatgeobuf/lib/mjs/geojson';
  * ```
  */
 
-export var FGBLayer = L.LayerGroup.extend({
+export var FGBLayer = L.FeatureGroup.extend({
   initialize: function (url, options) {
     this.options = options || {};
     this.strategy = this.options.strategy || 'bbox';

test/leaflet/overlay/DataFlowLayerSpec.js

@@ -312,6 +312,7 @@ describe('leaflet_DataFlowLayer', () => {
         layer.addTo(map);
 
         var e = {
+            eventType: 'messageSucceeded',
             featureResult:
             {
                 "type": "Feature",
@@ -338,7 +339,7 @@ describe('leaflet_DataFlowLayer', () => {
                 }
             });
             // done();
-            // layer.dataService.dataFlow.events.triggerEvent('messageSucceeded', e);
+            layer.dataService.dataFlow.callback(e);
         }, 0)
 
     });