fix 分组报错问题

chenxianhuii · chenxianhuii · commit e78902ca0a49 · 2024-07-02T16:41:07.000+08:00
diff --git a/src/mapboxgl/mapping/webmap/v3/WebMap.js b/src/mapboxgl/mapping/webmap/v3/WebMap.js
@@ -546,7 +546,7 @@ export class WebMap extends mapboxgl.Evented {
       if (catalog[catalogTypeField] === 'group') {
         this._updateLayerCatalogsId({
           loopData: children,
-          catalogs,
+          catalogs: children,
           layerIdMapList,
           catalogTypeField,
           layerIdsField,
@@ -635,7 +635,7 @@ export class WebMap extends mapboxgl.Evented {
         delete layer['source-layer'];
       }
       return layer;
-    }).filter(item => this.map.getLayer(item.id));
+    });
     if (this._appendLayers) {
       return selfLayers;
     }
@@ -768,7 +768,7 @@ export class WebMap extends mapboxgl.Evented {
     }, []);
     const allLayersOnMap = this._getLayersOnMap();
     const extraLayers = allLayersOnMap.filter((layer) => !layerIdsFromCatalog.some((id) => id === layer.id));
-    const layerCatalogs = layerCatalog.concat(extraLayers).filter(item => this.map.getLayer(item.id));
+    const layerCatalogs = layerCatalog.concat(extraLayers);
     const appreciableLayers = this.getAppreciableLayers();
     const formatLayerCatalog = this._createFormatCatalogs(layerCatalogs, appreciableLayers);
     return formatLayerCatalog;
diff --git a/test/mapboxgl/mapping/WebMapV3Spec.js b/test/mapboxgl/mapping/WebMapV3Spec.js
@@ -856,4 +856,25 @@ describe('mapboxgl-webmap3.0', () => {
       done();
     });
   });
+
+  it('test group', (done) => {
+    spyOn(FetchRequest, 'get').and.callFake((url) => {
+      if (url.indexOf('/sprite') > -1) {
+        return Promise.resolve(new Response(msSpriteInfo));
+      }
+      return Promise.resolve();
+    });
+    const mapInfo = JSON.parse(mapstudioWebMap_group);
+    const mapstudioWebmap = new WebMapV3(mapInfo, {
+      server: server,
+      target: 'map'
+    });
+    mapstudioWebmap.on('addlayerssucceeded', ({ map }) => {
+      const appreciableLayers = mapstudioWebmap.getAppreciableLayers();
+      const layerCatalogs = mapstudioWebmap.getLayerCatalog();
+      expect(layerCatalogs.length).toBeLessThanOrEqual(appreciableLayers.length);
+      done();
+    });
+    mapstudioWebmap.initializeMap(mapInfo);
+  });
 });
diff --git a/test/resources/WebMapV3.js b/test/resources/WebMapV3.js
@@ -2298,4 +2298,104 @@ var msProjectINfo_layerData = JSON.stringify({
   isDefaultBottomMap: false,
   status: null,
   favoriteCount: 0
-});
+});
+
+var mapstudioWebMap_group = JSON.stringify({
+  metadata: {
+      layerCatalog: [
+          {
+              visible: true, 
+              children: [
+                  {
+                      visible: true, 
+                      id: "四川省市级边界", 
+                      title: "四川省市级边界", 
+                      type: "basic"
+                  }
+              ], 
+              id: "ms_group_1719799741965_7", 
+              title: "未命名分组", 
+              type: "group"
+          }, 
+          {
+              visible: true, 
+              id: "CHINA_DARK", 
+              title: "中国暗色地图", 
+              type: "basic"
+          }
+      ]
+  }, 
+  sources: {
+      ms_10451348_1719799738109_6: {
+          tiles: [
+              "http://172.16.15.94:8080/iportal/web/datas/10451348/structureddata/tiles/{z}/{x}/{y}.mvt?epsgCode=3857&returnedFieldNames=%5B%22smpid%22%2C%22parent%22%2C%22adcode%22%2C%22level%22%2C%22centroid%22%2C%22childrenNum%22%2C%22center%22%2C%22subFeatureIndex%22%2C%22name%22%2C%22acroutes%22%5D&geometryFieldName=geometry"
+          ], 
+          bounds: [
+              97.350096, 
+              26.045865, 
+              108.546488, 
+              34.312446
+          ], 
+          type: "vector"
+      }, 
+      CHINA_DARK: {
+          tiles: [
+              "https://maptiles.supermapol.com/iserver/services/map_China/rest/maps/China_Dark/tileimage.png?scale={scale}&x={x}&y={y}&width={width}&height={height}&transparent=true&redirect=false&cacheEnabled=true"
+          ], 
+          tileSize: 256, 
+          attribution: "", 
+          bounds: [
+              -180, 
+              -90, 
+              180, 
+              90
+          ], 
+          type: "raster"
+      }
+  }, 
+  crs: "EPSG:3857", 
+  center: [
+      101.12284196390647, 
+      30.26608027222483
+  ], 
+  zoom: 5.9855446883732935, 
+  glyphs: { }, 
+  version: "3.2.1", 
+  rootUrl: "http://172.16.15.94:8080/iportal/", 
+  maxzoom: 12, 
+  name: "无标题地图group1", 
+  viewExtent: [
+      94.1151112782352, 
+      34.31244599999984, 
+      108.13057264957897, 
+      26.045864999999523
+  ], 
+  layers: [
+      {
+          maxzoom: 12, 
+          id: "CHINA_DARK", 
+          source: "CHINA_DARK", 
+          type: "raster", 
+          minzoom: 0
+      }, 
+      {
+          layout: {
+              visibility: "visible"
+          }, 
+          metadata: { }, 
+          maxzoom: 24, 
+          paint: {
+              'fill-outline-color': "#FFFFFF", 
+              'fill-color': "#826DBA", 
+              'fill-opacity': 0.9
+          }, 
+          id: "四川省市级边界", 
+          source: "ms_10451348_1719799738109_6", 
+          'source-layer': "10451348$geometry", 
+          type: "fill", 
+          minzoom: 0
+      }
+  ], 
+  pitch: 0, 
+  minzoom: 0
+})
