Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: luoxiao-supermap

src/classic/index.js

@@ -16,6 +16,7 @@ export { OutputSetting } from '@supermap/iclient-common/iServer/OutputSetting';
 export { MappingParameters } from '@supermap/iclient-common/iServer/MappingParameters';
 export { GeoCodingParameter } from '@supermap/iclient-common/iServer/GeoCodingParameter';
 export { GeoDecodingParameter } from '@supermap/iclient-common/iServer/GeoDecodingParameter';
+export { Util } from '@supermap/iclient-common/commontypes/Util';
 export * from './overlay';
 export * from './services';
 export { SuperMap } from './SuperMap';

src/classic/namespace.js

@@ -13,7 +13,8 @@ import {
   MappingParameters,
   GeoCodingParameter,
   GeoDecodingParameter,
-  SuperMap
+  SuperMap,
+  Util
 } from './index';
 
 SuperMap.ElasticSearch = ElasticSearch;
@@ -30,5 +31,5 @@ SuperMap.OutputSetting = OutputSetting;
 SuperMap.MappingParameters = MappingParameters;
 SuperMap.GeoCodingParameter = GeoCodingParameter;
 SuperMap.GeoDecodingParameter = GeoDecodingParameter;
-
+SuperMap.Util = {...SuperMap.Util, ...Util};
 export * from './index';

src/leaflet/mapping/TileLayer.WMTS.js

@@ -3,6 +3,8 @@
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import L from "leaflet";
 import "../core/Base";
