Merge branch 'v11.1.1' of https://github.com/SuperMap/iClient-JavaScript into v11.1.1

xilanhuaweidapao · xilanhuaweidapao · commit 8198a0899537 · 2025-04-09T19:41:07.000+08:00
diff --git a/dist/ol/include-ol.js b/dist/ol/include-ol.js
@@ -89,7 +89,7 @@
             inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');
         }
         if (inArray(includes, 'ol-mapbox-style')) {
-            inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-5/olms.js');
+            inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-6/olms.js');
         }
         if (inArray(includes, 'deck')) {
             inputScript(libsurl + '/deck.gl/5.1.3/deck.gl.min.js');
diff --git a/dist/openlayers/include-openlayers.js b/dist/openlayers/include-openlayers.js
@@ -89,7 +89,7 @@
             inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');
         }
         if (inArray(includes, 'ol-mapbox-style')) {
-            inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-5/olms.js');
+            inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-6/olms.js');
         }
         if (inArray(includes, 'deck')) {
             inputScript(libsurl + '/deck.gl/5.1.3/deck.gl.min.js');
diff --git a/src/common/iServer/InitMapServiceBase.js b/src/common/iServer/InitMapServiceBase.js
@@ -1,7 +1,7 @@
 /* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
- import { scaleToResolution, getZoomByResolution } from '../util/MapCalculateUtil';
+import { scaleToResolution, getZoomByResolution } from '../util/MapCalculateUtil';
 
 /**
  * @private
@@ -113,9 +113,15 @@ export function getEpsgCode(prjCoordSys) {
  * @description mapboxgl maplibregl 获取地图resolutions。
  * @returns {Array} resolutions
  */
- export function scalesToResolutions(bounds, maxZoom = 22, tileSize = 512) {
+export function extentToResolutions(bounds, maxZoom = 22, tileSize = 512) {
   var resolutions = [];
-  const maxReolution = Math.abs(bounds.left - bounds.right) / tileSize;
+  var left = bounds.left;
+  var right = bounds.right;
+  if (Array.isArray(bounds)) {
+    left = bounds[0];
+    right = bounds[2];
+  }
+  const maxReolution = Math.abs(left - right) / tileSize;
   for (let i = 0; i < maxZoom; i++) {
     resolutions.push(maxReolution / Math.pow(2, i));
   }
@@ -135,7 +141,7 @@ export function getEpsgCode(prjCoordSys) {
  * @param {Object} extent - extent。
  * @returns {number} zoom
  */
- export function getZoom({ scale, dpi, coordUnit }, extent) {
-  const resolutions = scalesToResolutions(extent);
+export function getZoom({ scale, dpi, coordUnit }, extent) {
+  const resolutions = extentToResolutions(extent);
   return getZoomByResolution(scaleToResolution(scale, dpi, coordUnit), resolutions);
 }
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -4818,11 +4818,24 @@ export class WebMap extends Observable {
         const envelope = this.getEnvelope(indexbounds, layerInfo.bounds);
         const styleResolutions = this.getStyleResolutions(envelope);
         // const origin = [envelope.left, envelope.top];
-        let baseUrl = layerInfo.url && layerInfo.url.split('?')[0];
+        let baseUrl = layerInfo.url;
+        let paramUrl = baseUrl.split('?')[1];
         let spriteUrl = styles.sprite;
         if (!CommonUtil.isAbsoluteURL(styles.sprite)) {
           spriteUrl = CommonUtil.relative2absolute(styles.sprite, baseUrl);
         }
+        if (layerInfo.dataSource.type === 'ARCGIS_VECTORTILE') {
+          Object.keys(styles.sources).forEach(function (key) {
+            Object.keys(styles.sources[key]).forEach(function(fieldName) {
+              if (fieldName === 'url') {
+                if (typeof styles.sources[key][fieldName] === 'string' && !CommonUtil.isAbsoluteURL(styles.sources[key][fieldName])) {
+                  styles.sources[key][fieldName] = CommonUtil.relative2absolute(styles.sources[key][fieldName], baseUrl);
+                }
+                styles.sources[key][fieldName] = styles.sources[key][fieldName] + (paramUrl ? '?' + paramUrl + '&f=json' : '?f=json');
+              }
+            });
+          });
+        }
         let withCredentials = this.isIportalProxyServiceUrl(spriteUrl);
         // 创建MapBoxStyle样式
         let mapboxStyles = new MapboxStyles({
diff --git a/src/openlayers/overlay/VectorTileSuperMapRest.js b/src/openlayers/overlay/VectorTileSuperMapRest.js
@@ -309,6 +309,7 @@ export class VectorTileSuperMapRest extends VectorTile {
             const response = await FetchRequest.get(url, null, {
               withCredentials: options.withCredentials
             });
+            this.baseUrl = url;
             style = await response.json();
           }
           await this._fillByStyleJSON(style, options.source);
@@ -323,11 +324,15 @@ export class VectorTileSuperMapRest extends VectorTile {
         }
         if (style.sources && style.sources[source]) {
           let newUrl;
+          let paramUrl = this.baseUrl && this.baseUrl.split('?')[1];
           if (style.sources[source].tiles) {
               newUrl = style.sources[source].tiles[0];
               if (!CommonUtil.isAbsoluteURL(newUrl)) {
                   newUrl = CommonUtil.relative2absolute(newUrl, this.baseUrl);
               }
+              if (paramUrl) {
+                  newUrl = CommonUtil.urlAppend(newUrl, paramUrl);
+              }
           } else if (style.sources[source].url) {
               let tiles = style.sources[source].url;
               if (!CommonUtil.isAbsoluteURL(tiles)) {
@@ -340,6 +345,9 @@ export class VectorTileSuperMapRest extends VectorTile {
                   tileUrl = CommonUtil.relative2absolute(tileUrl, tiles);
               }
               newUrl = SecurityManager.appendCredential(tileUrl);
+              if (paramUrl) {
+                newUrl = CommonUtil.urlAppend(newUrl, paramUrl);
+              }
           }
           this._tileUrl = SecurityManager.appendCredential(newUrl);
         }
diff --git a/src/openlayers/overlay/vectortile/MapboxStyles.js b/src/openlayers/overlay/vectortile/MapboxStyles.js
@@ -377,26 +377,34 @@ export class MapboxStyles extends Observable {
         return parts ? parts[1] + extension + (parts.length > 2 ? parts[2] : '') : url + extension;
     }
 
-    _handleRelativeUrl(styles, baseUrl) {
-      if (!baseUrl) {
+    _handleRelativeUrl(styles, url) {
+      if (!url) {
           return styles;
       }
+      const baseUrl = url.split('?')[0];
+      const paramUrl = url.split('?')[1] || '';
       Object.keys(styles).forEach((fieldName) => {
           if (fieldName === 'sources') {
               Object.keys(styles[fieldName]).forEach((sourceName) => {
-                  this._handleRelativeUrl(styles[fieldName][sourceName], baseUrl);
+                  this._handleRelativeUrl(styles[fieldName][sourceName], url);
               })
           }
           if (fieldName === 'sprite' || fieldName === 'glyphs' || fieldName === 'url') {
               if (styles[fieldName] && typeof styles[fieldName] === 'string' && !CommonUtil.isAbsoluteURL(styles[fieldName])) {
                   styles[fieldName] = CommonUtil.relative2absolute(styles[fieldName], baseUrl);
               }
+              if (paramUrl && !styles[fieldName].includes(paramUrl)) {
+                styles[fieldName] = styles[fieldName] + (paramUrl ? (styles[fieldName].includes('?') ? '&' + paramUrl : '?' + paramUrl) : '');
+              }
           }
           if (fieldName === 'tiles' && Array.isArray(styles[fieldName])) {
               styles[fieldName].forEach((tile) => {
                   if (!CommonUtil.isAbsoluteURL(tile)) {
                       tile = CommonUtil.relative2absolute(tile, baseUrl);
                   }
+                  if (paramUrl && !tile.includes(paramUrl)) {
+                    tile = tile + (paramUrl ? (styles[fieldName].includes('?') ? '&' + paramUrl : '?' + paramUrl) : '');
+                  }
               })
           }
       })
diff --git a/test/common/iServer/InitMapServiceBaseSpec.js b/test/common/iServer/InitMapServiceBaseSpec.js
@@ -0,0 +1,42 @@
+import { extentToResolutions } from '../../../src/common/iServer/InitMapServiceBase'; 
+
+describe('extentToResolutions', () => {
+  it('should calculate resolutions for a given bounding box', () => {
+    const bounds = { left: -180, right: 180 };
+    const resolutions = extentToResolutions(bounds);
+    expect(resolutions.length).toBe(22);
+    expect(resolutions[0]).toBeCloseTo(0.703125);
+    expect(resolutions[21]).toBeCloseTo(0.00000686328125);
+  });
+
+  it('should handle array bounds input', () => {
+    const bounds = [-180, -90, 180, 90];
+    const resolutions = extentToResolutions(bounds);
+    expect(resolutions.length).toBe(22);
+    expect(resolutions[0]).toBeCloseTo(0.703125);
+    expect(resolutions[21]).toBeCloseTo(0.00000686328125);
+  });
+
+  it('should handle custom maxZoom and tileSize', () => {
+    const bounds = { left: -180, right: 180 };
+    const resolutions = extentToResolutions(bounds, 10, 256);
+    expect(resolutions.length).toBe(10);
+    expect(resolutions[0]).toBeCloseTo(1.40625);
+    expect(resolutions[9]).toBeCloseTo(0.00146484375);
+  });
+
+  it('should handle zero width bounds', () => {
+    const bounds = { left: 0, right: 0 };
+    const resolutions = extentToResolutions(bounds);
+    expect(resolutions.length).toBe(22);
+    expect(resolutions[0]).toBe(0);
+  });
+
+  it('should handle negative width bounds', () => {
+    const bounds = { left: 180, right: -180 };
+    const resolutions = extentToResolutions(bounds);
+    expect(resolutions.length).toBe(22);
+    expect(resolutions[0]).toBeCloseTo(0.703125);
+    expect(resolutions[21]).toBeCloseTo(0.00000686328125);
+  });
+});
diff --git a/test/openlayers/overlay/vectortile/MapboxStylesSpec.js b/test/openlayers/overlay/vectortile/MapboxStylesSpec.js
@@ -309,4 +309,58 @@ describe("openlayers_MapboxStyles", () => {
           }
       });
   });
+
+  it("handle relative url with param", done => {
+    spyOn(XMLHttpRequest.prototype, 'send').and.callThrough();
+    spyOn(XMLHttpRequest.prototype, 'setRequestHeader').and.callThrough();
+    var style = {
+        "version" : 8,
+        "sprite" : "../sprites/sprite",
+        "glyphs" : "../fonts/{fontstack}/{range}.pbf",
+        "sources": {
+            "esri": {
+                "type": "vector",
+                "url": "../../"
+            }
+        },
+        "layers" : [{
+                "id" : "Contour_11_main/0",
+                "type" : "line",
+                "source" : "esri",
+                "source-layer" : "Contour",
+                "filter" : ["all", ["==", "Index3", 1], ["==", "Index5", 1]],
+                "minzoom" : 11,
+                "maxzoom" : 12,
+                "paint" : {
+                    "line-color" : "#61674a",
+                    "line-opacity" : 0.5,
+                    "line-width" : {
+                        "base" : 1.2,
+                        "stops" : [[11, 0.7], [16, 1.1]]
+                    }
+                }	
+        }]
+    }
+    mapboxStyles = new MapboxStyles({
+        style: style,
+        baseUrl: 'http://localhost:9876?tkk=ddddssss',
+        map: map,
+        source: "California",
+        headers:{'appToken':'test'}
+    });
+    mapboxStyles.on("styleloaded", () => {
+        try {
+            style = mapboxStyles.getStyleFunction();
+            expect(style).not.toBeNull();
+            expect(mapboxStyles._mbStyle.glyphs).toBe('http://localhost:9876/fonts/{fontstack}/{range}.pbf?tkk=ddddssss');
+            expect(mapboxStyles._mbStyle.sprite).toBe('http://localhost:9876/sprites/sprite?tkk=ddddssss');
+            expect(mapboxStyles._mbStyle.sources['esri']['url']).toBe('http://localhost:9876/?tkk=ddddssss');
+            done();
+        } catch (e) {
+            console.log("'init_Style_headers'案例失败" + e.name + ":" + e.message);
+            expect(false).toBeTruthy();
+            done();
+        }
+    });
+});
 });
diff --git a/test/test-main-common.js b/test/test-main-common.js
@@ -46,6 +46,7 @@ import './common/iServer/GetLayersInfoServiceSpec.js';
 import './common/iServer/GetLayersLegendInfoServiceSpec.js';
 import './common/iServer/GridSpec.js';
 import './common/iServer/ImageSpec.js';
+import './common/iServer/InitMapServiceBaseSpec.js';
 import './common/iServer/InterpolationAnalystServiceSpec.js';
 import './common/iServer/LabelImageCellSpec.js';
 import './common/iServer/LabelMixedStyleSpec.js';

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@`
`89`	`89`	`inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');`
`90`	`90`	`}`
`91`	`91`	`if (inArray(includes, 'ol-mapbox-style')) {`
`92`		`- inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-5/olms.js');`
	`92`	`+ inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-6/olms.js');`
`93`	`93`	`}`
`94`	`94`	`if (inArray(includes, 'deck')) {`
`95`	`95`	`inputScript(libsurl + '/deck.gl/5.1.3/deck.gl.min.js');`
Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,7 @@ export class VectorTileSuperMapRest extends VectorTile {`
`309`	`309`	`const response = await FetchRequest.get(url, null, {`
`310`	`310`	`withCredentials: options.withCredentials`
`311`	`311`	`});`
	`312`	`+ this.baseUrl = url;`
`312`	`313`	`style = await response.json();`
`313`	`314`	`}`
`314`	`315`	`await this._fillByStyleJSON(style, options.source);`
`@@ -323,11 +324,15 @@ export class VectorTileSuperMapRest extends VectorTile {`
`323`	`324`	`}`
`324`	`325`	`if (style.sources && style.sources[source]) {`
`325`	`326`	`let newUrl;`
	`327`	`+ let paramUrl = this.baseUrl && this.baseUrl.split('?')[1];`
`326`	`328`	`if (style.sources[source].tiles) {`
`327`	`329`	`newUrl = style.sources[source].tiles[0];`
`328`	`330`	`if (!CommonUtil.isAbsoluteURL(newUrl)) {`
`329`	`331`	`newUrl = CommonUtil.relative2absolute(newUrl, this.baseUrl);`
`330`	`332`	`}`
	`333`	`+ if (paramUrl) {`
	`334`	`+ newUrl = CommonUtil.urlAppend(newUrl, paramUrl);`
	`335`	`+ }`
`331`	`336`	`} else if (style.sources[source].url) {`
`332`	`337`	`let tiles = style.sources[source].url;`
`333`	`338`	`if (!CommonUtil.isAbsoluteURL(tiles)) {`
`@@ -340,6 +345,9 @@ export class VectorTileSuperMapRest extends VectorTile {`
`340`	`345`	`tileUrl = CommonUtil.relative2absolute(tileUrl, tiles);`
`341`	`346`	`}`
`342`	`347`	`newUrl = SecurityManager.appendCredential(tileUrl);`
	`348`	`+ if (paramUrl) {`
	`349`	`+ newUrl = CommonUtil.urlAppend(newUrl, paramUrl);`
	`350`	`+ }`
`343`	`351`	`}`
`344`	`352`	`this._tileUrl = SecurityManager.appendCredential(newUrl);`
`345`	`353`	`}`
Original file line number	Diff line number	Diff line change
`@@ -377,26 +377,34 @@ export class MapboxStyles extends Observable {`
`377`	`377`	`return parts ? parts[1] + extension + (parts.length > 2 ? parts[2] : '') : url + extension;`
`378`	`378`	`}`
`379`	`379`
`380`		`- _handleRelativeUrl(styles, baseUrl) {`
`381`		`- if (!baseUrl) {`
	`380`	`+ _handleRelativeUrl(styles, url) {`
	`381`	`+ if (!url) {`
`382`	`382`	`return styles;`
`383`	`383`	`}`
	`384`	`+ const baseUrl = url.split('?')[0];`
	`385`	`+ const paramUrl = url.split('?')[1] \|\| '';`
`384`	`386`	`Object.keys(styles).forEach((fieldName) => {`
`385`	`387`	`if (fieldName === 'sources') {`
`386`	`388`	`Object.keys(styles[fieldName]).forEach((sourceName) => {`
`387`		`- this._handleRelativeUrl(styles[fieldName][sourceName], baseUrl);`
	`389`	`+ this._handleRelativeUrl(styles[fieldName][sourceName], url);`
`388`	`390`	`})`
`389`	`391`	`}`
`390`	`392`	`if (fieldName === 'sprite' \|\| fieldName === 'glyphs' \|\| fieldName === 'url') {`
`391`	`393`	`if (styles[fieldName] && typeof styles[fieldName] === 'string' && !CommonUtil.isAbsoluteURL(styles[fieldName])) {`
`392`	`394`	`styles[fieldName] = CommonUtil.relative2absolute(styles[fieldName], baseUrl);`
`393`	`395`	`}`
	`396`	`+ if (paramUrl && !styles[fieldName].includes(paramUrl)) {`
	`397`	`+ styles[fieldName] = styles[fieldName] + (paramUrl ? (styles[fieldName].includes('?') ? '&' + paramUrl : '?' + paramUrl) : '');`
	`398`	`+ }`
`394`	`399`	`}`
`395`	`400`	`if (fieldName === 'tiles' && Array.isArray(styles[fieldName])) {`
`396`	`401`	`styles[fieldName].forEach((tile) => {`
`397`	`402`	`if (!CommonUtil.isAbsoluteURL(tile)) {`
`398`	`403`	`tile = CommonUtil.relative2absolute(tile, baseUrl);`
`399`	`404`	`}`
	`405`	`+ if (paramUrl && !tile.includes(paramUrl)) {`
	`406`	`+ tile = tile + (paramUrl ? (styles[fieldName].includes('?') ? '&' + paramUrl : '?' + paramUrl) : '');`
	`407`	`+ }`
`400`	`408`	`})`
`401`	`409`	`}`
`402`	`410`	`})`