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

luoxiao-supermap · luoxiao-supermap · commit 000cefc79689 · 2024-11-26T18:45:25.000+08:00
diff --git a/src/common/mapping/WebMapV2.js b/src/common/mapping/WebMapV2.js
@@ -191,7 +191,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo }) {
         }
       } else {
         wkt = mapRepo.CRS.get(this.baseProjection).WKT
-        this._defineProj4(wkt);
+        this._defineProj4(wkt || projection);
         bounds = [
           mapInfo.extent.leftBottom.x,
           mapInfo.extent.leftBottom.y,
diff --git a/test/mapboxgl/mapping/WebMapV2Spec.js b/test/mapboxgl/mapping/WebMapV2Spec.js
@@ -1434,10 +1434,10 @@ describe('mapboxgl_WebMapV2', () => {
     const callback = function (data) {
       const spy = spyOn(datavizWebmap._handler, 'transformFeatures').and.callThrough();
       datavizWebmap.updateOverlayLayer(
-        { id: 'test', projection: 'EPSG:3857' },
+        { id: uniqueLayer_polygon.layers[0].name, projection: 'EPSG:3857' },
         {
           type: 'FeatureCollection',
-          features: [{ type: 'Feature', geometry: { type: 'Point', coordinates: [110, 10] } }]
+          features: [{ type: 'Feature', geometry: { type: 'Point', coordinates: [110, 10] }, properties: {} }]
         },
         '',
         'EPSG:4326'

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo }) {`
`191`	`191`	`}`
`192`	`192`	`} else {`
`193`	`193`	`wkt = mapRepo.CRS.get(this.baseProjection).WKT`
`194`		`- this._defineProj4(wkt);`
	`194`	`+ this._defineProj4(wkt \|\| projection);`
`195`	`195`	`bounds = [`
`196`	`196`	`mapInfo.extent.leftBottom.x,`
`197`	`197`	`mapInfo.extent.leftBottom.y,`