fix 切换map报错 review by songym

SuperMap · Sep 1, 2023 · 3c4b221 · 3c4b221
1 parent 85eed0d
commit 3c4b221
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/common/web-map/WebMapBase.ts b/src/common/web-map/WebMapBase.ts
@@ -130,6 +130,9 @@ export default abstract class WebMapBase extends Events {
       this.webMapInfo = mapId;
     }
     this.webMapService.setMapId(mapId);
+    if (!mapId) {
+      return;
+    }
     setTimeout(() => {
       this._initWebMap();
     }, 0);

diff --git a/src/mapboxgl/web-map/WebMapViewModel.ts b/src/mapboxgl/web-map/WebMapViewModel.ts
@@ -219,17 +219,15 @@ export default class WebMapViewModel extends WebMapBase {
 
   public setStyle(style): void {
     if (this.map) {
-      if (style && style.layers && style.layers.length > 0) {
-        setTimeout(() => {
-          this.triggerEvent('addlayerssucceeded', {
-            map: this.map,
-            mapparams: {},
-            layers: []
-          });
-        }, 0);
-      }
       this.mapOptions.style = style;
       style && this.map.setStyle(style);
+      if (style && style.layers && style.layers.length > 0) {
+        this.triggerEvent('addlayerssucceeded', {
+          map: this.map,
+          mapparams: {},
+          layers: []
+        });
+      }
     }
   }