【fix】修复lealfet tianditulayer在L.control.layers合用时报错的问题

songyumeng · songyumeng · commit 1c8b58d6bcd4 · 2020-08-30T23:35:24.000+08:00
diff --git a/src/leaflet/mapping/ImageMapLayer.js b/src/leaflet/mapping/ImageMapLayer.js
@@ -340,7 +340,7 @@ export var ImageMapLayer = Layer.extend({
 
         var zoom = this._map.getZoom();
         var bounds = this._map.getBounds();
-        if (zoom > this._map.options.maxZoom || zoom < this._map.options.zoom) {
+        if (zoom > (this._map.options.maxZoom|| 18) || zoom < (this._map.options.minZoom || 0)) {
             if (this._currentImage) {
                 this._currentImage._map.removeLayer(this._currentImage);
                 this._currentImage = null;
diff --git a/src/leaflet/mapping/TiandituTileLayer.js b/src/leaflet/mapping/TiandituTileLayer.js
@@ -55,12 +55,12 @@ export var TiandituTileLayer = WMTSLayer.extend({
         this.options.maxZoom = this.layerZoomMap[this.options.layerType] - 1;
         WMTSLayer.prototype.initialize.call(this, this.options.url, this.options);
         L.stamp(this);
-    },
-    onAdd: function (map) {
-        this.options.tilematrixSet = map.options.crs.code === "EPSG:4326" ? "c" : "w";
         if (this.options.key) {
             this._url = `${this._url}tk=${this.options.key}`;
         }
+    },
+    onAdd: function (map) {
+        this.options.tilematrixSet = map.options.crs.code === "EPSG:4326" ? "c" : "w";
         this._url = this._url.replace("{layer}", this.options.layer).replace("{proj}", this.options.tilematrixSet);
         WMTSLayer.prototype.onAdd.call(this, map);
     }
diff --git a/test/leaflet/mapping/TiandituTileLayerSpec.js b/test/leaflet/mapping/TiandituTileLayerSpec.js
@@ -0,0 +1,150 @@
+import { tiandituTileLayer } from '../../../src/leaflet/mapping/TiandituTileLayer';
+import { mockCreateTile } from '../../tool/mock_leaflet';
+import { TianDiTu_WGS84CRS, TianDiTu_MercatorCRS } from '../../../src/leaflet/core/ExtendsCRS';
+
+describe('leaflet_TiandituTileLayer', () => {
+    var originalTimeout, map, layer,testDiv;
+    beforeAll(() => {
+        testDiv = document.createElement('div');
+        testDiv.setAttribute('id', 'map');
+        testDiv.style.styleFloat = 'left';
+        testDiv.style.marginLeft = '8px';
+        testDiv.style.marginTop = '50px';
+        testDiv.style.width = '500px';
+        testDiv.style.height = '500px';
+        mockCreateTile();
+        document.body.appendChild(testDiv);
+        map = L.map('map', {
+            center: [0, 0],
+            maxZoom: 17,
+            zoom: 1,
+            crs: TianDiTu_MercatorCRS
+        });
+    });
+    beforeEach(() => {
+        originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
+    });
+    afterEach(() => {
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
+        if (layer) {
+            layer.remove();
+            layer = null;
+        }
+    });
+    afterAll(() => {
+        document.body.removeChild(testDiv);
+        map.remove();
+    });
+
+    it('initialize', () => {
+        layer = tiandituTileLayer({
+            key: '123456'
+        }).addTo(map);
+        expect(layer).not.toBeNull();
+        expect(layer.options.layer).toBe('vec');
+        expect(layer.options.isLabel).toBeFalse;
+        expect(layer.options.tilematrixSet).toBe('w');
+        expect(layer.options.maxZoom).toBe(17);
+        expect(layer.options.requestEncoding).toBe('KVP');
+        expect(layer.options.key).toBe('123456');
+        expect(layer._url).toBe('https://t{s}.tianditu.gov.cn/vec_w/wmts?tk=123456');
+    });
+
+    it('initialize_img', () => {
+        layer = tiandituTileLayer({
+            layerType: 'img',
+            isLabel: true,
+            key: '123456'
+        }).addTo(map);
+        expect(layer).not.toBeNull();
+        expect(layer.options.layer).toBe('cia');
+        expect(layer.options.isLabel).toBeTrue;
+        expect(layer.options.tilematrixSet).toBe('w');
+        expect(layer.options.maxZoom).toBe(17);
+        expect(layer.options.requestEncoding).toBe('KVP');
+        expect(layer.options.key).toBe('123456');
+        expect(layer._url).toBe('https://t{s}.tianditu.gov.cn/cia_w/wmts?tk=123456');
+    });
+
+    it('initialize_ter', () => {
+        layer = tiandituTileLayer({
+            layerType: 'ter',
+            key: '123456'
+        }).addTo(map);
+        expect(layer).not.toBeNull();
+        expect(layer.options.layer).toBe('ter');
+        expect(layer.options.isLabel).toBeFalse;
+        expect(layer.options.tilematrixSet).toBe('w');
+        expect(layer.options.maxZoom).toBe(13);
+        expect(layer.options.requestEncoding).toBe('KVP');
+        expect(layer.options.key).toBe('123456');
+        expect(layer._url).toBe('https://t{s}.tianditu.gov.cn/ter_w/wmts?tk=123456');
+    });
+
+    it('initialize_4326', () => {
+        map.options.crs = TianDiTu_WGS84CRS;
+        layer = tiandituTileLayer({
+            layerType: 'ter',
+            key: '123456'
+        }).addTo(map);
+        expect(layer).not.toBeNull();
+        expect(layer.options.layer).toBe('ter');
+        expect(layer.options.isLabel).toBeFalse;
+        expect(layer.options.tilematrixSet).toBe('c');
+        expect(layer.options.maxZoom).toBe(13);
+        expect(layer.options.requestEncoding).toBe('KVP');
+        expect(layer.options.key).toBe('123456');
+        expect(layer._url).toBe('https://t{s}.tianditu.gov.cn/ter_c/wmts?tk=123456');
+        map.options.crs = TianDiTu_MercatorCRS;
+    });
+
+    it('initialize_url', () => {
+        layer = tiandituTileLayer({
+            url: 'https://my.tianditu/{layer}_{proj}/wmts?',
+            key: '123456'
+        }).addTo(map);
+        expect(layer).not.toBeNull();
+        expect(layer.options.layer).toBe('vec');
+        expect(layer.options.isLabel).toBeFalse;
+        expect(layer.options.tilematrixSet).toBe('w');
+        expect(layer._url).toBe('https://my.tianditu/vec_w/wmts?tk=123456');
+    });
+
+    it('getTileUrl', () => {
+        var coords = { x: 0, y: 0, z: 0 };
+        layer = tiandituTileLayer({
+            layerType: 'img',
+            isLabel: true,
+            key: '123456'
+        }).addTo(map);
+        expect(layer).not.toBeNull();
+        expect(layer.options.layer).toBe('cia');
+        expect(layer.options.isLabel).toBeTrue;
+        expect(layer.options.tilematrixSet).toBe('w');
+        expect(layer.options.maxZoom).toBe(17);
+        expect(layer.options.requestEncoding).toBe('KVP');
+        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'
+        );
+    });
+
+    it('getTileUrl_remove', () => {
+        var coords = { x: 0, y: 0, z: 0 };
+        layer = tiandituTileLayer({
+            layerType: 'img',
+            isLabel: true,
+            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'
+        );
+        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'
+        );
+    });
+});
diff --git a/test/test-main-leaflet.js b/test/test-main-leaflet.js
@@ -11,6 +11,7 @@ import './leaflet/mapping/ImageMapLayerSpec.js';
 import './leaflet/mapping/TiledMapLayerSpec.js';
 import './leaflet/mapping/TileLayer.WMTSSpec.js';
 import './leaflet/mapping/WebMapSpec.js';
+import './leaflet/mapping/TiandituTileLayerSpec';
 
 /*leaflet -- overlay*/
 