+import { SecurityManager } from '@supermap/iclient-common/security/SecurityManager';
+import { Util as CommonUtil } from '@supermap/iclient-common/commontypes/Util';
 
 /**
  * @class WMTSLayer
@@ -81,8 +83,11 @@ 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 index = this._url.indexOf('?');
+        var url = index > -1 ? this._url.substring(0, this._url.indexOf('?')) : this._url;
+        var urlParams = index > -1 ? this._url.substring(this._url.indexOf('?')) : '';
 
-        var url = L.Util.template(this._url, {s: this._getSubdomain(coords)});
+        url = L.Util.template(url, {s: this._getSubdomain(coords)});
 
         var obj = {
             service: 'WMTS',
@@ -108,7 +113,9 @@ export var WMTSLayer = L.TileLayer.extend({
         } else if (this.options.requestEncoding === 'REST') {
             var params = "/" + obj.layer + "/" + obj.style + "/" + obj.tilematrixSet + "/" + obj.tilematrix + "/" + obj.tilerow + "/" + obj.tilecol + this.formatSuffix;
             url += params;
-        }
+        } 
+        url = CommonUtil.urlAppend(url, urlParams);
+        url = SecurityManager.appendCredential(url);
         return url;
     }
 });

test/leaflet/mapping/TiandituTileLayerSpec.js

@@ -127,7 +127,7 @@ describe('leaflet_TiandituTileLayer', () => {
         expect(layer.options.key).toBe('123456');
         expect(layer._url).toBe('https://t{s}.tianditu.gov.cn/cia_w/wmts?tk=123456');
         expect(layer.getTileUrl(coords)).toBe(
-            'https://t0.tianditu.gov.cn/cia_w/wmts?tk=123456&service=WMTS&request=GetTile&version=1.0.0&style=default&tilematrixSet=w&format=tiles&width=256&height=256&layer=cia&tilematrix=2&tilerow=0&tilecol=0'
+            'https://t0.tianditu.gov.cn/cia_w/wmts?service=WMTS&request=GetTile&version=1.0.0&style=default&tilematrixSet=w&format=tiles&width=256&height=256&layer=cia&tilematrix=2&tilerow=0&tilecol=0&tk=123456'
         );
     });
 
@@ -139,12 +139,12 @@ describe('leaflet_TiandituTileLayer', () => {
             key: '123456'
         }).addTo(map);
         expect(layer.getTileUrl(coords)).toBe(
-            'https://t0.tianditu.gov.cn/cia_w/wmts?tk=123456&service=WMTS&request=GetTile&version=1.0.0&style=default&tilematrixSet=w&format=tiles&width=256&height=256&layer=cia&tilematrix=2&tilerow=0&tilecol=0'
+            'https://t0.tianditu.gov.cn/cia_w/wmts?service=WMTS&request=GetTile&version=1.0.0&style=default&tilematrixSet=w&format=tiles&width=256&height=256&layer=cia&tilematrix=2&tilerow=0&tilecol=0&tk=123456'
         );
         layer.remove();
         layer.addTo(map);
         expect(layer.getTileUrl(coords)).toBe(
-            'https://t0.tianditu.gov.cn/cia_w/wmts?tk=123456&service=WMTS&request=GetTile&version=1.0.0&style=default&tilematrixSet=w&format=tiles&width=256&height=256&layer=cia&tilematrix=2&tilerow=0&tilecol=0'
+            'https://t0.tianditu.gov.cn/cia_w/wmts?service=WMTS&request=GetTile&version=1.0.0&style=default&tilematrixSet=w&format=tiles&width=256&height=256&layer=cia&tilematrix=2&tilerow=0&tilecol=0&tk=123456'
         );
     });
     it('initialize_noWrap_false', () => {
@@ -156,7 +156,7 @@ describe('leaflet_TiandituTileLayer', () => {
             key: '123456'
         }).addTo(map);
         expect(layer.getTileUrl(coords)).toBe(
-            'https://t0.tianditu.gov.cn/cia_w/wmts?tk=123456&service=WMTS&request=GetTile&version=1.0.0&style=default&tilematrixSet=w&format=tiles&width=256&height=256&layer=cia&tilematrix=2&tilerow=0&tilecol=0'
+            'https://t0.tianditu.gov.cn/cia_w/wmts?service=WMTS&request=GetTile&version=1.0.0&style=default&tilematrixSet=w&format=tiles&width=256&height=256&layer=cia&tilematrix=2&tilerow=0&tilecol=0&tk=123456'
         );
         expect( document.querySelectorAll('.leaflet-tile').length).toBeGreaterThan(4);
     });

test/leaflet/mapping/TileLayer.WMTSSpec.js

@@ -1,4 +1,5 @@
 import {wmtsLayer} from '../../../src/leaflet/mapping/TileLayer.WMTS';
+import { SecurityManager } from '../../../src/common/security/SecurityManager';
 
 var url = GlobeParameter.WMTSURL;
 describe('leaflet_TileLayerWMTS', () => {
@@ -71,4 +72,38 @@ describe('leaflet_TileLayerWMTS', () => {
         expect(WMTStiledMapLayerObject.getTileUrl(coords)).toBe(url + '/China/default/Custom_China/NaN/0/0.png');
     });
 
+    it("getTileUrl_params Token", () => {
+      var coords = {x: 0, y: 0, z: 0};
+      var option = {
+          layer: "China",
+          style: "default",
+          tilematrixSet: "Custom_China",
+          format: "image/png",
+          requestEncoding: 'REST'
+      };
+      var url = GlobeParameter.WMTSURL+'?token=test';
+      WMTStiledMapLayerObject = wmtsLayer(url, option);
+      const tileUrl = WMTStiledMapLayerObject.getTileUrl(coords)
+      expect(tileUrl).not.toBeNull();
+      expect(tileUrl).toBe(GlobeParameter.WMTSURL + '/China/default/Custom_China/NaN/0/0.png?token=test');
+    });
+
+    it("getTileUrl_registerToken", () => {
+      var coords = {x: 0, y: 0, z: 0};
+      var option = {
+          layer: "China",
+          style: "default",
+          tilematrixSet: "Custom_China",
+          format: "image/png",
+          requestEncoding: 'REST'
+      };
+      var url = GlobeParameter.WMTSURL;
+      SecurityManager.registerToken(url, 'test');
+      WMTStiledMapLayerObject = wmtsLayer(url, option);
+      const tileUrl = WMTStiledMapLayerObject.getTileUrl(coords)
+      expect(tileUrl).not.toBeNull();
+      expect(tileUrl).toBe(GlobeParameter.WMTSURL + '/China/default/Custom_China/NaN/0/0.png?token=test');
+      SecurityManager.destroyToken(url);
+      SecurityManager.destroyAllCredentials();
+  });
 });