【fix】升级xlsx 修复leaflet平面无投影设置非2倍关系的固定比例尺时不起作用的问题 review by luoxiao

songyumeng · songyumeng · commit 3b64e53613b6 · 2021-08-13T14:46:26.000+08:00
diff --git a/package.json b/package.json
@@ -132,7 +132,7 @@
     "proj4": "2.6.3",
     "promise-polyfill": "8.2.0",
     "three": "0.126.1",
-    "xlsx": "0.16.9",
+    "xlsx": "0.17.0",
     "xml-js": "1.6.11"
   },
   "pre-commit": [
diff --git a/src/classic/package.json b/src/classic/package.json
@@ -14,7 +14,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "mapv": "2.0.62",
-    "xlsx": "0.16.9",
+    "xlsx": "0.17.0",
     "@supermap/iclient-common": "11.0.0-beta"
   }
 }
diff --git a/src/leaflet/core/NonEarthCRS.js b/src/leaflet/core/NonEarthCRS.js
@@ -69,10 +69,12 @@ export var NonEarthCRS = L.Class.extend({
         if (!this.resolutions || this.resolutions.length === 0) {
             const width = Math.max(this.bounds.getSize().x, this.bounds.getSize().y);
             defaultScale = 1.0 / (width / 256);
-        } else {
-            defaultScale = 1.0 / this.resolutions[0];
+            return defaultScale * Math.pow(2, zoom);
         }
-        return defaultScale * Math.pow(2, zoom);
+        if (this.resolutions[zoom]) {
+            return 1.0 / this.resolutions[zoom];
+        }
+        return (1.0 / this.resolutions[0]) * Math.pow(2, zoom);
     },
 
     /**
@@ -86,10 +88,13 @@ export var NonEarthCRS = L.Class.extend({
         if (!this.resolutions || this.resolutions.length === 0) {
             const width = Math.max(this.bounds.getSize().x, this.bounds.getSize().y);
             defaultScale = 1.0 / (width / 256);
-        } else {
-            defaultScale = 1.0 / this.resolutions[0];
+            return Math.log(scale / defaultScale) / Math.LN2;
+        }
+        const index = this.resolutions.indexOf(1.0 / scale);
+        if (index > -1) {
+            return index;
         }
-        return Math.log(scale / defaultScale) / Math.LN2;
+        return Math.log(scale / (1.0 / this.resolutions[0])) / Math.LN2;
     },
     /**
      * @function L.CRS.NonEarthCRS.prototype.distance
diff --git a/src/leaflet/core/Util.js b/src/leaflet/core/Util.js
@@ -29,7 +29,7 @@ export var toSuperMapGeometry = function(geometry) {
         result = geojson ? format.read(geojson, geojson.type) : geometry;
     }
 
-    var serverResult = result;
+    var serverResult = result || geometry;
     if (L.Util.isArray(result)) {
         if (result.length === 1) {
             serverResult = result[0];
diff --git a/src/leaflet/package.json b/src/leaflet/package.json
@@ -23,6 +23,6 @@
     "jsonsql": "0.2.5",
     "pbf": "3.2.1",
     "proj4": "2.6.3",
-    "xlsx": "0.16.9"
+    "xlsx": "0.17.0"
   }
 }
diff --git a/src/mapboxgl/package.json b/src/mapboxgl/package.json
@@ -18,7 +18,7 @@
     "mapv": "2.0.62",
     "mapbox-gl": "1.12.0",
     "three": "0.126.1",
-    "xlsx": "0.16.9",
+    "xlsx": "0.17.0",
     "@supermap/iclient-common": "11.0.0-beta",
     "canvg": "3.0.7",
     "xml-js": "1.6.11"
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -368,7 +368,7 @@ export class WebMap extends Observable {
         let that = this, handleResult = {};
         let newCrs = crs, action = "OpenMap";
 
-        if (crs === "EPSG:-1") {
+        if (this.isCustomProjection(crs)) {
             // 去iServer请求wkt  否则只能预览出图
             await FetchRequest.get(that.getRequestUrl(`${baseLayerUrl}/prjCoordSys.wkt`), null, {
                 withCredentials: that.withCredentials,
@@ -377,7 +377,7 @@ export class WebMap extends Observable {
                 return response.text();
             }).then(async function (result) {
                 if(result.indexOf("<!doctype html>") === -1) {
-                    that.addProjctionFromWKT(result, "EPSG:-1");
+                    that.addProjctionFromWKT(result, crs);
                     handleResult = {action, newCrs};
                 } else {
                     throw 'ERROR';
@@ -1140,7 +1140,7 @@ export class WebMap extends Observable {
             // prjCoordSys: {epsgCode: isBaseLayer ? layerInfo.projection.split(':')[1] : this.baseProjection.split(':')[1]},
             format: layerInfo.format
         };
-        if(!isBaseLayer && this.baseProjection !== "EPSG:-1"){
+        if(!isBaseLayer && !this.isCustomProjection(this.baseProjection )){
             options.prjCoordSys = { epsgCode : this.baseProjection.split(':')[1]};
         }
         if (layerInfo.visibleScales && layerInfo.visibleScales.length > 0) {
@@ -1343,7 +1343,7 @@ export class WebMap extends Observable {
             let projection = {
                 epsgCode: that.baseProjection.split(":")[1]
             }
-            if (that.baseProjection !== "EPSG:-1") {
+            if (!that.isCustomProjection(that.baseProjection)) {
                 // bug IE11 不会自动编码
                 url += '.json?prjCoordSys=' + encodeURI(JSON.stringify(projection));
             }
@@ -5122,4 +5122,10 @@ export class WebMap extends Observable {
         }
         return lang;
     }
+    isCustomProjection(projection) {
+        if(Util.isNumber(projection)){
+            return [-1000,-1].includes(+projection)
+        }
+        return ['EPSG:-1000','EPSG:-1'].includes(projection);
+    }
 }
diff --git a/src/openlayers/package.json b/src/openlayers/package.json
@@ -20,7 +20,7 @@
     "ol": "6.4.3",
     "@supermap/iclient-common": "11.0.0-beta",
     "proj4": "2.6.3",
-    "xlsx": "0.16.9",
+    "xlsx": "0.17.0",
     "canvg": "3.0.7",
     "lodash.remove": "^4.7.0"
   }
diff --git a/test/leaflet/core/NonEarthCRSSpec.js b/test/leaflet/core/NonEarthCRSSpec.js
@@ -40,6 +40,9 @@ describe('leaflet_NonEarthCRS', () => {
         expect(nonEarthCRSObject.projection.bounds).toEqual(nonEarthCRSObject.bounds);
         expect(nonEarthCRSObject.resolutions[0]).toEqual(1000);
         expect(nonEarthCRSObject.resolutions[1]).toEqual(100000);
+        expect(nonEarthCRSObject.scale(0)).toEqual(1/1000);
+        expect(nonEarthCRSObject.scale(1)).toEqual(1/100000);
+        expect(nonEarthCRSObject.zoom(1/1000)).toEqual(0);
         expect(nonEarthCRSObject.transformation).not.toBeNull();
         expect(nonEarthCRSObject._initHooksCalled).toBeTruthy();
     });

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"license": "Apache-2.0",`
`15`	`15`	`"dependencies": {`
`16`	`16`	`"mapv": "2.0.62",`
`17`		`- "xlsx": "0.16.9",`
	`17`	`+ "xlsx": "0.17.0",`
`18`	`18`	`"@supermap/iclient-common": "11.0.0-beta"`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export var toSuperMapGeometry = function(geometry) {`
`29`	`29`	`result = geojson ? format.read(geojson, geojson.type) : geometry;`
`30`	`30`	`}`
`31`	`31`
`32`		`- var serverResult = result;`
	`32`	`+ var serverResult = result \|\| geometry;`
`33`	`33`	`if (L.Util.isArray(result)) {`
`34`	`34`	`if (result.length === 1) {`
`35`	`35`	`serverResult = result[0];`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@`
`23`	`23`	`"jsonsql": "0.2.5",`
`24`	`24`	`"pbf": "3.2.1",`
`25`	`25`	`"proj4": "2.6.3",`
`26`		`- "xlsx": "0.16.9"`
	`26`	`+ "xlsx": "0.17.0"`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`"ol": "6.4.3",`
`21`	`21`	`"@supermap/iclient-common": "11.0.0-beta",`
`22`	`22`	`"proj4": "2.6.3",`
`23`		`- "xlsx": "0.16.9",`
	`23`	`+ "xlsx": "0.17.0",`
`24`	`24`	`"canvg": "3.0.7",`
`25`	`25`	`"lodash.remove": "^4.7.0"`
`26`	`26`	`}`