【feature】修改添加图片方式为雪碧图; review by qiw

xiongjiaojiao · xiongjiaojiao · commit 46faafd922b7 · 2024-03-28T10:03:21.000+08:00
diff --git a/src/mapboxgl/mapping/webmap/v3/WebMap.js b/src/mapboxgl/mapping/webmap/v3/WebMap.js
@@ -40,7 +40,7 @@ export class WebMap extends mapboxgl.Evented {
    * @description 创建地图。
    */
   _createMap() {
-    let { name, crs, center = new mapboxgl.LngLat(0, 0), zoom = 0, bearing = 0, pitch = 0, minzoom, maxzoom } = this._mapInfo;
+    let { name, crs, center = new mapboxgl.LngLat(0, 0), zoom = 0, bearing = 0, pitch = 0, minzoom, maxzoom, sprite } = this._mapInfo;
     if (this._mapInfo.center && crs === 'EPSG:3857') {
       center = Util.unproject(center);
     }
@@ -52,6 +52,7 @@ export class WebMap extends mapboxgl.Evented {
       center,
       zoom,
       style: {
+        sprite,
         name,
         version: 8,
         sources: {},
@@ -86,11 +87,8 @@ export class WebMap extends mapboxgl.Evented {
         description: relatedInfo.description
       };
       this._mapResourceInfo = JSON.parse(relatedInfo.projectInfo);
-      this._createMapRelatedInfo().then(res => {
-        if (res) {
-          this._addLayersToMap();
-        }
-      });
+      this._createMapRelatedInfo();
+      this._addLayersToMap();
     });
   }
 
@@ -104,31 +102,14 @@ export class WebMap extends mapboxgl.Evented {
     for (let key in glyphs) {
       this.map.style.addGlyphs(key, glyphs[key]);
     }
-    for (let key in sprite) {
-      this.map.style.addSprite(key, sprite[key]);
-    }
-    // 添加地图图片资源
-    const { images } = this._mapResourceInfo;
-    const loadImagePromises = images.map(({ url, id }) => {
-      return new Promise((resolve, reject) => {
-        this.map.loadImage(url, (error, image) => {
-          if (error) {
-            reject(error);
-            return;
-          }
-          !this.map.hasImage(id) && this.map.addImage(id, image, { sdf: true });
-          resolve(url);
-        });
-      });
-    });
-    return Promise.all(loadImagePromises)
-      .then((imagesAddToMap) => {
-        this.fire('getlayerresourcesucceeded', { images: imagesAddToMap });
-        return imagesAddToMap;
-      })
-      .catch((error) => {
-        this.fire('getlayerresourcefailed', { error });
-      });
+    // if (typeof sprite === 'object') {
+    //   for (let key in sprite) {
+    //     this.map.style.addSprite(key, sprite[key]);
+    //   }
+    // } else {
+    //   this.map.style.sprite = sprite;
+    //   this.map.setStyle(this.map.style);
+    // }
   }
 
   /**
