[fix]intmap leaflet review by qiw

luoxiao-supermap · luoxiao-supermap · commit ab878ac09e67 · 2022-10-20T17:54:51.000+08:00
diff --git a/examples/leaflet/01_tiledMapLayer3857.html b/examples/leaflet/01_tiledMapLayer3857.html
@@ -15,10 +15,9 @@
       var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
       var map,
         url = host + '/iserver/services/map-china400/rest/maps/China';
-      url = 'http://172.16.14.44:8090/iserver/services/map-china400/rest/maps/China';
 
       // 方式一：1.调用 L.supermap.initMap，根据 SuperMap iServer 地图服务的地图信息，创建地图和底图
-      L.supermap.initMap(url, { mapOptions: { zoom: 0 } });
+      L.supermap.initMap(url);
       /*
         // 方式二：1.调用 L.supermap.MapService，获取 SuperMap iServer 地图服务的地图信息
         //         2.调用 L.supermap.crsFromMapJSON 创建 CRS
diff --git a/examples/leaflet/01_tiledMapLayer4326.html b/examples/leaflet/01_tiledMapLayer4326.html
@@ -24,8 +24,6 @@
         //         3.调用 L.map 创建地图
         //         4.调用 L.supermap.TiledMapLayer 创建底图
         new L.supermap.MapService(url).getMapInfo((res) => {
-            var def = `GEOGCS["GCS_China_2000",DATUM["D_China_2000",SPHEROID["CGCS2000",6378137.0,298.257222101,AUTHORITY["EPSG","7044"]]],PRIMEM["Greenwich",0.0,AUTHORITY["EPSG","8901"]],UNIT["DEGREE",0.017453292519943295],AUTHORITY["EPSG","4490"]]`;
-            Proj4js.defs('EPSG:4490', def);
             var crs = L.supermap.crsFromMapJSON(res.result);
             map = L.map('map', {
               crs: crs,
diff --git a/src/leaflet/mapping/initMap.js b/src/leaflet/mapping/initMap.js
@@ -264,172 +264,3 @@ function getCRS(epsgCodeStr, { bounds, dpi, resolutions }) {
   }
   return new CRS(epsgCodeStr, options);
 }
-
-// async function getOtherEpsgCRS(url, epsgCodeStr, { bounds, dpi, visibleScales }) {
-//   const projDef = await FetchRequest.get(`${url}/prjCoordSys.wkt`, null, {
-//     withoutFormatSuffix: true
-//   }).then(function (response) {
-//     return response.text();
-//   });
-//   console.log(proj4def);
-//   proj4.defs(epsgCodeStr, projDef);
-//   return getCRS(epsgCodeStr, { bounds, dpi, visibleScales, def: projDef });
-// }
-// /**
-//  * @private
-//  * @function getMapOptions
-//  * @description 获取extent。
-//  * @param {Object} url - 服务地址，例如: http://{ip}:{port}/iserver/services/map-world/rest/maps/World。
-//  * @returns {Promise}  Promise 对象。
-//  */
-// async function getProjectionExtent(url) {
-//   const extentInfo = await FetchRequest.get(url + '/prjCoordSys/projection/extent.json').then(function (response) {
-//     if (response && response.status === 204) {
-//       return null;
-//     }
-//     return response.json();
-//   });
-//   return extentInfo || null;
-// }
-
-// /**
-//  * @private
-//  * @function getEnvelop
-//  * @description 获取地图参数。
-//  * @param {Object} url - 服务地址，例如: http://{ip}:{port}/iserver/services/map-world/rest/maps/World。
-//  * @param {Object} bounds - bounds。
-//  * @returns {Promise}  Promise 对象。
-//  */
-// async function getEnvelop(url, bounds) {
-//   const envelope = await getProjectionExtent(url);
-//   if (!envelope) {
-//     return bounds;
-//   }
-//   return envelope;
-// }
-
-// /**
-//  * @private
-//  * @function setBaseMapCRS
-//  * @description 作为底图后，设置底图为自定义比例尺。
-//  * @param {L.Map} map - Leaflet Map 对象。
-//  * @param {CRS} originCrs - 图层或地图配置的CRS。
-//  * @param {Object} mapJSONObj - 地图 JSON 对象。
-//  */
-//  function getBaseMapCRS(mapJSONObj, originCrs) {
-//   let code = typeof originCrs === 'string' ? originCrs : originCrs.code;
-//   let { bounds, visibleScales, visibleScalesEnabled, dpi } = mapJSONObj;
-//   if (visibleScalesEnabled) {
-//     let crs = new CRS(code, {
-//       dpi,
-//       origin: [bounds.left, bounds.top],
-//       scales: visibleScales
-//     });
-//     return crs;
-//   }
-
-//   let crs = new CRS(code, {
-//     dpi,
-//     origin: [bounds.left, bounds.top],
-//     bounds: getCRSBounds(bounds)
-//   });
-//   return crs;
-//   // return originCrs;
-// }
-
-// function getCRSBounds(bounds) {
-//   const { left, top, bottom, right } = bounds;
-//   return [
-//     [left, top],
-//     [right, bottom]
-//   ];
-// }
-
-// /**
-//  * @private
-//  * @function getLayerParams
-//  * @description 获取图层参数。
-//  * @param {Object} mapJSONObj - 地图 JSON 对象。
-//  * @returns {Object} 图层参数。
-//  */
-//  function getLayerParams(mapJSONObj) {
-//   const { clipRegionEnabled, clipRegion, cacheEnabled, overlapDisplayed, overlapDisplayedOptions } = mapJSONObj;
-//   return {
-//     clipRegionEnabled,
-//     clipRegion,
-//     cacheEnabled,
-//     // prjCoordSys,
-//     overlapDisplayed,
-//     overlapDisplayedOptions: JSON.stringify(overlapDisplayedOptions)
-//   };
-// }
-// /**
-//  * @private
-//  * @function _getMapCRS
-//  * @description 获取mapCrs。
-//  * @param {Object} url - 服务地址，例如: http://{ip}:{port}/iserver/services/map-world/rest/maps/World。
-//  * @param {Object} mapJSONObj - 地图 JSON 对象。
-//  * @param {Object} mapJSONObj.visibleScales - visibleScales
-//  * @param {Object} mapJSONObj.prjCoordSys - prjCoordSys
-//  * @param {number} mapJSONObj.dpi - dpi
-//  * @param {Object} mapJSONObj.bounds - bounds。
-//  * @returns {Promise}  Promise 对象， crs
-//  */
-//  function _getMapCRS({ prjCoordSys, bounds, dpi, visibleScales }, def) {
-//   let mapcrs = L.CRS.EPSG3857;
-//   const { type, epsgCode } = prjCoordSys;
-//   if (epsgCode == '4326' || epsgCode == '3857') {
-//     mapcrs = getCRS('EPSG:' + epsgCode, { bounds, dpi, visibleScales });
-//   } else if (type == 'PCS_NON_EARTH') {
-//     mapcrs = getNonEarthCRS(bounds);
-//   } else {
-//     mapcrs = getCRS(url, 'EPSG:' + epsgCode, { bounds, dpi, visibleScales });
-//   }
-//   return mapcrs;
-// }
-// /**
-//  * @private
-//  * @function getVisibleScales
-//  * @description 获取VisibleScales。
-//  * @param {Object} url - 服务地址，例如: http://{ip}:{port}/iserver/services/map-world/rest/maps/World。
-//  * @param {Object} mapJSONObj - 地图 JSON 对象。
-//  * @param {Object} mapJSONObj.visibleScales - visibleScales
-//  * @param {Object} mapJSONObj.prjCoordSys - prjCoordSys
-//  * @param {number} mapJSONObj.dpi - dpi
-//  * @param {Object} mapJSONObj.bounds - bounds。
-//  * @param {Object} [mapOptions] - 地图参数。
-//  * @param {Object} [mapOptions.maxZoom=22] - 地图最大缩放级别。
-//  * @returns {Promise}  Promise 对象， visibleScales。
-//  */
-//  function getVisibleScales({ visibleScales, prjCoordSys, dpi, bounds }, { maxZoom }) {
-//   if (prjCoordSys && visibleScales.length == 0) {
-//     return getScales(bounds, prjCoordSys.coordUnit, dpi, { maxZoom });
-//   }
-//   return visibleScales;
-// }
-// /**
-//  * @private
-//  * @function getMapOptions
-//  * @description 获取地图参数。
-//  * @param {Object} url - 服务地址，例如: http://{ip}:{port}/iserver/services/map-world/rest/maps/World。
-//  * @param {Object} bounds - bounds.
-//  * @param {string} coordUnit - coordUnit
-//  * @param {number} dpi - dpi
-//  * @param {Object} [mapOptions] - 地图参数。
-//  * @param {Object} [mapOptions.maxZoom=22] - 地图最大缩放级别。
-//  * @returns {Promise}  Promise 对象。
-//  */
-//  function getScales(bounds, coordUnit, dpi, { maxZoom }) {
-//   const resolution = Math.abs(bounds.left - bounds.right) / 256;
-//   let temp = resolutionToScale(resolution, dpi, coordUnit);
-//   let scales = [];
-//   for (let i = 0; i < maxZoom; i++) {
-//     if (i == 0) {
-//       scales[i] = temp;
-//       continue;
-//     }
-//     temp = temp * 2;
-//     scales[i] = temp;
-//   }
-//   return scales;
-// }
diff --git a/test/leaflet/mapping/initMapSpec.js b/test/leaflet/mapping/initMapSpec.js
@@ -1,6 +1,7 @@
 import { initMap, crsFromMapJSON } from '../../../src/leaflet/mapping/initMap';
 import { FetchRequest } from '../../../src/common/util/FetchRequest';
 import { mockCreateTile } from '../../tool/mock_leaflet';
