Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

qiulinFV · qiulinFV · commit d94160dc7fcf · 2020-09-27T23:46:55.000+08:00
# Conflicts:
#	src/openlayers/mapping/WebMap.js
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -739,34 +739,30 @@ export class WebMap extends Observable {
         //     maxZoom = options.baseLayer.visibleScales.length;
         // }
         let viewOptions = {};
-        if (['4', '5'].indexOf(Util.getOlVersion()) < 0) { // 兼容 ol 4，5，6
-            viewOptions.multiWorld = true;
-            viewOptions.showFullExtent = true;
-            viewOptions.enableRotation = false;
-            viewOptions.constrainResolution = true; //设置此参数，是因为需要显示整数级别。为了可视比例尺中包含当前比例尺
-        }
         if (baseLayer.layerType === "WMTS") {
             if (baseLayer.scales && baseLayer.scales.length > 0) {
                 //因为新版extent超出，不可见。所以将extent去除
                 viewOptions = {zoom, center, projection, resolutions: this.resolutionArray, maxZoom};
-                this.map.setView(new View(viewOptions));
             } else {
                 viewOptions = {zoom, center, projection, maxZoom};
-                this.map.setView(new View(viewOptions));
                 this.getScales(baseLayer);
             }
         } else {
             if (this.resolutionArray && this.resolutionArray.length > 0) {
                 viewOptions = {zoom, center, projection, resolutions: this.resolutionArray, maxZoom};
-                this.map.setView(new View(viewOptions));
             } else {
                 viewOptions = {zoom, center, projection, maxResolution, minResolution, maxZoom};
-                this.map.setView(new View(viewOptions));
                 this.getScales(baseLayer);
             }
         }
-
-
+        if (['4', '5'].indexOf(Util.getOlVersion()) < 0) { // 兼容 ol 4，5，6
+            viewOptions.multiWorld = true;
+            viewOptions.showFullExtent = true;
+            viewOptions.enableRotation = false;
+            viewOptions.constrainResolution = true; //设置此参数，是因为需要显示整数级别。为了可视比例尺中包含当前比例尺
+        }
+        this.map.setView(new View(viewOptions));
+        
         if (options.visibleExtent) {
             const view = this.map.getView();
             const resolution = view.getResolutionForExtent(options.visibleExtent, this.map.getSize());
diff --git a/src/openlayers/overlay/vectortile/MapboxStyles.js b/src/openlayers/overlay/vectortile/MapboxStyles.js
@@ -275,6 +275,10 @@ export class MapboxStyles extends Observable {
                         this._spriteImage = img;
                         this._initStyleFunction();
                     };
+                    img.onerror = () => {
+                        this._spriteImage = null;
+                        this._initStyleFunction();
+                    }
                     img.src = this._spriteImageUrl;
                 });
         } else {
