ol webmap 兼容非restjsr 不处理后缀 review by luox

Author: xilanhuaweidapao

src/openlayers/mapping/WebMap.js

@@ -4801,8 +4801,13 @@ export class WebMap extends Observable {
     let url = dataSource.url;
     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);
     }
-    url = this.getRequestUrl(url + '.json');
 
     let credential = layerInfo.credential;
     let credentialValue, keyfix;
@@ -4825,10 +4830,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) => {
@@ -4849,7 +4867,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);