【fix】 修复经纬网图层获取extent 错误

xilanhuaweidapao · xilanhuaweidapao · commit 06e7872e812f · 2024-07-24T17:23:08.000+08:00
diff --git a/src/mapboxgl/overlay/GraticuleLayer.js b/src/mapboxgl/overlay/GraticuleLayer.js
@@ -255,7 +255,7 @@ export class GraticuleLayer {
 
   getDefaultExtent(extent, map = this.map) {
     const crs = (map.getCRS && map.getCRS()) || {};
-    let { extent: crsExtent } = crs;
+    let { lngLatExtent: crsExtent } = crs;
     if (!crsExtent) {
       crsExtent = [-180, -85.05119, 180, 85.05119];
     }
diff --git a/src/maplibregl/overlay/GraticuleLayer.js b/src/maplibregl/overlay/GraticuleLayer.js
@@ -267,7 +267,7 @@ export class GraticuleLayer {
 
   getDefaultExtent(extent, map = this.map) {
     const crs = (map.getCRS && map.getCRS()) || {};
-    let { extent: crsExtent } = crs;
+    let { lngLatExtent: crsExtent } = crs;
     if (!crsExtent) {
       crsExtent = [-180, -85.05119, 180, 85.05119];
     }
diff --git a/test/mapboxgl/overlay/GraticuleLayerSpec.js b/test/mapboxgl/overlay/GraticuleLayerSpec.js
@@ -1,6 +1,6 @@
 import { GraticuleLayer } from '../../../src/mapboxgl/overlay/GraticuleLayer';
 import mapboxgl from 'mapbox-gl';
-import { Feature } from '@supermapgis/iclient-common';
+// import { Feature } from '@supermapgis/iclient-common';
 var url = GlobeParameter.ChinaURL + '/zxyTileImage.png?z={z}&x={x}&y={y}';
 
 describe('mapboxgl_GraticuleLayer', () => {
@@ -72,7 +72,7 @@ describe('mapboxgl_GraticuleLayer', () => {
       done();
     }, 0);
   });
-  
+
   it('_initialize visible', (done) => {
     setTimeout(() => {
       const graticuleLayer = new GraticuleLayer({ layerID: 'graticuleLayer_test', visible: false });
@@ -136,6 +136,32 @@ describe('mapboxgl_GraticuleLayer', () => {
     expect(graticuleLayer.renderer.options.interval).toEqual(5);
   });
 
+  it('getDefaultExtent must return degree', () => {
+    map.getCRS = () => {
+      return {
+        extent: [
+          -20037508.3427892,
+          -20037508.3427892,
+          20037508.3427892,
+          20037508.3427892
+        ],
+        lngLatExtent: [
+          -179.99999999999963,
+          -85.05112877980658,
+          179.99999999999963,
+          85.05112877980656
+        ]
+      };
+    };
+    var extent = graticuleLayer.getDefaultExtent();
+    expect(extent).toEqual([
+      -179.99999999999963,
+      -85.05112877980658,
+      179.99999999999963,
+      85.05112877980656
+    ]);
+  });
+
   it('_calcInterval', () => {
     const interval = map.getZoom();
     const calcInterval = (map) => {
diff --git a/test/maplibregl/overlay/GraticuleLayerSpec.js b/test/maplibregl/overlay/GraticuleLayerSpec.js
@@ -84,6 +84,32 @@ describe('maplibregl_GraticuleLayer', () => {
         expect(visible).toBe('visible');
     });
 
+    it('getDefaultExtent must return degree', () => {
+      map.getCRS = () => {
+        return {
+          extent: [
+            -20037508.3427892,
+            -20037508.3427892,
+            20037508.3427892,
+            20037508.3427892
+          ],
+          lngLatExtent: [
+            -179.99999999999963,
+            -85.05112877980658,
+            179.99999999999963,
+            85.05112877980656
+          ]
+        };
+      };
+      var extent = graticuleLayer.getDefaultExtent();
+      expect(extent).toEqual([
+        -179.99999999999963,
+        -85.05112877980658,
+        179.99999999999963,
+        85.05112877980656
+      ]);
+    });
+
     it('setMinZoom', () => {
         graticuleLayer.setMinZoom(0);
         expect(graticuleLayer.options.minZoom).toEqual(0);

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ export class GraticuleLayer {`
`255`	`255`
`256`	`256`	`getDefaultExtent(extent, map = this.map) {`
`257`	`257`	`const crs = (map.getCRS && map.getCRS()) \|\| {};`
`258`		`- let { extent: crsExtent } = crs;`
	`258`	`+ let { lngLatExtent: crsExtent } = crs;`
`259`	`259`	`if (!crsExtent) {`
`260`	`260`	`crsExtent = [-180, -85.05119, 180, 85.05119];`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ export class GraticuleLayer {`
`267`	`267`
`268`	`268`	`getDefaultExtent(extent, map = this.map) {`
`269`	`269`	`const crs = (map.getCRS && map.getCRS()) \|\| {};`
`270`		`- let { extent: crsExtent } = crs;`
	`270`	`+ let { lngLatExtent: crsExtent } = crs;`
`271`	`271`	`if (!crsExtent) {`
`272`	`272`	`crsExtent = [-180, -85.05119, 180, 85.05119];`
`273`	`273`	`}`