[fix]经纬网加入_cachelayerid, sourcelist更正

SuperMap · Sep 10, 2024 · fc56700 · fc56700
1 parent 6473ea7
commit fc56700
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/mapboxgl/web-map/SourceListModel.js b/src/mapboxgl/web-map/SourceListModel.js
@@ -12,7 +12,7 @@ class SourceListModel {
     this.sourceNames = [];
     this._initLayers();
     this._initSource();
-    this.excludeSourceNames = ['tdt-search-', 'tdt-route-', 'smmeasure', 'mapbox-gl-draw'];
+    this.excludeSourceNames = ['tdt-search-', 'tdt-route-', 'smmeasure', 'mapbox-gl-draw', /graticuleLayer_\d+_line/];
   }
 
   getSourceList() {
@@ -37,7 +37,7 @@ class SourceListModel {
 
   excludeSource(key) {
     for (let i = 0; i < this.excludeSourceNames.length; i++) {
-      if (key.indexOf(this.excludeSourceNames[i]) >= 0) {
+      if (key && key.match(this.excludeSourceNames[i])) {
         return false;
       }
     }
@@ -81,7 +81,7 @@ class SourceListModel {
       if (overlayer.id) {
         this.detailLayers.push({
           id: overlayer.id,
-          visibility: overlayer.visibility ? 'visible' : 'none',
+          visibility: overlayer.visibility || overlayer.visible ? 'visible' : 'none',
           source: overlayer.id
         });
       }

diff --git a/src/mapboxgl/web-map/WebMapViewModel.ts b/src/mapboxgl/web-map/WebMapViewModel.ts
@@ -790,6 +790,7 @@ export default class WebMapViewModel extends WebMapBase {
     const options = this._createGraticuleOptions(graticuleInfo);
     const graticuleLayers = new mapboxgl.supermap.GraticuleLayer(options);
     this.map.addLayer(graticuleLayers);
+    this._cacheLayerId.push(graticuleLayers.id);
     this._setGraticuleDash(graticuleInfo.lineDash, graticuleLayers);
     this._addLayerSucceeded();
   }
@@ -2369,7 +2370,6 @@ export default class WebMapViewModel extends WebMapBase {
   }
 
   private _sendMapToUser(count: number, layersLen: number): void {
-    console.log('_sendMapToUser', count, layersLen)
     if (count === layersLen) {
       /**
        * @event WebMapViewModel#addlayerssucceeded

diff --git a/src/mapboxgl/web-map/__tests__/WebMapViewModel.spec.js b/src/mapboxgl/web-map/__tests__/WebMapViewModel.spec.js
@@ -583,6 +583,8 @@ describe('WebMapViewModel.spec', () => {
       expect(data).not.toBeUndefined();
       // 经纬网叠加完成后， 才触发addlayerssucceeded
       expect(viewModel.expectLayerLen).toBe(3);
+      expect(viewModel._cacheLayerId.length).toBe(3);
+      expect(Object.keys(viewModel._sourceListModel.getSourceList()).length).toBe(3);
       done();
     };
     const viewModel = new WebMapViewModel(id, { ...commonOption });

diff --git a/test/unit/mocks/supermap_mapboxgl.js b/test/unit/mocks/supermap_mapboxgl.js
@@ -250,6 +250,8 @@ supermap.Util = {
 
 supermap.GraticuleLayer = () => {
   return {
+    id: 'graticuleLayer_1',
+    visible: true,
     setStrokeStyle: jest.fn()
   }
 };