@supermapgis/iclient-ol 12.0.1-r → 12.1.2

package/mapping/WebMap.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 proj4 from 'proj4';
@@ -29,7 +29,6 @@ import MouseWheelZoom from 'ol/interaction/MouseWheelZoom';
 import * as olProj from 'ol/proj';
 import * as olProj4 from 'ol/proj/proj4';
 import * as olLayer from 'ol/layer';
-import WMTSCapabilities from 'ol/format/WMTSCapabilities';
 import WMSCapabilities from 'ol/format/WMSCapabilities';
 import TileGrid from 'ol/tilegrid/TileGrid';
 import * as olTilegrid from 'ol/tilegrid';
@@ -49,6 +48,7 @@ import Text from 'ol/style/Text';
 import Collection from 'ol/Collection';
 import { containsCoordinate, getCenter } from 'ol/extent';
 import difference from 'lodash.difference';
+import { XMLParser } from 'fast-xml-parser';
 
 window.proj4 = proj4;
 window.Proj4js = proj4;
@@ -70,6 +70,19 @@ const dpiConfig = {
   default: 96, // 常用dpi
   iServerWMTS: 90.7142857142857 // iserver使用的wmts图层dpi
 };
+// 以下路径统一转为array格式（fast-xml-parser插件在返回值数量为1时候返回obj,返回数量大于1时返回array）
+const WMTS_ARRAY_NODE_PATHS = [
+    'Capabilities.Contents.Layer',
+    'Capabilities.Contents.Layer.Format',
+    'Capabilities.Contents.Layer.Style',
+    'Capabilities.Contents.Layer.TileMatrixSetLink',
+    'Capabilities.Contents.TileMatrixSet',
+    'Capabilities.Contents.TileMatrixSet.TileMatrix',
+    'Capabilities.OperationsMetadata.Operation',
+    'Capabilities.OperationsMetadata.Operation.DCP.HTTP.Get',
+    'Capabilities.OperationsMetadata.Operation.DCP.HTTP.Get.Constraint',
+    'Capabilities.OperationsMetadata.Operation.DCP.HTTP.Get.Constraint.AllowedValues.Value'
+];
 /**
  * @class WebMap
  * @category  iPortal/Online Resources Map
@@ -84,7 +97,7 @@ const dpiConfig = {
  * @param {function} [options.errorCallback] - 加载地图失败调用的函数。
  * @param {string} [options.credentialKey] - 凭证密钥。例如为 "key"、"token"，或者用户自定义的密钥。用户申请了密钥，此参数必填。
  * @param {string} [options.credentialValue] - 凭证密钥对应的值，credentialKey 和 credentialValue 必须一起使用。
- * @deprecated {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+ * @deprecated {boolean} [options.withCredentials] - 请求是否携带凭据。默认情况下，仅同源请求包含凭据。
  * @deprecated {boolean} [options.excludePortalProxyUrl] - server 传递过来的 URL 是否带有代理。
  * @param {Object} [options.serviceProxy] - SuperMap iPortal 内置代理信息，仅矢量瓦片图层上图才会使用。
  * @param {string} [options.tiandituKey] - 天地图的 key。
@@ -98,6 +111,7 @@ const dpiConfig = {
  * @param {function} [options.mapSetting.controls] - 地图的控件。
  * @param {function} [options.mapSetting.interactions] - 地图控制的参数。
  * @param {number} [options.restDataSingleRequestCount=1000] - 自定义 restData 分批请求，单次请求数量。
+ * @param {number} [options.overflowTiles=0] - RestMap 栅格图层瓦片范围向外扩大的圈数。
  * @extends {ol.Observable}
  * @usage
  */
