ol mapbox webmap 兼容非restjsr 不处理后缀

Author: xilanhuaweidapao

src/common/mapping/WebMapService.js

@@ -197,9 +197,9 @@ export class WebMapService {
     });
   }
 
-  getMapBoxStyle(styleURL) {
+  getMapBoxStyle(styleURL, withoutFormatSuffix = false) {
     return new Promise((resolve, reject) => {
-      FetchRequest.get(styleURL)
+      FetchRequest.get(styleURL, {}, { withoutFormatSuffix })
         .then(response => {
           return response.json();
         })

src/common/mapping/WebMapV2.js

@@ -349,8 +349,9 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
       if (url.indexOf('/restjsr/') > -1 && !/\/style\.json$/.test(url)) {
         url += '/style.json';
       }
+      const withoutFormatSuffix = url.indexOf('/restjsr/') === -1;
       this.webMapService
-        .getMapBoxStyle(url)
+        .getMapBoxStyle(url, withoutFormatSuffix)
         .then(
           (style) => {
             const sourceIds = Object.keys(style.sources);

src/openlayers/mapping/WebMap.js

@@ -4785,7 +4785,11 @@ export class WebMap extends Observable {
     if (this.isRestMapMapboxStyle(layerInfo)) {
       url = url.replace(restMapMVTStr, '');
     }
-    url = this.getRequestUrl(url + '.json');
+    if (url.indexOf('/restjsr/') > -1 && !/\.json$/.test(url)) {
+      url = this.getRequestUrl(url + '.json');
+    } else {
+      url = this.getRequestUrl(url);
+    }
 
     let credential = layerInfo.credential;
     let credentialValue, keyfix;
@@ -4808,10 +4812,23 @@ export class WebMap extends Observable {
       })
       .then((result) => {
         layerInfo.visibleScales = result.visibleScales;
-        layerInfo.coordUnit = result.coordUnit;
+        layerInfo.coordUnit = result.coordUnit || 'METER';
         layerInfo.scale = result.scale;
-        layerInfo.epsgCode = result.prjCoordSys.epsgCode;
-        layerInfo.bounds = result.bounds;
+        layerInfo.epsgCode = (result.prjCoordSys && result.prjCoordSys.epsgCode) || '3857';
+        layerInfo.bounds = result.bounds || {
+          top: 20037508.342789244,
+          left: -20037508.342789244,
+          bottom: -20037508.342789244,
+          leftBottom: {
+            x: -20037508.342789244,
+            y: -20037508.342789244
+          },
+          right: 20037508.342789244,
+          rightTop: {
+            x: 20037508.342789244,
+            y: 20037508.342789244
+          }
+        };
         return layerInfo;
       })
       .catch((error) => {
@@ -4832,7 +4849,7 @@ export class WebMap extends Observable {
     let _this = this;
     let url = layerInfo.url || layerInfo.dataSource.url;
     let styleUrl = url;
-    if (styleUrl.indexOf('/restjsr/') > -1) {
+    if (styleUrl.indexOf('/restjsr/') > -1 && !/\/style\.json$/.test(url)) {
       styleUrl = `${styleUrl}/style.json`;
     }
     styleUrl = this.getRequestUrl(styleUrl);