[fix] 过滤掉高亮图层 review by xiongjj

chenxianhuii · chenxianhuii · commit 8f9a6a5cd12a · 2024-05-07T16:50:11.000+08:00
diff --git a/src/mapboxgl/mapping/webmap/v3/WebMap.js b/src/mapboxgl/mapping/webmap/v3/WebMap.js
@@ -397,6 +397,15 @@ export class WebMap extends mapboxgl.Evented {
     }
   }
 
+  excludeSource(key) {
+    for (let i = 0; i < this.excludeSourceNames.length; i++) {
+      if (key && key.indexOf(this.excludeSourceNames[i]) >= 0) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   _getLayersOnMap() {
     const layersOnMap = this.map.getStyle().layers.map((layer) => this.map.getLayer(layer.id));
     const overlayLayers = Object.values(this.map.overlayLayersManager).reduce((layers, overlayLayer) => {
@@ -421,7 +430,8 @@ export class WebMap extends mapboxgl.Evented {
     const allLayersOnMap = layersOnMap
       .concat(overlayLayers)
       .filter((layer) => !this._appendLayers || this._layerIdRenameMapList.some((item) => item.renderId === layer.id))
-      .filter((layer) => !this.excludeSourceNames.includes(layer.source));
+      .filter((layer) => this.excludeSource(layer.source))
+      .filter((layer) => !layer.id.includes('-SM-'));
     return allLayersOnMap;
   }
 
diff --git a/test/mapboxgl/mapping/WebMapV3Spec.js b/test/mapboxgl/mapping/WebMapV3Spec.js
@@ -303,4 +303,57 @@ describe('mapboxgl-webmap3.0', () => {
     });
     mapstudioWebmap.initializeMap(mapInfo);
   });
+
+  it('exclude source and layer', (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_symbol);
+    mapstudioWebmap = new WebMapV3(mapInfo, {
+      server: server,
+      target: 'map'
+    });
+    mapstudioWebmap.initializeMap(mapInfo);
+
+    mapstudioWebmap.on('addlayerssucceeded', ({ map }) => {
+      expect(map).not.toBeUndefined();
+      expect(mapstudioWebmap.map).toEqual(map);
+      const style = map.getStyle();
+      expect(style.layers.length).toBe(mapInfo.layers.length);
+      const appreciableLayers = mapstudioWebmap.getAppreciableLayers();
+      const layerCatalogs = mapstudioWebmap.getLayerCatalog();
+      expect(appreciableLayers.length).toBeGreaterThanOrEqual(mapInfo.layers.length);
+      expect(layerCatalogs.length).toBeLessThanOrEqual(appreciableLayers.length);
+      map.addLayer({
+        metadata: {},
+        paint: {
+          'background-color': '#242424'
+        },
+        id: 'layer-identify-SM-highlighted',
+        type: 'background'
+      });
+      map.addSource('mapbox-gl-draw-hot', {
+        type: 'geojson',
+        data: {
+          type: 'FeatureCollection',
+          features: []
+        }
+      });
+      map.addLayer({
+        metadata: {},
+        paint: {
+          'circle-color': "#f75564"
+        },
+        id: 'draw-vertex-active.hot',
+        source: 'mapbox-gl-draw-hot',
+        type: 'circle'
+      });
+      expect(mapstudioWebmap.getAppreciableLayers().length).toBe(appreciableLayers.length);
+      expect(mapstudioWebmap.getLayerCatalog().length).toBe(layerCatalogs.length);
+      done();
+    });
+  });
 });