+import proj4 from 'proj4';
 
 var map;
 var def4490 = `GEOGCS["GCS_China_2000",DATUM["D_China_2000",SPHEROID["CGCS2000",6378137.0,298.257222101,AUTHORITY["EPSG","7044"]]],PRIMEM["Greenwich",0.0,AUTHORITY["EPSG","8901"]],UNIT["DEGREE",0.017453292519943295],AUTHORITY["EPSG","4490"]]`;
@@ -78,7 +79,7 @@ describe('initMap', () => {
   });
 
   it('initMap 4326', async () => {
-    var url = 'http://172.16.14.44:8090/iserver/services/map-jinjing/rest/maps/jinjing';
+    var url = 'http://fake:8090/iserver/services/map-jinjing/rest/maps/jinjing';
     var mapInfo = {
       prjCoordSys: {
         distanceUnit: 'METER',
@@ -268,7 +269,7 @@ describe('initMap', () => {
   });
 
   it('initMap 4490', async () => {
-    var url = 'http://172.16.14.44:8090/iserver/services/map-china/rest/maps/chian4490';
+    var url = 'http://fake:8090/iserver/services/map-china/rest/maps/chian4490';
     var mapInfo = {
       prjCoordSys: {
         distanceUnit: 'METER',
@@ -498,10 +499,8 @@ describe('initMap', () => {
       },
       coordUnit: 'DEGREE'
     };
+    proj4.defs('EPSG:4490', def4490);
     spyOn(FetchRequest, 'get').and.callFake((testUrl) => {
-      if (testUrl.includes('prjCoordSys.wkt')) {
-        return Promise.resolve(new Response(def4490));
-      }
       return Promise.resolve(new Response(JSON.stringify(mapInfo)));
     });
     var crs = await crsFromMapJSON(mapInfo);
