【fix】修复某些投影的无法正确计算MeterPerMapUnit失败的问题

Author: songyumeng

src/common/util/MapCalculateUtil.js

@@ -24,9 +24,9 @@ import { Unit } from '../REST';
 export var getMeterPerMapUnit = function(mapUnit) {
     var earchRadiusInMeters = 6378137;
     var meterPerMapUnit;
-    if (mapUnit === Unit.METER) {
+    if (['m','meter','meters'].indexOf(mapUnit.toLocaleLowerCase())>-1) {
         meterPerMapUnit = 1;
-    } else if (mapUnit === Unit.DEGREE) {
+    } else if (['degrees','deg','degree','dd'].indexOf(mapUnit.toLocaleLowerCase())>-1) {
         // 每度表示多少米。
         meterPerMapUnit = (Math.PI * 2 * earchRadiusInMeters) / 360;
     } else if (mapUnit === Unit.KILOMETER) {
@@ -35,8 +35,6 @@ export var getMeterPerMapUnit = function(mapUnit) {
         meterPerMapUnit = 1 / 2.5399999918e-2;
     } else if (mapUnit === Unit.FOOT) {
         meterPerMapUnit = 0.3048;
-    } else {
-        return meterPerMapUnit;
     }
     return meterPerMapUnit;
 };

src/openlayers/mapping/TileSuperMapRest.js

@@ -193,14 +193,6 @@ export class TileSuperMapRest extends TileImage {
             var resolution = me.tileGrid.getResolution(z);
             var dpi = me.dpi || 96;
             var unit = projection.getUnits() || Unit.DEGREE;
-            // OGC WKT 解析出单位是 degree
-            if (unit === 'degrees' || unit === 'degree') {
-                unit = Unit.DEGREE;
-            }
-            //通过wkt方式自定义坐标系的时候，是meter
-            if (unit === 'm' || unit === 'meter') {
-                unit = Unit.METER;
-            }
             var scale = Util.resolutionToScale(resolution, dpi, unit);
             var tileSize = olSize.toSize(me.tileGrid.getTileSize(z, me.tmpSize));
             var layerUrl = getFullRequestUrl.call(me);

src/openlayers/overlay/VectorTileSuperMapRest.js

@@ -111,12 +111,6 @@ export class VectorTileSuperMapRest extends VectorTile {
                 var resolution = me.tileGrid.getResolution(z);
                 var dpi = 96;
                 var unit = projection.getUnits() || 'degrees';
-                if (unit === 'degrees') {
-                    unit = Unit.DEGREE;
-                }
-                if (unit === 'm') {
-                    unit = Unit.METER;
-                }
 
                 var scale = Util.resolutionToScale(resolution, dpi, unit);
                 params =

test/common/util/MapCalculateUtilSpec.js

@@ -0,0 +1,24 @@
+import { getMeterPerMapUnit } from '../../../src/common/util/MapCalculateUtil';
+
+describe('MapCalculateUtil', () => {
+  it('getMeterPerMapUnit m', () => {
+      expect(getMeterPerMapUnit('m')).toBe(1);
+      expect(getMeterPerMapUnit('M')).toBe(1);
+      expect(getMeterPerMapUnit('meter')).toBe(1);
+      expect(getMeterPerMapUnit('meters')).toBe(1);
+      expect(getMeterPerMapUnit('METER')).toBe(1);
+      expect(getMeterPerMapUnit('METERS')).toBe(1);
+      expect(getMeterPerMapUnit('METRE')).toBeUndefined()
+  });
+  it('getMeterPerMapUnit dge', () => {
+    expect(getMeterPerMapUnit('degrees')).toBeCloseTo(111319.49079327358, 0.00001);;
+    expect(getMeterPerMapUnit('deg')).toBeCloseTo(111319.49079327358, 0.00001);;
+    expect(getMeterPerMapUnit('degree')).toBeCloseTo(111319.49079327358, 0.00001);;
+    expect(getMeterPerMapUnit('dd')).toBeCloseTo(111319.49079327358, 0.00001);;
+    expect(getMeterPerMapUnit('DEGREES')).toBeCloseTo(111319.49079327358, 0.00001);;
+    expect(getMeterPerMapUnit('DEG')).toBeCloseTo(111319.49079327358, 0.00001);;
+    expect(getMeterPerMapUnit('DEGREE')).toBeCloseTo(111319.49079327358, 0.00001);;
+    expect(getMeterPerMapUnit('DD')).toBeCloseTo(111319.49079327358, 0.00001);;
+    expect(getMeterPerMapUnit('degre')).toBeUndefined()
+});
+});