common mapcalculateutil 新增方法 review by luox

xilanhuaweidapao · xilanhuaweidapao · commit 0367cb4ed2b6 · 2022-10-19T18:03:30.000+08:00
diff --git a/src/common/format/JSON.js b/src/common/format/JSON.js
@@ -234,6 +234,7 @@ export class JSONFormat extends Format {
                 object = JSON.parse(json, filter);
             } catch (e) {
                 // Fall through if the regexp test fails.
+                return { data: json}
             }
         }
 
diff --git a/src/common/iServer/CommonServiceBase.js b/src/common/iServer/CommonServiceBase.js
@@ -143,6 +143,7 @@ export class CommonServiceBase {
         options.crossOrigin = options.crossOrigin != undefined ? options.crossOrigin : me.crossOrigin;
         options.headers = options.headers || me.headers;
         options.isInTheSameDomain = me.isInTheSameDomain;
+        options.withoutFormatSuffix = options.scope.withoutFormatSuffix || false;
         //为url添加安全认证信息片段
         options.url = SecurityManager.appendCredential(options.url);
 
@@ -277,6 +278,7 @@ export class CommonServiceBase {
         }
         FetchRequest.commit(options.method, options.url, options.params, {
             headers: options.headers,
+            withoutFormatSuffix: options.withoutFormatSuffix,
             withCredentials: options.withCredentials,
             crossOrigin: options.crossOrigin,
             timeout: options.async ? 0 : null,
diff --git a/src/common/util/MapCalculateUtil.js b/src/common/util/MapCalculateUtil.js
@@ -111,3 +111,42 @@ export function conversionDegree(degrees) {
     second = parseInt(second / 10) === 0 ? `0${second}` : second;
     return `${degree}°${fraction}'${second}`;
 }
+
+export function scalesToResolutions(scales, bounds, dpi, unit, level = 22) {
+  var resolutions = [];
+  if (scales && scales.length > 0) {
+    for (let i = 0; i < scales.length; i++) {
+      resolutions.push(scaleToResolution(scales[i], dpi, unit));
+    }
+  } else {
+    const maxReolution = Math.abs(bounds.left - bounds.right) / 256;
+    for (let i = 0; i < level; i++) {
+      resolutions.push(maxReolution / Math.pow(2, i));
+    }
+  }
+  return resolutions.sort(function (a, b) {
+    return b - a;
+  });
+}
+
+export function getZoomByResolution(resolution, resolutions) {
+  let zoom = 0;
+  let minDistance;
+  for (let i = 0; i < resolutions.length; i++) {
+    if (i === 0) {
+      minDistance = Math.abs(resolution - resolutions[i]);
+    }
+    if (minDistance > Math.abs(resolution - resolutions[i])) {
+      minDistance = Math.abs(resolution - resolutions[i]);
+      zoom = i;
+    }
+  }
+  return zoom;
+}
+
+export function scaleToResolution(scale, dpi, mapUnit) {
+  const inchPerMeter = 1 / 0.0254;
+  const meterPerMapUnitValue = getMeterPerMapUnit(mapUnit);
+  const resolution = 1 / (scale * dpi * inchPerMeter * meterPerMapUnitValue);
+  return resolution;
+}
diff --git a/src/openlayers/services/MapService.js b/src/openlayers/services/MapService.js
@@ -1,10 +1,9 @@
 /* Copyright© 2000 - 2022 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 {ServiceBase} from './ServiceBase';
+import { ServiceBase } from './ServiceBase';
 import { MapService as CommonMapService } from '@supermap/iclient-common/iServer/MapService';
 import { TilesetsService } from '@supermap/iclient-common/iServer/TilesetsService';
-
 /**
  * @class MapService
  * @category  iServer Map
@@ -23,52 +22,69 @@ import { TilesetsService } from '@supermap/iclient-common/iServer/TilesetsServic
  * @usage
  */
 export class MapService extends ServiceBase {
+  constructor(url, options) {
+    super(url, options);
+  }
 
-    constructor(url, options) {
-        super(url, options);
-    }
+  /**
+   * @function MapService.prototype.getMapInfo
+   * @description 地图信息查询服务。
+   * @param {RequestCallback} callback - 回调函数。
+   * @returns {MapService} 获取服务信息。
+   */
+  getMapInfo(callback) {
+    var me = this;
+    var getMapStatusService = new CommonMapService(me.url, {
+      proxy: me.options.proxy,
+      withCredentials: me.options.withCredentials,
+      crossOrigin: me.options.crossOrigin,
+      headers: me.options.headers,
+      eventListeners: {
+        scope: me,
+        processCompleted: callback,
+        processFailed: callback
+      },
+      projection: me.options.projection
+    });
+    getMapStatusService.processAsync();
+  }
 
-    /**
-     * @function MapService.prototype.getMapInfo
-     * @description 地图信息查询服务。
-     * @param {RequestCallback} callback - 回调函数。
-     * @returns {MapService} 获取服务信息。
-     */
-    getMapInfo(callback) {
-        var me = this;
-        var getMapStatusService = new CommonMapService(me.url, {
-            proxy: me.options.proxy,
-            withCredentials: me.options.withCredentials,
-            crossOrigin: me.options.crossOrigin,
-            headers: me.options.headers,
-            eventListeners: {
-                scope: me,
-                processCompleted: callback,
-                processFailed: callback
-            }, projection: me.options.projection
-        });
-        getMapStatusService.processAsync();
-    }
+  getWkt(callback) {
+    var me = this;
+    var getMapStatusService = new CommonMapService(`${me.url}/prjCoordSys.wkt`, {
+        proxy: me.options.proxy,
+        withCredentials: me.options.withCredentials,
+        withoutFormatSuffix: true,
+        crossOrigin: me.options.crossOrigin,
+        headers: me.options.headers,
+        eventListeners: {
+            scope: me,
+            processCompleted: callback,
+            processFailed: callback
+        }, projection: me.options.projection
+    });
+    getMapStatusService.processAsync();
+  }
 
-    /**
-     * @function MapService.prototype.getTilesets
-     * @description 切片列表信息查询服务。
-     * @param {RequestCallback} callback - 回调函数。
-     * @returns {MapService} 获取服务信息。
-     */
-    getTilesets(callback) {
-        var me = this;
-        var tilesetsService = new TilesetsService(me.url, {
-            proxy: me.options.proxy,
-            withCredentials: me.options.withCredentials,
-            crossOrigin: me.options.crossOrigin,
-            headers: me.options.headers,
-            eventListeners: {
-                scope: me,
-                processCompleted: callback,
-                processFailed: callback
-            }
-        });
-        tilesetsService.processAsync();
-    }
+  /**
+   * @function MapService.prototype.getTilesets
+   * @description 切片列表信息查询服务。
+   * @param {RequestCallback} callback - 回调函数。
+   * @returns {MapService} 获取服务信息。
+   */
+  getTilesets(callback) {
+    var me = this;
+    var tilesetsService = new TilesetsService(me.url, {
+      proxy: me.options.proxy,
+      withCredentials: me.options.withCredentials,
+      crossOrigin: me.options.crossOrigin,
+      headers: me.options.headers,
+      eventListeners: {
+        scope: me,
+        processCompleted: callback,
+        processFailed: callback
+      }
+    });
+    tilesetsService.processAsync();
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,7 @@ export class JSONFormat extends Format {`
`234`	`234`	`object = JSON.parse(json, filter);`
`235`	`235`	`} catch (e) {`
`236`	`236`	`// Fall through if the regexp test fails.`
	`237`	`+ return { data: json}`
`237`	`238`	`}`
`238`	`239`	`}`
`239`	`240`