Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Yuki-Zhao · Yuki-Zhao · commit dfa42722d901 · 2025-04-07T11:11:57.000+08:00
diff --git a/dist/mapboxgl/include-mapboxgl.js b/dist/mapboxgl/include-mapboxgl.js
@@ -59,8 +59,8 @@
       inputScript(libsurl + '/mapbox-gl-js/1.13.2/mapbox-gl.js');
     }
     if (inArray(includes, 'mapbox-gl-enhance')) {
-      inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-8/mapbox-gl-enhance.css');
-      inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-8/mapbox-gl-enhance.js');
+      inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-9/mapbox-gl-enhance.css');
+      inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-9/mapbox-gl-enhance.js');
     }
     if (inArray(includes, 'L7')) {
       inputScript(libsurl + '/mapboxgl-l7-render/0.0.2/mapboxgl-l7-render.js');
diff --git a/dist/maplibregl/include-maplibregl.js b/dist/maplibregl/include-maplibregl.js
@@ -59,8 +59,8 @@
       inputScript(libsurl + '/maplibre-gl-js/4.3.2/maplibre-gl.min.js');
     }
     if (inArray(includes, 'maplibre-gl-enhance')) {
-      inputCSS(libsurl + '/maplibre-gl-js-enhance/4.3.0-4/maplibre-gl-enhance.css');
-      inputScript(libsurl + '/maplibre-gl-js-enhance/4.3.0-4/maplibre-gl-enhance.js');
+      inputCSS(libsurl + '/maplibre-gl-js-enhance/4.3.0-5/maplibre-gl-enhance.css');
+      inputScript(libsurl + '/maplibre-gl-js-enhance/4.3.0-5/maplibre-gl-enhance.js');
     }
     if (inArray(includes, 'L7')) {
       inputScript(libsurl + '/maplibregl-l7-render/0.0.2/maplibregl-l7-render.js');
diff --git a/examples/leaflet/imageService.html b/examples/leaflet/imageService.html
@@ -464,7 +464,7 @@ <h4 class="modal-title" id="myModalLabel"></h4>
       }
 
       function drawCompleted(e) {
-        var bounds = e.layer._bounds;
+        var bounds = e.layer.getBounds();
         var _northEast = bounds._northEast;
         var _southWest = bounds._southWest;
         plotBbox = [_southWest.lng, _southWest.lat, _northEast.lng, _northEast.lat];
diff --git a/examples/leaflet/turf_gridAnalysis.html b/examples/leaflet/turf_gridAnalysis.html
@@ -201,7 +201,7 @@
 
     function mapDrawListener(e) {
         var layer = e.layer;
-        var layerBounds = layer._bounds;
+        var layerBounds = layer.getBounds();
         if (!bounds.contains(layerBounds)) {
             widgets.alert.showAlert(resources.msg_beyondScope, false);
             return;
diff --git a/src/common/commontypes/geometry/LinearRing.js b/src/common/commontypes/geometry/LinearRing.js
@@ -2,6 +2,7 @@
  * 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 {LineString} from './LineString';
+import {Util} from '../Util';
 
 /**
  * @class  GeometryLinearRing
@@ -36,6 +37,20 @@ export class LinearRing extends LineString {
         this.geometryType = "LinearRing";
     }
 
+
+    addComponents(components) {
+        if (!(Util.isArray(components))) {
+            components = [components];
+        }
+        let len = components.length;
+        if (len > 1 && components[0].equals(components[components.length - 1])) {
+            len = components.length - 1;
+        }
+        for (var i = 0; i < len; i++) {
+            this.addComponent(components[i]);
+        }
+    }
+
     /**
      * @function GeometryLinearRing.prototype.addComponent
      * @description 添加一个点到几何图形数组中，如果这个点将要被添加到组件数组的末端，并且与数组中已经存在的最后一个点相同，
@@ -49,18 +64,17 @@ export class LinearRing extends LineString {
         var added = false;
 
         //remove last point
-        var lastPoint = this.components.pop();
+        this.components.pop();
 
         // given an index, add the point
         // without an index only add non-duplicate points
-        if (index != null || !point.equals(lastPoint)) {
+        if (index != null || !point.equals(this.components[this.components.length - 1])) {
             added = super.addComponent.apply(this, arguments);
         }
 
         //append copy of first point
         var firstPoint = this.components[0];
         super.addComponent.apply(this, [firstPoint]);
-
         return added;
     }
 
diff --git a/src/common/mapping/WebMapV3.js b/src/common/mapping/WebMapV3.js
@@ -315,7 +315,7 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa
     }
     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,
diff --git a/src/common/mapping/utils/L7LayerUtil.js b/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) {
diff --git a/src/leaflet/core/Base.js b/src/leaflet/core/Base.js
@@ -126,11 +126,13 @@ L.GeoJSON.include({
     layer.feature = L.GeoJSON.asFeature(geojson);
 
     layer.defaultOptions = layer.options;
-    var defaultGeometryOptions = this.defaultGeometryOptions[geometry.type];
-    if (defaultGeometryOptions) {
-      layer.commonOptions = Object.assign({}, defaultGeometryOptions);
-    } else {
-      this.defaultGeometryOptions[geometry.type] = L.Util.extend({}, layer.defaultOptions);
+    if (this.defaultGeometryOptions) {
+      var defaultGeometryOptions = this.defaultGeometryOptions[geometry.type];
+      if (defaultGeometryOptions) {
+        layer.commonOptions = Object.assign({}, defaultGeometryOptions);
+      } else {
+        this.defaultGeometryOptions[geometry.type] = L.Util.extend({}, layer.defaultOptions);
+      }
     }
     this.resetStyle(layer);
 
diff --git a/src/leaflet/mapping/TiledMapLayer.js b/src/leaflet/mapping/TiledMapLayer.js
@@ -1,16 +1,15 @@
 /* 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 L from 'leaflet';
- import '../core/Base';
- import { SecurityManager } from '@supermapgis/iclient-common/security/SecurityManager';
- import { ServerGeometry } from '@supermapgis/iclient-common/iServer/ServerGeometry';
- import { Unit } from '@supermapgis/iclient-common/REST';
- import { Util as CommonUtil } from '@supermapgis/iclient-common/commontypes/Util';
-
- import * as Util from '../core/Util';
- import Attributions from '../core/Attributions';
+import L from 'leaflet';
+import '../core/Base';
+import { SecurityManager } from '@supermapgis/iclient-common/security/SecurityManager';
+import { ServerGeometry } from '@supermapgis/iclient-common/iServer/ServerGeometry';
+import { Unit } from '@supermapgis/iclient-common/REST';
+import { Util as CommonUtil } from '@supermapgis/iclient-common/commontypes/Util';
 
+import * as Util from '../core/Util';
+import Attributions from '../core/Attributions';
 /**
  * @class TiledMapLayer
  * @deprecatedclassinstance L.supermap.tiledMapLayer
@@ -41,12 +40,12 @@
  * @param {string} [options.attribution='Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' title='SuperMap iServer' target='_blank'>SuperMap iServer</a></span>'] - 版权描述信息。
  * @param {Array.<number>} [options.subdomains] - 子域名数组。
  * @param {ChartSetting} [options.chartSetting] - 海图显示参数设置类，用于管理海图显示环境，包括海图的显示模式、显示类型名称、颜色模式、安全水深线等各种显示风格。
+ * @param {number} [options.overflowTiles = 0] - 绘制超出图层范围的瓦片圈数。常用于位于地图边缘的要素符号显示不全的场景。默认值为0，表示不绘制超出图层范围的瓦片。当 options.noWrap 为 true 时，overflowTiles有效。
  * @fires TiledMapLayer#tilesetsinfoloaded
  * @fires TiledMapLayer#tileversionschanged
  * @usage
  */
 export var TiledMapLayer = L.TileLayer.extend({
-
     options: {
         //如果有layersID，则是在使用专题图
         layersID: null,
@@ -68,9 +67,10 @@ export var TiledMapLayer = L.TileLayer.extend({
         crs: null,
         format: 'png',
         //启用托管地址。
-        tileProxy:null,
+        tileProxy: null,
         attribution: Attributions.Common.attribution,
-        subdomains: null
+        subdomains: null,
+        overflowTiles: 0
     },
 
     initialize: function (url, options) {
@@ -94,7 +94,52 @@ export var TiledMapLayer = L.TileLayer.extend({
         this._crs = this.options.crs || map.options.crs;
         L.TileLayer.prototype.onAdd.call(this, map);
     },
+    /**
+     * @override
+     * @private
+     */
+    _resetGrid: function () {
+        L.TileLayer.prototype._resetGrid.call(this);
+        const overflowTiles = this.options.overflowTiles;
+        if (this._globalTileRange && overflowTiles && this.options.noWrap) {
+            this._globalTileRange.min = this._globalTileRange.min.subtract([overflowTiles, overflowTiles]);
+            this._globalTileRange.max = this._globalTileRange.max.add([overflowTiles, overflowTiles]);
+        }
+        if (this.options.bounds && this.options.noWrap && overflowTiles) {
+            const bounds = L.latLngBounds(this.options.bounds);
+            const sw = bounds.getSouthWest();
+            const ne = bounds.getNorthEast();
+            this._boundsTileRange = this._pxBoundsToTileRange(L.bounds(this._crs.latLngToPoint(sw, this._tileZoom), this._crs.latLngToPoint(ne, this._tileZoom)));
+            this._boundsTileRange.min = this._boundsTileRange.min.subtract([overflowTiles, overflowTiles]);
+            this._boundsTileRange.max = this._boundsTileRange.max.add([overflowTiles, overflowTiles]);
 
+        }
+    },
+    /**
+     * @override
+     * @private
+     */
+    _isValidTile: function (coords) {
+        const crs = this._map.options.crs;
+        if (!crs.infinite) {
+            const bounds = this._globalTileRange;
+            if (
+                ((!crs.wrapLng || this.options.noWrap) && (coords.x < bounds.min.x || coords.x > bounds.max.x)) ||
+                (!crs.wrapLat && (coords.y < bounds.min.y || coords.y > bounds.max.y))
+            ) {
+                return false;
+            }
+        }
+        if (!this.options.bounds) {
+            return true;
+        }
+        if (this._boundsTileRange && this.options.noWrap) {
+           return coords.x >= this._boundsTileRange.min.x && coords.x <= this._boundsTileRange.max.x && coords.y >= this._boundsTileRange.min.y && coords.y <= this._boundsTileRange.max.y;
+        } else {
+            var tileBounds = this._tileCoordsToBounds(coords);
+            return L.latLngBounds(this.options.bounds).overlaps(tileBounds);
+        }
+    },
     /**
      * @function TiledMapLayer.prototype.getTileUrl
      * @description 根据行列号获取瓦片地址。
@@ -104,16 +149,16 @@ export var TiledMapLayer = L.TileLayer.extend({
     getTileUrl: function (coords) {
         var scale = this.getScaleFromCoords(coords);
         var layerUrl = this._getLayerUrl();
-        var tileUrl = layerUrl + "&scale=" + scale + "&x=" + coords.x + "&y=" + coords.y;
+        var tileUrl = layerUrl + '&scale=' + scale + '&x=' + coords.x + '&y=' + coords.y;
         //支持代理
         if (this.options.tileProxy) {
             tileUrl = this.options.tileProxy + encodeURIComponent(tileUrl);
         }
         if (!this.options.cacheEnabled) {
-            tileUrl += "&_t=" + new Date().getTime();
+            tileUrl += '&_t=' + new Date().getTime();
         }
         if (this.options.subdomains) {
-            tileUrl = L.Util.template(tileUrl, {s: this._getSubdomain(coords)});
+            tileUrl = L.Util.template(tileUrl, { s: this._getSubdomain(coords) });
         }
         return tileUrl;
     },
@@ -165,10 +210,7 @@ export var TiledMapLayer = L.TileLayer.extend({
             var ne = crs.project(tileBounds.getNorthEast());
             var sw = crs.project(tileBounds.getSouthWest());
             var tileSize = me.options.tileSize;
-            var resolution = Math.max(
-                Math.abs(ne.x - sw.x) / tileSize,
-                Math.abs(ne.y - sw.y) / tileSize
-            );
+            var resolution = Math.max(Math.abs(ne.x - sw.x) / tileSize, Math.abs(ne.y - sw.y) / tileSize);
             var mapUnit = Unit.METER;
             if (crs.code) {
                 var array = crs.code.split(':');
@@ -181,7 +223,6 @@ export var TiledMapLayer = L.TileLayer.extend({
         }
     },
 
-
     /**
      * @function TiledMapLayer.prototype.setTileSetsInfo
      * @description 设置瓦片集信息。
@@ -275,7 +316,7 @@ export var TiledMapLayer = L.TileLayer.extend({
      */
     mergeTileVersionParam: function (version) {
         if (version) {
-            this.requestParams["tileversion"] = version;
+            this.requestParams['tileversion'] = version;
             this._paramsChanged = true;
             this.redraw();
             this._paramsChanged = false;
@@ -288,11 +329,11 @@ export var TiledMapLayer = L.TileLayer.extend({
      * @description 更新参数。
      * @param {Object} params - 参数对象。
      */
-    updateParams: function(params) {
-      Object.assign(this.requestParams, params);
-      this._paramsChanged = true;
-      this.redraw();
-      this._paramsChanged = false;
+    updateParams: function (params) {
+        Object.assign(this.requestParams, params);
+        this._paramsChanged = true;
+        this.redraw();
+        this._paramsChanged = false;
     },
 
     _getLayerUrl: function () {
@@ -320,60 +361,60 @@ export var TiledMapLayer = L.TileLayer.extend({
         if (!(tileSize instanceof L.Point)) {
             tileSize = L.point(tileSize, tileSize);
         }
-        params["width"] = tileSize.x;
-        params["height"] = tileSize.y;
+        params['width'] = tileSize.x;
+        params['height'] = tileSize.y;
 
-        params["redirect"] = options.redirect === true;
-        params["transparent"] = options.transparent === true;
-        params["cacheEnabled"] = !(options.cacheEnabled === false);
+        params['redirect'] = options.redirect === true;
+        params['transparent'] = options.transparent === true;
+        params['cacheEnabled'] = !(options.cacheEnabled === false);
 
         if (options.prjCoordSys) {
-            params["prjCoordSys"] = JSON.stringify(options.prjCoordSys);
+            params['prjCoordSys'] = JSON.stringify(options.prjCoordSys);
         }
 
         if (options.layersID) {
-            params["layersID"] = options.layersID.toString();
+            params['layersID'] = options.layersID.toString();
         }
 
         if (options.clipRegionEnabled && options.clipRegion) {
             options.clipRegion = ServerGeometry.fromGeometry(Util.toSuperMapGeometry(options.clipRegion));
-            params["clipRegionEnabled"] = options.clipRegionEnabled;
-            params["clipRegion"] = JSON.stringify(options.clipRegion);
+            params['clipRegionEnabled'] = options.clipRegionEnabled;
+            params['clipRegion'] = JSON.stringify(options.clipRegion);
         }
 
         //切片的起始参考点，默认为地图范围的左上角。
         var crs = me._crs;
         if (crs.options && crs.options.origin) {
-            params["origin"] = JSON.stringify({
+            params['origin'] = JSON.stringify({
                 x: crs.options.origin[0],
                 y: crs.options.origin[1]
             });
         } else if (crs.projection && crs.projection.bounds) {
             var bounds = crs.projection.bounds;
             var tileOrigin = L.point(bounds.min.x, bounds.max.y);
-            params["origin"] = JSON.stringify({
+            params['origin'] = JSON.stringify({
                 x: tileOrigin.x,
                 y: tileOrigin.y
             });
         }
 
         if (options.overlapDisplayed === false) {
-            params["overlapDisplayed"] = false;
+            params['overlapDisplayed'] = false;
             if (options.overlapDisplayedOptions) {
-                params["overlapDisplayedOptions"] = options.overlapDisplayedOptions;
+                params['overlapDisplayedOptions'] = options.overlapDisplayedOptions;
             }
         } else {
-            params["overlapDisplayed"] = true;
+            params['overlapDisplayed'] = true;
         }
 
         if (params.cacheEnabled === true && options.tileversion) {
-            params["tileversion"] = options.tileversion.toString();
+            params['tileversion'] = options.tileversion.toString();
         }
         if (options.rasterfunction) {
-            params["rasterfunction"] = JSON.stringify(options.rasterfunction);
+            params['rasterfunction'] = JSON.stringify(options.rasterfunction);
         }
         if (options.chartSetting) {
-            params["chartSetting"] = JSON.stringify(options.chartSetting);
+            params['chartSetting'] = JSON.stringify(options.chartSetting);
         }
 
         return params;
diff --git a/test/common/commontypes/geometry/LinearRingSpec.js b/test/common/commontypes/geometry/LinearRingSpec.js
@@ -47,4 +47,22 @@ describe('LinearRing', function () {
         expect(pointList2).not.toBeNull();
         expect(pointList2.length).toEqual(5);
     });
+     
+     it('addComponent_duplicate_points', function () {
+        // 第一个点和第4个点一样，但是应该正常渲染，不应该丢弃 ICL-1570
+        var pointsRing = [
+            new GeometryPoint(83.4923281624, 63.2826847261),// 1
+            new GeometryPoint(86.2710459516, 66.4473355416),// 2
+            new GeometryPoint(80.7522036759, 66.4473355416),// 3
+            new GeometryPoint(83.4923281624, 63.2826847261),// 4
+            new GeometryPoint(78.9383184524, 63.2826847261),// 5
+            new GeometryPoint(78.9383184524, 69.9979193833),// 6
+            new GeometryPoint(88.3936775961, 69.9979193833),// 7
+            new GeometryPoint(88.3936775961, 63.4370579366),// 8
+            new GeometryPoint(83.4923281624, 63.2826847261)
+        ];
+        var ring = new GeometryLinearRing(pointsRing);
+        expect(ring.components.length).toEqual(9);
+        expect(ring.components[3].x).toEqual(83.4923281624);
+    });
 });
diff --git a/test/common/mapping/utils/L7LayerUtilSpec.js b/test/common/mapping/utils/L7LayerUtilSpec.js
diff --git a/test/leaflet/mapping/TiledMapLayerSpec.js b/test/leaflet/mapping/TiledMapLayerSpec.js
diff --git a/test/mapboxgl/mapping/WebMapV3Spec.js b/test/mapboxgl/mapping/WebMapV3Spec.js
diff --git a/test/maplibregl/mapping/WebMapV3Spec.js b/test/maplibregl/mapping/WebMapV3Spec.js
diff --git a/test/openlayers/core/UtilSpec.js b/test/openlayers/core/UtilSpec.js

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,8 @@`
`59`	`59`	`inputScript(libsurl + '/mapbox-gl-js/1.13.2/mapbox-gl.js');`
`60`	`60`	`}`
`61`	`61`	`if (inArray(includes, 'mapbox-gl-enhance')) {`
`62`		`- inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-8/mapbox-gl-enhance.css');`
`63`		`- inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-8/mapbox-gl-enhance.js');`
	`62`	`+ inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-9/mapbox-gl-enhance.css');`
	`63`	`+ inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-9/mapbox-gl-enhance.js');`
`64`	`64`	`}`
`65`	`65`	`if (inArray(includes, 'L7')) {`
`66`	`66`	`inputScript(libsurl + '/mapboxgl-l7-render/0.0.2/mapboxgl-l7-render.js');`
Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ <h4 class="modal-title" id="myModalLabel"></h4>`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`function drawCompleted(e) {`
`467`		`- var bounds = e.layer._bounds;`
	`467`	`+ var bounds = e.layer.getBounds();`
`468`	`468`	`var _northEast = bounds._northEast;`
`469`	`469`	`var _southWest = bounds._southWest;`
`470`	`470`	`plotBbox = [_southWest.lng, _southWest.lat, _northEast.lng, _northEast.lat];`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa`
`315`	`315`	`}`
`316`	`316`	`return (url, resourceType) => {`
`317`	`317`	`if (resourceType === 'Tile') {`
`318`		`- const withCredentials = this.options.iportalServiceProxyUrl && url.indexOf(this.options.iportalServiceProxyUrl) >= 0;`
	`318`	`+ const withCredentials = this.options.iportalServiceProxyUrlPrefix && url.indexOf(this.options.iportalServiceProxyUrlPrefix) >= 0;`
`319`	`319`	`return {`
`320`	`320`	`url: url,`
`321`	`321`	`credentials: withCredentials ? 'include' : undefined,`
Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ export function L7LayerUtil(config) {`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`function isIportalProxyServiceUrl(url, options) {`
`429`		`- return options.iportalServiceProxyUrl && url.indexOf(options.iportalServiceProxyUrl) >= 0;`
	`429`	`+ return options.iportalServiceProxyUrlPrefix && url.indexOf(options.iportalServiceProxyUrlPrefix) >= 0;`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`function handleWithRequestOptions(url, options) {`