[fix]修改拉伸面文本标签图例报错

chenxianhuii · chenxianhuii · commit 0bc447628eef · 2024-07-19T11:27:08.000+08:00
diff --git a/src/mapboxgl/mapping/webmap/v3/WebMap.js b/src/mapboxgl/mapping/webmap/v3/WebMap.js
@@ -1014,7 +1014,7 @@ export class WebMap extends mapboxgl.Evented {
       // 线面文本标签
       if (label) {
         styleSettings.push({...label, type: 'text'});
-        if (label.symbolsContent.value.symbolId) {
+        if (label.symbolsContent && label.symbolsContent.value.symbolId) {
           styleSettings.push({...label, type: 'symbol'});
         }
       }
@@ -1268,7 +1268,7 @@ export class WebMap extends mapboxgl.Evented {
         dataKeys = dataKeys.filter((key) => key !== 'color')
       }
     }
-    const isLinearColor = styleSetting.color.interpolateInfo && styleSetting.color.interpolateInfo.type === 'linear';
+    const isLinearColor = styleSetting.color && styleSetting.color.interpolateInfo && styleSetting.color.interpolateInfo.type === 'linear';
     const isShowSingleItem = this._isShowLegendSingleItem(dataKeys, isLinearColor);
     const resultList = [];
     if (isShowSingleItem) {
diff --git a/test/mapboxgl/mapping/WebMapV3Spec.js b/test/mapboxgl/mapping/WebMapV3Spec.js
@@ -949,6 +949,13 @@ describe('mapboxgl-webmap3.0', () => {
   });
 
   it('label legend', (done) => {
+    const mapInfo = JSON.parse(mapstudioWebMap_labelLegend);
+    spyOn(L7, 'PointLayer').and.callFake(mockL7.PointLayer);
+    spyOn(L7, 'LineLayer').and.callFake(mockL7.PointLayer);
+    spyOn(L7, 'PolygonLayer').and.callFake(mockL7.PointLayer);
+    spyOn(L7, 'HeatmapLayer').and.callFake(mockL7.PointLayer);
+    spyOn(L7, 'Scene').and.callFake(mockL7.Scene);
+    spyOn(L7, 'Mapbox').and.callFake(mockL7.Mapbox);
     spyOn(FetchRequest, 'get').and.callFake((url) => {
       if (url.indexOf('map.json') > -1) {
         return Promise.resolve(new Response(mapstudioWebMap_labelLegend));
@@ -959,14 +966,18 @@ describe('mapboxgl-webmap3.0', () => {
       }
       return Promise.resolve();
     });
+    mapboxgl.Map.prototype.getCRS = function () {
+      return { epsgCode: 'EPSG:3857', getExtent: () => {} };
+    };
     mapstudioWebmap = new WebMap(id, {
       server: server
     });
 
     mapstudioWebmap.on('addlayerssucceeded', ({ map }) => {
       const webMapV3 = mapstudioWebmap._getWebMapInstance();
       expect(map).not.toBeUndefined();
-      expect(webMapV3.getLegendInfo().length).toBe(6);
+      expect(webMapV3.getLegendInfo().length).toBe(9);
+      delete mapboxgl.Map.prototype.getCRS;
       done();
     });
   });
diff --git a/test/resources/WebMapV3.js b/test/resources/WebMapV3.js

Original file line number	Diff line number	Diff line change
`@@ -1014,7 +1014,7 @@ export class WebMap extends mapboxgl.Evented {`
`1014`	`1014`	`// 线面文本标签`
`1015`	`1015`	`if (label) {`
`1016`	`1016`	`styleSettings.push({...label, type: 'text'});`
`1017`		`- if (label.symbolsContent.value.symbolId) {`
	`1017`	`+ if (label.symbolsContent && label.symbolsContent.value.symbolId) {`
`1018`	`1018`	`styleSettings.push({...label, type: 'symbol'});`
`1019`	`1019`	`}`
`1020`	`1020`	`}`
`@@ -1268,7 +1268,7 @@ export class WebMap extends mapboxgl.Evented {`
`1268`	`1268`	`dataKeys = dataKeys.filter((key) => key !== 'color')`
`1269`	`1269`	`}`
`1270`	`1270`	`}`
`1271`		`- const isLinearColor = styleSetting.color.interpolateInfo && styleSetting.color.interpolateInfo.type === 'linear';`
	`1271`	`+ const isLinearColor = styleSetting.color && styleSetting.color.interpolateInfo && styleSetting.color.interpolateInfo.type === 'linear';`
`1272`	`1272`	`const isShowSingleItem = this._isShowLegendSingleItem(dataKeys, isLinearColor);`
`1273`	`1273`	`const resultList = [];`
`1274`	`1274`	`if (isShowSingleItem) {`