优化非3857,4326投影下的TiledMapLayer偏移问题

songyumeng · songyumeng · commit 2869d460f302 · 2017-09-26T14:59:45.000+08:00
diff --git a/dist/iclient9-leaflet.js b/dist/iclient9-leaflet.js
@@ -17858,9 +17858,17 @@ var TiledMapLayer = exports.TiledMapLayer = _leaflet2["default"].TileLayer.exten
     getDefaultScale: function getDefaultScale(coords) {
         var me = this,
             crs = me._crs;
+        if (crs.options && crs.options.scaleDenominators) {
+            return 1.0 / crs.options.scaleDenominators[coords.z];
+        }
+        if (crs.options && crs.options.scales) {
+            return crs.options.scales[coords.z];
+        }
         var resolution;
         if (crs.options && crs.options.resolutions) {
             resolution = crs.options.resolutions[coords.z];
+        } else if (crs._scales) {
+            resolution = 1 / crs._scales[coords.z];
         } else {
             var tileBounds = me._tileCoordsToBounds(coords);
             var ne = crs.project(tileBounds.getNorthEast());
@@ -84490,10 +84498,11 @@ var _Util = __webpack_require__(24);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-window.Proj4js = _proj2["default"]; /**
-                                  * Inspired by https://github.com/kartena/Proj4Leaflet
-                                  */
+window.proj4 = _proj2["default"]; /**
+                                * Inspired by https://github.com/kartena/Proj4Leaflet
+                                */
 
+window.Proj4js = _proj2["default"];
 _leaflet2["default"].Proj = {};
 
 _leaflet2["default"].Proj._isProj4Obj = function (a) {
@@ -84613,7 +84622,7 @@ var CRS = exports.CRS = _leaflet2["default"].Class.extend({
         _leaflet2["default"].Util.setOptions(this, options);
         this.code = code;
         this.transformation = this.options.transformation;
-        if (this.options.bounds) {}
+
         if (this.options.bounds) {
             this.options.bounds = _leaflet2["default"].bounds(this.options.bounds);
         }
diff --git a/dist/iclient9-leaflet.min.js b/dist/iclient9-leaflet.min.js
diff --git a/dist/include-leaflet.js b/dist/include-leaflet.js
@@ -37,7 +37,7 @@
         var excludes = (targetScript.getAttribute('exclude') || "").split(",");
         if (!inArray(excludes, 'leaflet')) {
             inputCSS("http://cdn.bootcss.com/leaflet/1.0.3/leaflet.css");
-            inputScript("http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js");
+            inputScript("http://cdn.bootcss.com/leaflet/1.0.3/leaflet-src.js");
         }
         if (inArray(includes, 'mapv')) {
             inputScript("http://mapv.baidu.com/build/mapv.min.js");
@@ -52,7 +52,7 @@
             inputScript("http://cdn.bootcss.com/elasticsearch/13.0.1/elasticsearch.min.js");
         }
         if (!inArray(excludes, 'iclient9-leaflet')) {
-            inputScript("../../dist/iclient9-leaflet.min.js");
+            inputScript("../../dist/iclient9-leaflet.js");
         }
         if (inArray(includes, 'iclient9-leaflet-css')) {
             inputCSS("../../dist/iclient9-leaflet.min.css");
diff --git a/src/leaflet/core/Proj4Leaflet.js b/src/leaflet/core/Proj4Leaflet.js
@@ -5,6 +5,7 @@ import L from "leaflet";
 import proj4 from "proj4";
 import {getMeterPerMapUnit} from "./Util";
 
+window.proj4 = proj4;
 window.Proj4js = proj4;
 L.Proj = {};
 
@@ -126,9 +127,7 @@ export var CRS = L.Class.extend({
         L.Util.setOptions(this, options);
         this.code = code;
         this.transformation = this.options.transformation;
-        if (this.options.bounds) {
 
-        }
         if (this.options.bounds) {
             this.options.bounds = L.bounds(this.options.bounds);
         }
diff --git a/src/leaflet/mapping/TiledMapLayer.js b/src/leaflet/mapping/TiledMapLayer.js
@@ -127,9 +127,17 @@ export var TiledMapLayer = L.TileLayer.extend({
      */
     getDefaultScale: function (coords) {
         var me = this, crs = me._crs;
+        if (crs.options && crs.options.scaleDenominators) {
+            return 1.0 / crs.options.scaleDenominators[coords.z];
+        }
+        if (crs.options && crs.options.scales) {
+            return crs.options.scales[coords.z];
+        }
         var resolution;
         if (crs.options && crs.options.resolutions) {
             resolution = crs.options.resolutions[coords.z];
+        } else if (crs._scales) {
+            resolution = 1 / crs._scales[coords.z];
         } else {
             var tileBounds = me._tileCoordsToBounds(coords);
             var ne = crs.project(tileBounds.getNorthEast());

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`var excludes = (targetScript.getAttribute('exclude') \|\| "").split(",");`
`38`	`38`	`if (!inArray(excludes, 'leaflet')) {`
`39`	`39`	`inputCSS("http://cdn.bootcss.com/leaflet/1.0.3/leaflet.css");`
`40`		`- inputScript("http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js");`
	`40`	`+ inputScript("http://cdn.bootcss.com/leaflet/1.0.3/leaflet-src.js");`
`41`	`41`	`}`
`42`	`42`	`if (inArray(includes, 'mapv')) {`
`43`	`43`	`inputScript("http://mapv.baidu.com/build/mapv.min.js");`
`@@ -52,7 +52,7 @@`
`52`	`52`	`inputScript("http://cdn.bootcss.com/elasticsearch/13.0.1/elasticsearch.min.js");`
`53`	`53`	`}`
`54`	`54`	`if (!inArray(excludes, 'iclient9-leaflet')) {`
`55`		`- inputScript("../../dist/iclient9-leaflet.min.js");`
	`55`	`+ inputScript("../../dist/iclient9-leaflet.js");`
`56`	`56`	`}`
`57`	`57`	`if (inArray(includes, 'iclient9-leaflet-css')) {`
`58`	`58`	`inputCSS("../../dist/iclient9-leaflet.min.css");`