【fix】ICL-1535

xiongjiaojiao · xiongjiaojiao · commit ed59f713444c · 2024-05-13T11:51:42.000+08:00
diff --git a/src/mapboxgl/mapping/WebMap.js b/src/mapboxgl/mapping/WebMap.js
@@ -3,7 +3,6 @@
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import mapboxgl from 'mapbox-gl';
 import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
-import { Lang } from '@supermap/iclient-common/lang/Lang';
 import { Util } from '../core/Util';
 import { WebMap as WebMapV2 } from './webmap/v2/WebMap';
 import { WebMap as WebMapV3 } from './webmap/v3/WebMap';
@@ -135,12 +134,6 @@ export class WebMap extends mapboxgl.Evented {
         return response.json();
       })
       .then((mapInfo) => {
-        const projectionMap = ['EPSG:4490', 'EPSG:4214', 'EPSG:4610', 'EPSG:3857', 'EPSG:4326'];
-        const baseProjection = this._getMapProjection(mapInfo);
-        // 坐标系异常处理
-        if (!projectionMap.find(item => item === baseProjection)) {
-          throw Error(Lang.i18n('msg_crsunsupport'));
-        }
         this.webMapInstance = this._initMap(mapInfo);
         this._registerWebMapEvents();
         this.webMapInstance.initializeMap(mapInfo);
@@ -155,19 +148,6 @@ export class WebMap extends mapboxgl.Evented {
       });
   }
 
-  /**
-   * @private
-   * @function WebMap.prototype._getMapProjection
-   * @param {object} mapInfo - 地图信息。
-   * @description 获取地图投影。
-   */
-  _getMapProjection(mapInfo) {
-    if (this._isWebMapV3(mapInfo.version)) {
-      return mapInfo.crs;
-    }
-    return mapInfo.projection;
-  }
-
   /**
    * @private
    * @function WebMap.prototype._initMap
diff --git a/src/mapboxgl/mapping/webmap/v2/WebMap.js b/src/mapboxgl/mapping/webmap/v2/WebMap.js
@@ -79,6 +79,11 @@ export class WebMap extends mapboxgl.Evented {
     * @param {Object} mapInfo - map 信息。
     */
    initializeMap(mapInfo) {
+	const projectionMap = ['EPSG:4490', 'EPSG:4214', 'EPSG:4610', 'EPSG:3857', 'EPSG:4326'];
+	// 坐标系异常处理
+	if (!projectionMap.find(item => item === mapInfo.projection)) {
+		throw Error(Lang.i18n('msg_crsunsupport'));
+	}
     this.baseProjection = mapInfo.projection;
     //存储地图的名称以及描述等信息，返回给用户
     this.mapParams = {
diff --git a/test/mapboxgl/mapping/WebMapSpec.js b/test/mapboxgl/mapping/WebMapSpec.js
@@ -2,6 +2,7 @@ import mapboxgl from 'mapbox-gl';
 import mbglmap from '../../tool/mock_mapboxgl_map';
 import { WebMap } from '../../../src/mapboxgl/mapping/WebMap';
 import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
+import { Lang } from '@supermap/iclient-common/lang/Lang';
 import { ArrayStatistic } from '../../../src/common/util/ArrayStatistic';
 import '../../resources/WebMapV5.js';
 window.jsonsql = { query: () => { } };
@@ -866,4 +867,22 @@ describe('mapboxgl_WebMap', () => {
             }, 100);
         });
     });
+
+    it('crs unsupport', (done) => {
+        let options = {
+            server: server
+        };
+        spyOn(FetchRequest, 'get').and.callFake((url) => {
+            if (url.indexOf('map.json') > -1) {
+                var mapJson = JSON.stringify({...JSON.parse(datavizWebMap_WMTS1), projection: 'EPSG:-1000'});
+                return Promise.resolve(new Response(mapJson));
+            }
+            return Promise.resolve();
+        });
+        var datavizWebmap = new WebMap(id, options);
+        datavizWebmap.on('getmapfailed', ({ error }) => {
+            expect(error.message).toBe(Lang.i18n('msg_crsunsupport'));
+            done();
+        });
+    })
 });