@@ -129,6 +143,7 @@ export class WebMap extends Observable {
     this.webMap = options.webMap;
     this.tileFormat = options.tileFormat && options.tileFormat.toLowerCase();
     this.restDataSingleRequestCount = options.restDataSingleRequestCount || 1000;
+    this.overflowTiles = typeof options.overflowTiles === 'undefined' ? 1 : options.overflowTiles;
     this.tileRequestParameters = options.tileRequestParameters;
     this.createMap(options.mapSetting);
     if (this.webMap) {
@@ -600,7 +615,7 @@ export class WebMap extends Observable {
             tileGrid: TileSuperMapRest.optionsFromMapJSON(url, result).tileGrid,
             tileLoadFunction: me.getCustomTileLoadFunction()
           };
-          if (url && this.isAddProxy(url)) {
+          if (url && me.isAddProxy(url)) {
             options.tileProxy = me.server + 'apps/viewer/getUrlResource.png?url=';
           }
           source = new TileSuperMapRest(options);
@@ -667,9 +682,15 @@ export class WebMap extends Observable {
    * @param {Object} capabilitiesText - wmts信息
    */
   getWMTSScales(identifier, capabilitiesText) {
-    const format = new WMTSCapabilities();
-    let capabilities = format.read(capabilitiesText);
-
+    const parser = new XMLParser({
+      attributeNamePrefix: '',
+      ignoreAttributes: false,
+      removeNSPrefix: true,
+      isArray: (name, jpath) => {
+        return WMTS_ARRAY_NODE_PATHS.includes(jpath);
+      }
+    });
+    const capabilities = parser.parse(capabilitiesText).Capabilities;
     let content = capabilities.Contents;
     let tileMatrixSet = content.TileMatrixSet;
     let scales = [];
@@ -839,7 +860,10 @@ export class WebMap extends Observable {
               layerType: 'VECTOR_TILE'
             });
           }
-          layerInfo.visibleScale && this.setVisibleScales(layer, layerInfo.visibleScale);
+          // 后续逻辑非需要visibleScales  否则修改很复杂
+          layerInfo.visibleScales = layer.getSource().getTileGrid().getResolutions().map((res) => {
+            return Util.resolutionToScale(res, 96, layerInfo.coordUnit || 'm');
+          });
           //否则没有ID，对不上号
           layerInfo.layer = layer;
           layerInfo.layerID = layerID;
@@ -1138,7 +1162,7 @@ export class WebMap extends Observable {
         }
         break;
       case 'OSM':
-        baseLayerInfo.url = 'http://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+        baseLayerInfo.url = 'https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png';
         baseLayerInfo.epsgCode = 'EPSG:3857';
         baseLayerInfo.minZoom = 1;
         baseLayerInfo.maxZoom = 19;
@@ -1292,6 +1316,10 @@ export class WebMap extends Observable {
     ) {
       options.tileProxy = this.server + 'apps/viewer/getUrlResource.png?url=';
     }
+    if(this.overflowTiles) {
+      options.overflowTiles = this.overflowTiles;
+      layerInfo.restMapExtentExpanded = true;
+    }
     let source = new TileSuperMapRest(options);
     SecurityManager[`register${keyfix}`](layerInfo.url);
     return source;
@@ -1379,7 +1407,11 @@ export class WebMap extends Observable {
   getLayerOtherOptions(layerInfo) {
     const { layerType, extent, minZoom, maxZoom } = layerInfo;
     const extentVal = layerType === 'ZXY_TILE' ? this._getZXYTileMapBounds(layerInfo) : extent;
-    const options = { extent: extentVal };
+    const options = {};
+    if (!layerInfo.restMapExtentExpanded) {
+      // 扩大 RestMap 栅格图层的 tileGrid 后，不再向图层传递 extent
+      options.extent = extentVal;
+    }
     if (typeof minZoom === 'number' && minZoom !== 0) {
       options.minZoom = minZoom - 1;
     }
@@ -1625,7 +1657,12 @@ export class WebMap extends Observable {
     }
     return this.getRequestUrl(url, proxy);
   }
-
+  getBoundsFromConrner(lower, upper) {
+        const bottomLeft = lower.split(' '),
+            topRight = upper.split(' ');
+        const bounds = bottomLeft.concat(topRight);
+        return [+bounds[0], +bounds[1], +bounds[2], +bounds[3]];
+  }
   /**
    * @private
    * @function WebMap.prototype.getWmtsInfo
@@ -1645,8 +1682,15 @@ export class WebMap extends Observable {
         return response.text();
       })
       .then(function (capabilitiesText) {
-        const format = new WMTSCapabilities();
-        let capabilities = format.read(capabilitiesText);
+        const parser = new XMLParser({
+          attributeNamePrefix: '',
+          ignoreAttributes: false,
+          removeNSPrefix: true,
+          isArray: (name, jpath) => {
+            return WMTS_ARRAY_NODE_PATHS.includes(jpath);
+          }
+        });
+        const capabilities = parser.parse(capabilitiesText).Capabilities;
         if (that.isValidResponse(capabilities)) {
           let content = capabilities.Contents;
           let tileMatrixSet = content.TileMatrixSet,
@@ -1661,7 +1705,10 @@ export class WebMap extends Observable {
               idx = n;
               layer = layers[idx];
               layerFormat = layer.Format[0];
-              var layerBounds = layer.WGS84BoundingBox;
+              var WGS84BoundingBox = layer.WGS84BoundingBox;
+              var boundingBox = layer.BoundingBox;
+              let bbox = WGS84BoundingBox ? WGS84BoundingBox : boundingBox;
+              var layerBounds = that.getBoundsFromConrner(bbox.LowerCorner, bbox.UpperCorner)
               // tileMatrixSetLink = layer.TileMatrixSetLink;
               break;
             }
@@ -1683,7 +1730,7 @@ export class WebMap extends Observable {
                 matrixIds.push(tileMatrixSet[i].TileMatrix[h].Identifier);
               }
               //bug wmts出图需要加上origin，否则会出现出图不正确的情况。偏移或者瓦片出不了
-              let origin = tileMatrixSet[i].TileMatrix[0].TopLeftCorner;
+              let origin = tileMatrixSet[i].TileMatrix[0].TopLeftCorner.split(' ').map(Number);
               layerInfo.origin =
                 ['EPSG:4326', 'EPSG:4490'].indexOf(wmtsLayerEpsg) > -1 ? [origin[1], origin[0]] : origin;
               break;
@@ -1691,7 +1738,7 @@ export class WebMap extends Observable {
           }
           let name = layerInfo.name,
             extent;
-          if (layerBounds) {
+          if(WGS84BoundingBox) {
             if (layerBounds[0] < -180) {
               layerBounds[0] = -180;
             }
@@ -1705,11 +1752,13 @@ export class WebMap extends Observable {
               layerBounds[3] = 90;
             }
             extent = olProj.transformExtent(layerBounds, 'EPSG:4326', that.baseProjection);
-          } else {
+        } else if(boundingBox) {
+            extent = layerBounds;
+        } else {
             extent = olProj.get(that.baseProjection).getExtent();
-          }
+        }
           layerInfo.tileUrl = that.getTileUrl(
-            capabilities.OperationsMetadata.GetTile.DCP.HTTP.Get,
+            capabilities.OperationsMetadata.Operation.find(o => o.name === 'GetTile').DCP.HTTP.Get,
             layer,
             layerFormat,
             isKvp
@@ -2808,7 +2857,7 @@ export class WebMap extends Observable {
           attr._smiportal_imgLinkUrl !== ''
         ) {
           //上传的图片，加上当前地址
-          imgUrl = `${Util.getIPortalUrl()}resources/markerIcon/${attr._smiportal_imgLinkUrl}`;
+          imgUrl = `${this.server}/resources/markerIcon/${attr._smiportal_imgLinkUrl}`;
         }
         attributes = {
           dataViz_description: attr._smiportal_description,
@@ -5175,20 +5224,20 @@ export class WebMap extends Observable {
    * @param {string} coordUnit
    * @returns {Array} visibleResolution
    */
-  createVisibleResolution(visibleScales, indexbounds, bounds, coordUnit) {
+  createVisibleResolution(visibleScales, indexbounds, bounds) {
     let visibleResolution = [];
     // 1 设置了地图visibleScales的情况
-    if (visibleScales && visibleScales.length > 0) {
-      visibleResolution = visibleScales.map((scale) => {
-        let value = 1 / scale;
-        let res = this.getResFromScale(value, coordUnit);
-        return res;
-      });
-    } else {
+    // if (visibleScales && visibleScales.length > 0) {
+    //   visibleResolution = visibleScales.map((scale) => {
+    //     let value = 1 / scale;
+    //     let res = this.getResFromScale(value, coordUnit);
+    //     return res;
+    //   });
+    // } else {
       // 2 地图的bounds
       let envelope = this.getEnvelope(indexbounds, bounds);
       visibleResolution = this.getStyleResolutions(envelope);
-    }
+    // }
     return visibleResolution;
   }
 
@@ -5229,7 +5278,7 @@ export class WebMap extends Observable {
     );
     const envelope = this.getEnvelope(indexbounds, layerInfo.bounds);
     const styleResolutions = this.getStyleResolutions(envelope);
-    // const origin = [envelope.left, envelope.top];
+    const origin = [envelope.left, envelope.top];
     let baseUrl = layerInfo.url;
     let paramUrl = baseUrl.split('?')[1];
     if (layerInfo.dataSource.type === 'ARCGIS_VECTORTILE') {
@@ -5273,6 +5322,11 @@ export class WebMap extends Observable {
             style: styles,
             withCredentials,
             projection: layerInfo.projection,
+            tileGrid: new TileGrid({
+              resolutions: styleResolutions,
+              origin,
+              tileSize: 512
+            }),
             format: new MVT({
               featureClass: olRenderFeature
             }),

package/mapping/index.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 export { BaiduMap } from './BaiduMap';

package/namespace.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 

package/overlay/DataFlow.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { DataFlowService } from "../services/DataFlowService";
@@ -13,9 +13,9 @@ import GeoJSON from 'ol/format/GeoJSON';
  * @param {Object} opt_options - 参数。
  * @param {string} opt_options.ws - SuperMap iServer 数据流服务地址，例如：http://localhost:8090/iserver/services/dataflowTest/dataflow。
  * @param {string} [opt_options.idField = 'id'] - 要素属性中表示唯一标识的字段。
- * @param {GeoJSONObject} [opt_options.geometry] - 指定几何范围，只有在该范围内的要素才能被订阅。
+ * @param {GeoJSONObject} [opt_options.geometry] - 空间范围，只有在该范围内的要素才能被接收。
  * @param {Object} [opt_options.prjCoordSys] - 请求的地图的坐标参考系统。当此参数设置的坐标系统不同于地图的原有坐标系统时，系统会进行动态投影，并返回动态投影后的地图瓦片。例如：{"epsgCode":3857}。
- * @param {Object} [opt_options.excludeField] - 排除字段。
+ * @param {Object} [opt_options.excludeField] - 过滤字段。传入此参数，接收到的信息将不包含过滤掉的字段。
  * @extends {ol.source.Vector}
  * @example
  * var source = new DataFlow({
@@ -69,8 +69,8 @@ export class DataFlow extends VectorSource {
 
     /**
      * @function DataFlow.prototype.setExcludeField
-     * @description 设置唯一字段。
-     * @param {Object} excludeField - 排除字段。
+     * @description 设置过滤字段。传入此参数，接收到的信息将不包含过滤掉的字段。
+     * @param {Object} excludeField - 过滤字段。
      */
     setExcludeField(excludeField) {
         this.dataService.setExcludeField(excludeField);

package/overlay/FGB.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 VectorSource from 'ol/source/Vector';

package/overlay/Graph.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Util as CommonUtil} from '@supermapgis/iclient-common/commontypes/Util';

package/overlay/GraphMap.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 Observable from 'ol/Observable';
@@ -16,7 +16,7 @@ import { transformExpandCollapseHiddenData } from '@supermapgis/iclient-common/o
  * @param {Object} [options] - 参数。
  * @param {KnowledgeGraph.Config} [options.config] - KnowledgeGraph 的配置项。
  * @param {string} [options.proxy] - 服务代理地址。
- * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+ * @param {boolean} [options.withCredentials] - 请求是否携带凭据。默认情况下，仅同源请求包含凭据。
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。
  * @fires GraphMap#loaded
@@ -54,7 +54,7 @@ export class GraphMap extends Observable {
    * @param {string} graphMapName - 图谱名称。
    * @param {Object} options - 参数。
    * @param {string} [options.proxy] - 服务代理地址。
-   * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+   * @param {boolean} [options.withCredentials] - 请求是否携带凭据。默认情况下，仅同源请求包含凭据。
    * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
    * @param {Object} [options.headers] - 请求头。
    * @param {KnowledgeGraph.Config} [options.config] - knowledgegraph 配置项。
@@ -82,7 +82,7 @@ export class GraphMap extends Observable {
    * @param {string} serviceUrl - GraphMap 服务地址，例如：http://{iserver}/services/knowledgeGraph-test/restjsr/graph
    * @param {Object} options - 参数。
    * @param {string} [options.proxy] - 服务代理地址。
-   * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+   * @param {boolean} [options.withCredentials] - 请求是否携带凭据。默认情况下，仅同源请求包含凭据。
    * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
    * @param {Object} [options.headers] - 请求头。
    */

package/overlay/Graphic.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Util } from '../core/Util';

package/overlay/HeatMap.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 {Util} from '../core/Util';

package/overlay/Label.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Util as CommonUtil} from '@supermapgis/iclient-common/commontypes/Util';

package/overlay/Mapv.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 {

package/overlay/Range.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Util as CommonUtil} from '@supermapgis/iclient-common/commontypes/Util';

package/overlay/RankSymbol.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Theme as FeatureTheme } from '@supermapgis/iclient-common/overlay/feature/Theme';

package/overlay/Turf.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 * as turf from '@turf/turf';

package/overlay/Unique.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Util as CommonUtil} from '@supermapgis/iclient-common/commontypes/Util';

package/overlay/VectorTileSuperMapRest.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Util } from '../core/Util';
@@ -34,7 +34,7 @@ import decryptTileUtil from '@supermapgis/tile-decryptor';
  * @param {(string|undefined)} options.source - Mapbox Style JSON 对象中的 source 名称。当 `options.style` 设置时有效。当不配置时，默认为 Mapbox Style JSON 的 `sources` 对象中的第一个。
  * @param {(string|Object)} [options.attributions='Tile Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> with <span>© <a href='https://iclient.supermap.io' target='_blank'>SuperMap iClient</a></span>'] - 版权描述信息。
  * @param {Object} [options.format] - 瓦片的要素格式化。
- * @param {boolean} [options.withCredentials] - 请求是否携带 cookie。
+ * @param {boolean} [options.withCredentials] - 请求是否携带凭据。默认情况下，仅同源请求包含凭据。
  * @param {Object} [options.headers] - 请求头。
  * @param {boolean|Function} [options.decrypt] - 瓦片解密。如果是 true 表示用内置的解密方法， 如 decrypt: true；如果是function 则是自定义解密如 decrypt: function ({ key, bytes })。
  * @param {Function} [options.decryptCompletedFunction] - 解密完成后触发。如 decryptCompletedFunction(completeData)。

package/overlay/graphic/CanvasRenderer.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Util as CommonUtil } from '@supermapgis/iclient-common/commontypes/Util';

package/overlay/graphic/CloverShape.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 

package/overlay/graphic/Graphic.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 

package/overlay/graphic/HitCloverShape.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 {

package/overlay/graphic/WebGLRenderer.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Util as CommonUtil } from "@supermapgis/iclient-common/commontypes/Util";

package/overlay/graphic/index.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 export {Graphic as OverlayGraphic} from './Graphic';

package/overlay/index.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 export {DataFlow} from './DataFlow';

package/overlay/mapv/MapvCanvasLayer.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 /**

package/overlay/mapv/MapvLayer.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 {

package/overlay/mapv/index.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 export {MapvCanvasLayer} from './MapvCanvasLayer';

package/overlay/theme/GeoFeature.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Bounds } from '@supermapgis/iclient-common/commontypes/Bounds';

package/overlay/theme/Theme.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 {Util} from '../../core/Util';
@@ -19,7 +19,7 @@ import GeoJSON from 'ol/format/GeoJSON';
  * @class Theme
  * @browsernamespace ol.source
  * @category Visualization Theme
- * @classdesc 专题图基类。地图学中将突出而深入地表示一种或几种要素或现象，即集中表示一个主题内容的地图称为专题地图。
+ * @classdesc 专题图基类。地图学中将突出而深入地表示一种或几种要素或现象，即集中表示一个主题内容的地图称为专题地图。<br>
  * 在 SuperMap 中，专题图是地图图层的符号化显示，即用各种图形渲染风格（大小，颜色，线型，填充等）来图形化地表现专题要素的某方面特征。
  * 调用建议：使用其子类实现该类。
  * @modulecategory Overlay

package/overlay/theme/ThemeFeature.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { GeoJSON as GeoJSONFormat } from '@supermapgis/iclient-common/format/GeoJSON';

package/overlay/theme/index.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 export {GeoFeature} from './GeoFeature';

package/overlay/vectortile/DeafultCanvasStyle.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 /**

package/overlay/vectortile/MapboxStyles.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { FetchRequest } from '@supermapgis/iclient-common/util/FetchRequest';
@@ -34,7 +34,7 @@
   * 当不配置时，默认为 Mapbox Style JSON 的 `sources` 对象中的第一个。
   * @param {ol.Map} [options.map] - Openlayers 地图对象，仅用于面填充样式以及Background图层，若没有面填充样式或Background图层可不填。
   * @param {ol.StyleFunction} [options.selectedStyle] -选中样式 Function。
-  * @param {boolean} [options.withCredentials] - 请求是否携带 cookie。
+  * @param {boolean} [options.withCredentials] - 请求是否携带凭据。默认情况下，仅同源请求包含凭据。
   * @param {Object} [options.headers] - 请求头。
   * @example
   *  var mbStyle = new MapboxStyles({

package/overlay/vectortile/StyleMap.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 /**

package/overlay/vectortile/VectorTileStyles.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Util as CommonUtil} from '@supermapgis/iclient-common/commontypes/Util';
@@ -89,7 +89,7 @@ export class VectorTileStyles extends Observable {
                                 cartoCss = cartoCss.replace(/\\#/gi, "___");
                                 //替换一些关键符号
                                 var cachedLayer = {};
-                                layersInfo && Object.keys(layersInfo).sort().forEach(function (attr) {
+                                layersInfo && Object.keys(layersInfo).sort((a, b) => a.localeCompare(b)).forEach(function (attr) {
                                     var newAttr = attr.replace(/[@#\s]/gi, "___");
                                     var to = attr;
                                     var keys = Object.keys(cachedLayer);

package/overlay/vectortile/index.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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.*/
 export { pointStyle, lineStyle, polygonStyle, DeafultCanvasStyle } from './DeafultCanvasStyle';

package/overlay/vectortile/olExtends.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2026 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 { Util } from '../../core/Util';
@@ -24,14 +24,6 @@
                  units: ol.proj.Units.TILE_PIXELS
              });
          };
-         //解决 new ol.format.MVT({featureClass: ol.Feature})时，非3857显示异常的问题。ol即将发布的5.0版本已解决。
-         // eslint-disable-next-line no-unused-vars
-         ol.format.MVT.prototype.readProjection = function(source) {
-             return new ol.proj.Projection({
-                 code: '',
-                 units: ol.proj.Units.TILE_PIXELS
-             });
-         };
          //解决面填充时不能整版填充的问题。ol即将发布的5.0版本已解决。
          // eslint-disable-next-line no-unused-vars
          ol.render.canvas.Replay.prototype.applyFill = function(state, geometry) {