fix ms 地图代理服务不出图

Author: xiongjiaojiao

src/common/mapping/WebMapV3.js

@@ -314,7 +314,7 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, mapRe
     }
     return (url, resourceType) => {
       if (resourceType === 'Tile') {
-        const withCredentials = this.options.iportalServiceProxyUrl && url.indexOf(this.options.iportalServiceProxyUrl) >= 0;
+        const withCredentials = this.options.iportalServiceProxyUrlPrefix && url.indexOf(this.options.iportalServiceProxyUrlPrefix) >= 0;
         return {
           url: url,
           credentials: withCredentials ? 'include' : undefined,

src/common/mapping/utils/L7LayerUtil.js

@@ -426,7 +426,7 @@ export function L7LayerUtil(config) {
   }
 
   function isIportalProxyServiceUrl(url, options) {
-    return options.iportalServiceProxyUrl && url.indexOf(options.iportalServiceProxyUrl) >= 0;
+    return options.iportalServiceProxyUrlPrefix && url.indexOf(options.iportalServiceProxyUrlPrefix) >= 0;
   }
 
   function handleWithRequestOptions(url, options) {

test/common/mapping/utils/L7LayerUtilSpec.js

@@ -517,7 +517,7 @@ describe('L7LayerUtil', () => {
         ...addOptions.options,
         withCredentials: false,
         server: '/iportal/',
-        iportalServiceProxyUrl: 'http://localhost:8195/portalproxy'
+        iportalServiceProxyUrlPrefix: 'http://localhost:8195/portalproxy'
       }
     };
     const spy = spyOn(nextOptions.map, 'addLayer').and.callThrough();

test/mapboxgl/mapping/WebMapV3Spec.js

@@ -100,7 +100,7 @@ describe('mapboxgl-webmap3.0', () => {
     });
     mapstudioWebmap = new WebMap(id, {
       server: server,
-      iportalServiceProxyUrl: 'initialize_raster'
+      iportalServiceProxyUrlPrefix: 'initialize_raster'
     });
     expect(mapstudioWebmap.credentialKey).toBeUndefined();
     expect(mapstudioWebmap.credentialValue).toBeUndefined();
@@ -202,7 +202,7 @@ describe('mapboxgl-webmap3.0', () => {
     mapstudioWebmap = new WebMapV3(mapInfo, {
       server: server,
       target: 'map',
-      iportalServiceProxyUrl: 'mapId is JSON'
+      iportalServiceProxyUrlPrefix: 'mapId is JSON'
     });
     mapstudioWebmap.initializeMap(mapInfo);
 
@@ -273,7 +273,7 @@ describe('mapboxgl-webmap3.0', () => {
     mapstudioWebmap = new WebMapV3(nextMapInfo, {
       server: server,
       target: 'map',
-      iportalServiceProxyUrl: 'projection is 4490 and include mapbox-gl-enhance'
+      iportalServiceProxyUrlPrefix: 'projection is 4490 and include mapbox-gl-enhance'
     });
     mapstudioWebmap.initializeMap(nextMapInfo);
 
@@ -363,7 +363,7 @@ describe('mapboxgl-webmap3.0', () => {
     mapstudioWebmap = new WebMapV3(mapInfo, {
       server: server,
       target: 'map',
-      iportalServiceProxyUrl: 'overlayLayersManager'
+      iportalServiceProxyUrlPrefix: 'overlayLayersManager'
     });
     mapstudioWebmap.initializeMap(mapInfo);
 
@@ -521,7 +521,7 @@ describe('mapboxgl-webmap3.0', () => {
     mapstudioWebmap = new WebMapV3(mapInfo, {
       server: server,
       target: 'map',
-      iportalServiceProxyUrl: 'exclude source and layer'
+      iportalServiceProxyUrlPrefix: 'exclude source and layer'
     });
     mapstudioWebmap.initializeMap(mapInfo);
 
@@ -735,14 +735,14 @@ describe('mapboxgl-webmap3.0', () => {
     });
     const spyTest = spyOn(MapManagerUtil, 'default').and.callFake(mbglmap);
     const mapInfo = JSON.parse(mapstudioWebMap_raster);
-    const iportalServiceProxyUrl = 'http://localhost:8195/portalproxy';
+    const iportalServiceProxyUrlPrefix = 'http://localhost:8195/portalproxy';
     const tileCustomRequestHeaders = { 'Authorization': 'test token' };
     mapstudioWebmap = new WebMap(mapInfo, {
       server: server,
       target: 'map',
-      iportalServiceProxyUrl,
+      iportalServiceProxyUrlPrefix,
       tileTransformRequest: (url) => {
-        if (url.includes(iportalServiceProxyUrl)) {
+        if (url.includes(iportalServiceProxyUrlPrefix)) {
           return { headers: tileCustomRequestHeaders };
         }
       }

test/maplibregl/mapping/WebMapV3Spec.js

@@ -100,7 +100,7 @@ describe('maplibregl-webmap3.0', () => {
     });
     mapstudioWebmap = new WebMap(id, {
       server: server,
-      iportalServiceProxyUrl: 'initialize_raster'
+      iportalServiceProxyUrlPrefix: 'initialize_raster'
     });
     expect(mapstudioWebmap.credentialKey).toBeUndefined();
     expect(mapstudioWebmap.credentialValue).toBeUndefined();
@@ -167,7 +167,7 @@ describe('maplibregl-webmap3.0', () => {
     mapstudioWebmap = new WebMapV3(mapInfo, {
       server: server,
       target: 'map',
-      iportalServiceProxyUrl: 'mapId is JSON'
+      iportalServiceProxyUrlPrefix: 'mapId is JSON'
     });
     mapstudioWebmap.initializeMap(mapInfo);
 
@@ -238,7 +238,7 @@ describe('maplibregl-webmap3.0', () => {
     mapstudioWebmap = new WebMapV3(nextMapInfo, {
       server: server,
       target: 'map',
-      iportalServiceProxyUrl: 'projection is 4490 and include maplibre-gl-enhance'
+      iportalServiceProxyUrlPrefix: 'projection is 4490 and include maplibre-gl-enhance'
     });
     mapstudioWebmap.initializeMap(nextMapInfo);
 
@@ -328,7 +328,7 @@ describe('maplibregl-webmap3.0', () => {
     mapstudioWebmap = new WebMapV3(mapInfo, {
       server: server,
       target: 'map',
-      iportalServiceProxyUrl: 'overlayLayersManager'
+      iportalServiceProxyUrlPrefix: 'overlayLayersManager'
     });
     mapstudioWebmap.initializeMap(mapInfo);
 
@@ -486,7 +486,7 @@ describe('maplibregl-webmap3.0', () => {
     mapstudioWebmap = new WebMapV3(mapInfo, {
       server: server,
       target: 'map',
-      iportalServiceProxyUrl: 'exclude source and layer'
+      iportalServiceProxyUrlPrefix: 'exclude source and layer'
     });
     mapstudioWebmap.initializeMap(mapInfo);
 
@@ -700,14 +700,14 @@ describe('maplibregl-webmap3.0', () => {
     });
     const spyTest = spyOn(MapManagerUtil, 'default').and.callFake(mbglmap);
     const mapInfo = JSON.parse(mapstudioWebMap_raster);
-    const iportalServiceProxyUrl = 'http://localhost:8195/portalproxy';
+    const iportalServiceProxyUrlPrefix = 'http://localhost:8195/portalproxy';
     const tileCustomRequestHeaders = { 'Authorization': 'test token' };
     mapstudioWebmap = new WebMap(mapInfo, {
       server: server,
       target: 'map',
-      iportalServiceProxyUrl,
+      iportalServiceProxyUrlPrefix,
       tileTransformRequest: (url) => {
-        if (url.includes(iportalServiceProxyUrl)) {
+        if (url.includes(iportalServiceProxyUrlPrefix)) {
           return { headers: tileCustomRequestHeaders };
         }
       }