增加WMTSLayer支持REST请求 & 补充对应UT reviewBy songyumeng

wuzhuorui5 · wuzhuorui5 · commit 084ae712cd55 · 2018-02-01T14:31:07.000+08:00
diff --git a/dist/iclient9-leaflet.js b/dist/iclient9-leaflet.js
@@ -20094,7 +20094,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
  *        crs - {{@link L.Proj.CRS}} 坐标系统类。<br>
  *        serverType - {{@link SuperMap.ServerType}} 服务来源 iServer|iPortal|online。<br>
  *        attribution - {string} 版权信息。
- *        tileProxy - {string} 启用托管地址
+ *        tileProxy - {string} 启用托管地址。
+ *        requestEncoding - {string} KVP或者REST的请求方式，默认是KVP。
  */
 var WMTSLayer = exports.WMTSLayer = _leaflet2["default"].TileLayer.extend({
 
@@ -20106,6 +20107,7 @@ var WMTSLayer = exports.WMTSLayer = _leaflet2["default"].TileLayer.extend({
         tileSize: 256,
         matrixIds: null,
         layer: '',
+        requestEncoding: 'KVP',
         attribution: "with <span>© <a href='http://iclient.supermap.io' target='_blank'>SuperMap iClient</a></span>"
     },
 
@@ -20114,6 +20116,26 @@ var WMTSLayer = exports.WMTSLayer = _leaflet2["default"].TileLayer.extend({
         // (String, Object)
         this._url = url;
         _leaflet2["default"].setOptions(this, options);
+
+        var opt = this.options;
+        if (opt.requestEncoding === "REST") {
+
+            var formatSuffixMap = {
+                "image/png": "png",
+                "image/png8": "png",
+                "image/png24": "png",
+                "image/png32": "png",
+                "png": "png",
+                "image/jpeg": "jpg",
+                "image/jpg": "jpg",
+                "jpeg": "jpg",
+                "jpg": "jpg"
+            };
+            this.formatSuffix = "." + (formatSuffixMap[opt.format] || opt.format.split("/").pop() || "png");
+        } else {
+
+            opt.requestEncoding = "KVP";
+        }
     },
 
     /**
@@ -20126,7 +20148,9 @@ var WMTSLayer = exports.WMTSLayer = _leaflet2["default"].TileLayer.extend({
         // (Point, Number) -> String
         var zoom = this._getZoomForUrl();
         var ident = this.options.matrixIds ? this.options.matrixIds[zoom].identifier : zoom;
+
         var url = _leaflet2["default"].Util.template(this._url, { s: this._getSubdomain(coords) });
+
         var obj = {
             service: 'WMTS',
             request: 'GetTile',
@@ -20143,9 +20167,14 @@ var WMTSLayer = exports.WMTSLayer = _leaflet2["default"].TileLayer.extend({
         };
 
         if (this.options.tileProxy) {
-            url = this.options.tileProxy + encodeURIComponent(url + _leaflet2["default"].Util.getParamString(obj, url));
-        } else {
+            url = this.options.tileProxy + url;
+        }
+
+        if (this.options.requestEncoding === 'KVP') {
             url += _leaflet2["default"].Util.getParamString(obj, url);
+        } else if (this.options.requestEncoding === 'REST') {
+            var params = "/" + obj.layer + "/" + obj.style + "/" + obj.tilematrixSet + "/" + obj.tilematrix + "/" + obj.tilerow + "/" + obj.tilecol + this.formatSuffix;
+            url += params;
         }
         return url;
     }
@@ -94607,7 +94636,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 /* 501 */
 /***/ (function(module, exports) {
 
-module.exports = {"_args":[["proj4@2.3.15","G:\\iClient9"]],"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz","_spec":"2.3.15","_where":"G:\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"}
+module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"G:\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"}
 
 /***/ }),
 /* 502 */
diff --git a/dist/iclient9-leaflet.min.js b/dist/iclient9-leaflet.min.js
diff --git a/examples/leaflet/WMTSLayer.html b/examples/leaflet/WMTSLayer.html
@@ -10,6 +10,7 @@
 <script type="text/javascript" src="../../dist/include-leaflet.js"></script>
 <script type="text/javascript">
     var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
+
     var res = [];
     for (var i = 0; i < 22; i++) {
         res.push(165664.43905455674 / (Math.pow(2, i)));
@@ -31,9 +32,11 @@
             style: "default",
             tilematrixSet: "Custom_China",
             format: "image/png",
+            requestEncoding: 'REST',
             attribution: "Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> with <span>© <a href='http://iclient.supermap.io' target='_blank'>SuperMap iClient</a></span>"
         }
     ).addTo(map);
+
 </script>
 </body>
 </html>
diff --git a/src/leaflet/mapping/TileLayer.WMTS.js b/src/leaflet/mapping/TileLayer.WMTS.js
@@ -19,7 +19,8 @@ import "../core/Base";
  *        crs - {{@link L.Proj.CRS}} 坐标系统类。<br>
  *        serverType - {{@link SuperMap.ServerType}} 服务来源 iServer|iPortal|online。<br>
  *        attribution - {string} 版权信息。
- *        tileProxy - {string} 启用托管地址
+ *        tileProxy - {string} 启用托管地址。
+ *        requestEncoding - {string} KVP或者REST的请求方式，默认是KVP。
  */
 export var WMTSLayer = L.TileLayer.extend({
 
@@ -31,13 +32,34 @@ export var WMTSLayer = L.TileLayer.extend({
         tileSize: 256,
         matrixIds: null,
         layer: '',
+        requestEncoding: 'KVP',
         attribution: "with <span>© <a href='http://iclient.supermap.io' target='_blank'>SuperMap iClient</a></span>"
     },
 
     //todo 自动获取Capabilities
     initialize: function (url, options) { // (String, Object)
         this._url = url;
         L.setOptions(this, options);
+
+        var opt = this.options;
+        if (opt.requestEncoding === "REST") {
+
+            var formatSuffixMap = {
+                "image/png": "png",
+                "image/png8": "png",
+                "image/png24": "png",
+                "image/png32": "png",
+                "png": "png",
+                "image/jpeg": "jpg",
+                "image/jpg": "jpg",
+                "jpeg": "jpg",
+                "jpg": "jpg"
+            };
+            this.formatSuffix = "." + (formatSuffixMap[opt.format] || opt.format.split("/").pop() || "png");
+        } else {
+
+            opt.requestEncoding = "KVP";
+        }
     },
 
     /**
@@ -49,7 +71,9 @@ export var WMTSLayer = L.TileLayer.extend({
     getTileUrl: function (coords) { // (Point, Number) -> String
         var zoom = this._getZoomForUrl();
         var ident = this.options.matrixIds ? this.options.matrixIds[zoom].identifier : zoom;
+
         var url = L.Util.template(this._url, {s: this._getSubdomain(coords)});
+
         var obj = {
             service: 'WMTS',
             request: 'GetTile',
@@ -66,9 +90,14 @@ export var WMTSLayer = L.TileLayer.extend({
         };
 
         if (this.options.tileProxy) {
-            url = this.options.tileProxy + encodeURIComponent(url + L.Util.getParamString(obj, url));
-        } else {
+            url = this.options.tileProxy + url;
+        }
+
+        if (this.options.requestEncoding === 'KVP') {
             url += L.Util.getParamString(obj, url);
+        } else if (this.options.requestEncoding === 'REST') {
+            var params = "/" + obj.layer + "/" + obj.style + "/" + obj.tilematrixSet + "/" + obj.tilematrix + "/" + obj.tilerow + "/" + obj.tilecol + this.formatSuffix;
+            url += params;
         }
         return url;
     }
diff --git a/test/leaflet/mapping/TileLayer.WMTSSpec.js b/test/leaflet/mapping/TileLayer.WMTSSpec.js
@@ -0,0 +1,74 @@
+require('../../../src/leaflet/mapping/TileLayer.WMTS');
+
+var url = GlobeParameter.WMTSURL;
+describe('leaflet_TileLayerWMTS', function () {
+    var originalTimeout;
+    var WMTStiledMapLayerObject;
+
+    beforeEach(function () {
+        originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
+    });
+    afterEach(function () {
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
+    });
+
+    it('initialize_badRequestEncoding', function () {
+        var option = {
+            layer: "China",
+            style: "default",
+            tilematrixSet: "Custom_China",
+            format: "image/png",
+            requestEncoding: '',
+            attribution: "Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> with <span>© <a href='http://iclient.supermap.io' target='_blank'>SuperMap iClient</a></span>"
+        };
+        WMTStiledMapLayerObject = L.supermap.wmtsLayer(url, option);
+        expect(WMTStiledMapLayerObject).not.toBeNull();
+        expect(WMTStiledMapLayerObject.options.layer).toBe(option.layer);
+        expect(WMTStiledMapLayerObject.options.style).toBe(option.style);
+        expect(WMTStiledMapLayerObject.options.tilematrixSet).toBe(option.tilematrixSet);
+        expect(WMTStiledMapLayerObject.options.format).toBe(option.format);
+        expect(WMTStiledMapLayerObject.options.requestEncoding).toBe("KVP");
+    });
+
+    it("getTileUrl_KVPRequestEncoding", function () {
+        var coords = {x: 0, y: 0, z: 0};
+        var option = {
+            layer: "China",
+            style: "default",
+            tilematrixSet: "Custom_China",
+            format: "image/png",
+            requestEncoding: 'KVP'
+        };
+        WMTStiledMapLayerObject = L.supermap.wmtsLayer(url, option);
+        expect(WMTStiledMapLayerObject).not.toBeNull();
+        expect(WMTStiledMapLayerObject.options.layer).toBe(option.layer);
+        expect(WMTStiledMapLayerObject.options.style).toBe(option.style);
+        expect(WMTStiledMapLayerObject.options.tilematrixSet).toBe(option.tilematrixSet);
+        expect(WMTStiledMapLayerObject.options.format).toBe(option.format);
+        expect(WMTStiledMapLayerObject.options.requestEncoding).toBe(option.requestEncoding);
+        expect(WMTStiledMapLayerObject.getTileUrl(coords)).not.toBeNull();
+        expect(WMTStiledMapLayerObject.getTileUrl(coords)).toBe('http://localhost:8090/iserver/services/map-world/wmts100?service=WMTS&request=GetTile&version=1.0.0&style=default&tilematrixSet=Custom_China&format=image%2Fpng&width=256&height=256&layer=China&tilematrix=NaN&tilerow=0&tilecol=0');
+    });
+
+    it("getTileUrl_RESTRequestEncoding", function () {
+        var coords = {x: 0, y: 0, z: 0};
+        var option = {
+            layer: "China",
+            style: "default",
+            tilematrixSet: "Custom_China",
+            format: "image/png",
+            requestEncoding: 'REST'
+        };
+        WMTStiledMapLayerObject = L.supermap.wmtsLayer(url, option);
+        expect(WMTStiledMapLayerObject).not.toBeNull();
+        expect(WMTStiledMapLayerObject.options.layer).toBe(option.layer);
+        expect(WMTStiledMapLayerObject.options.style).toBe(option.style);
+        expect(WMTStiledMapLayerObject.options.tilematrixSet).toBe(option.tilematrixSet);
+        expect(WMTStiledMapLayerObject.options.format).toBe(option.format);
+        expect(WMTStiledMapLayerObject.options.requestEncoding).toBe(option.requestEncoding);
+        expect(WMTStiledMapLayerObject.getTileUrl(coords)).not.toBeNull();
+        expect(WMTStiledMapLayerObject.getTileUrl(coords)).toBe('http://localhost:8090/iserver/services/map-world/wmts100/China/default/Custom_China/NaN/0/0.png');
+    });
+
+});
