【feature】更新可感知图层显隐初始值优化

src/mapboxgl/_types/__tests__/map-event.spec.js

@@ -0,0 +1,36 @@
+import { mount, createLocalVue } from '@vue/test-utils';
+import mapEvent from '../map-event';
+
+describe('map-event-mapboxgl', () => {
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+  });
+
+  it ('webmap', () => {
+    const changeItemVisibleSpy = jest.fn();
+    const webmap1 = {
+      changeItemVisible: changeItemVisibleSpy,
+      getAppreciableLayers: () => [{id: 'layer1'}],
+      cacheLayerIds: ['layer1']
+    }
+    const webmap2 = {
+      changeItemVisible: changeItemVisibleSpy,
+      getAppreciableLayers: () => [{id: 'layer2'}],
+      cacheLayerIds: ['layer2']
+    }
+    const mapTarget = 'webmap1';
+    mapEvent.$options.setWebMap(mapTarget, webmap1);
+    mapEvent.$options.setWebMap(mapTarget, webmap2, 'webmap2');
+    let webmap = mapEvent.$options.getWebMap('map');
+    expect(webmap).toBeUndefined();
+    webmap = mapEvent.$options.getWebMap(mapTarget);
+    expect(webmap).not.toBeUndefined();
+    expect(webmap.getAppreciableLayers().length).toBe(2);
+    webmap.changeItemVisible();
+    expect(changeItemVisibleSpy).toHaveBeenCalledTimes(2);
+    expect(webmap.cacheLayerIds).toEqual(['layer1']);
+  })
+});

src/mapboxgl/_types/map-event.js

@@ -46,6 +46,15 @@ export default new Vue({
           }
           return () => datas;
         }
+        if (['changeItemVisible'].includes(propKey)) {
+          return function () {
+            const webmaps = webMapCombinations.map(item => item[1]);
+            const argumentsList = arguments;
+            webmaps.forEach((webmap) => {
+              webmap[propKey].apply(webmap, argumentsList);
+            });
+          };
+        }
         return target[propKey];
       }
     });

src/mapboxgl/web-map/SourceListModel.js

@@ -31,10 +31,10 @@ class SourceListModel {
     const layersOnMap = this.map.getStyle().layers.map(layer => this.map.getLayer(layer.id));
     const overlayLayers = Object.values(this.map.overlayLayersManager).reduce((layers, overlayLayer) => {
       if (overlayLayer.id && !layers.some(item => item.id === overlayLayer.id)) {
-        let visibility = overlayLayer.visibility;
-        if (!visibility && 'visible' in overlayLayer) {
-          visibility = overlayLayer.visible ? 'visible' : 'none';
-        }
+        const visibility =
+          !('visible' in overlayLayer) || overlayLayer.visibility === 'visible' || overlayLayer.visible
+            ? 'visible'
+            : 'none';
         let source = overlayLayer.source || overlayLayer.sourceId;
         if (typeof source === 'object') {
           source = overlayLayer.id;

src/mapboxgl/web-map/WebMapV2.ts

@@ -2210,7 +2210,8 @@ export default class WebMap extends WebMapBase {
       if (this.map.getLayer(baseLayerId)) {
         layersFromMapInfo.unshift({
           id: baseLayerId,
-          name: this._mapInfo.baseLayer.title || baseLayerId
+          name: this._mapInfo.baseLayer.title || baseLayerId,
+          visible: this._mapInfo.baseLayer.visible
         });
       }
       // strokeLine之类

src/mapboxgl/web-map/WebMapViewModel.ts

@@ -362,11 +362,7 @@ export default class WebMapViewModel extends Events {
     }
   }
 
-  updateLayersVisible(
-    layers: Array<Record<string, any>>,
-    visibility: 'visible' | 'none',
-    ignoreIds: string[] = []
-  ) {
+  updateLayersVisible(layers: Array<Record<string, any>>, visibility: 'visible' | 'none', ignoreIds: string[] = []) {
     layers.forEach(layer => {
       const visbleId = this.getLayerVisibleId(layer);
       this._appreciableLayersVisibleMap.set(visbleId, visibility === 'visible');