【feature】webmap3.0 datasource 优化; l7 结构化数据指定 promoteId

xiongjiaojiao · xiongjiaojiao · commit 7632929e05f3 · 2024-07-03T14:47:47.000+08:00
diff --git a/src/mapboxgl/mapping/utils/L7LayerUtil.js b/src/mapboxgl/mapping/utils/L7LayerUtil.js
@@ -1948,7 +1948,7 @@ function addL7MarkerLayer(actionLayer, scene) {
   return layer;
 }
 
-function getL7Layer(l) {
+function getL7Layer(l, sourceInfo) {
   const typeRule = {
     [MSLayerType.line]: 'LineLayer',
     [MSLayerType.point]: 'PointLayer',
@@ -1958,7 +1958,7 @@ function getL7Layer(l) {
   const source = l.source || {};
   const layer = new L7Layer({
     type: typeRule[l.type],
-    options: { ...l.options, layerID: (l.options || {}).name, featureId: (source.parser || {}).type === 'mvt' ? 'smpid' :  undefined } // 解决L7结构化数据监听click事件会返回多个features问题
+    options: { ...l.options, layerID: (l.options || {}).name, featureId: sourceInfo.promoteId } // 解决L7结构化数据监听click事件会返回多个features问题
   });
   // getL7Layer返回原生antv l7 layer的实例
   const l7Layer = layer.getL7Layer();
@@ -2033,7 +2033,7 @@ export async function addL7Layers({ map, webMapInfo, l7Layers, spriteDatas, opti
       (l.options || {}).visible !== false && addL7MarkerLayer(actionLayer, scene);
       ChartController.setSceneChartLayer(l.id, actionLayer);
     } else {
-      const layer = getL7Layer(l);
+      const layer = getL7Layer(l, sources[layers[layerIndex].source]);
       if (!map.getLayer(layer.id)) {
         map.addLayer(layer, beforeLayer && beforeLayer.id);
       }
diff --git a/src/mapboxgl/mapping/webmap/v3/WebMap.js b/src/mapboxgl/mapping/webmap/v3/WebMap.js
@@ -717,6 +717,17 @@ export class WebMap extends mapboxgl.Evented {
         }
       }
       const sourceOnMap = this.map.getSource(layer.source);
+      if (!Object.keys(dataSource).length && sourceOnMap && sourceOnMap.type === 'vector') {
+        const matchSource = this._mapInfo.sources[layer.source] || sourceOnMap;
+        if (matchSource.tiles && matchSource.tiles[0].includes('/rest/maps/')) {
+          const tileUrl = matchSource.tiles[0];
+          const [serverUrl, leftParts] = tileUrl.split('/rest/maps/');
+          const [mapName] = leftParts.split('/tileFeature');
+          dataSource.url = `${serverUrl}/rest/maps`;
+          dataSource.mapName = mapName;
+          dataSource.type = 'REST_MAP';
+        }
+      }
       const layout = layer.layout || {};
       const overlayLayers = this._formatLayer({
         id: layer.id,
diff --git a/test/mapboxgl/mapping/WebMapV3Spec.js b/test/mapboxgl/mapping/WebMapV3Spec.js
@@ -543,6 +543,7 @@ describe('mapboxgl-webmap3.0', () => {
   });
 
   it('layerdatas', (done) => {
+    const spyTest = spyOn(mapboxgl, 'Map').and.callFake(mbglmap);
     spyOn(FetchRequest, 'get').and.callFake((url) => {
       if (url.indexOf('map.json') > -1) {
         return Promise.resolve(new Response(apstudioWebMap_layerData));
@@ -554,10 +555,8 @@ describe('mapboxgl-webmap3.0', () => {
       return Promise.resolve();
     });
     mapstudioWebmap = new WebMap(id, {
-      server: server,
-      iportalServiceProxyUrl: 'layerdatas'
+      server: server
     });
-
     mapstudioWebmap.on('addlayerssucceeded', ({ map }) => {
       expect(map).not.toBeUndefined();
       expect(mapstudioWebmap.map).toEqual(map);
@@ -567,8 +566,8 @@ describe('mapboxgl-webmap3.0', () => {
       expect(style.layers.length).toBe(mapInfo.layers.length);
       const appreciableLayers = webMapV3.getAppreciableLayers();
       const layerList = webMapV3.getLayerCatalog();
-      expect(layerList.length).toBe(4);
-      expect(appreciableLayers.length).toBe(4);
+      expect(layerList.length).toBe(5);
+      expect(appreciableLayers.length).toBe(5);
       expect(
         appreciableLayers.some(
           (item) =>
@@ -585,13 +584,23 @@ describe('mapboxgl-webmap3.0', () => {
           (item) =>
             item.id === 'ms_New_LINE_1718091329989_7' &&
             item.dataSource.type === 'REST_DATA' &&
-            item.dataSource.url === 'http://172.16.14.44:8090/iserver/services/data-Building/rest/data' &&
+            item.dataSource.url.match(/\/iserver\/services\/data-Building\/rest\/data$/) &&
             item.dataSource.serverId === void 0
         )
       ).toBeTruthy();
+      expect(
+        appreciableLayers.some(
+          (item) =>
+            item.renderSource.id === 'ms_M_3857_1719917169016_4' &&
+            item.dataSource.type === 'REST_MAP' &&
+            item.dataSource.url.match(/\/iserver\/services\/map-multi0508\/rest\/maps$/) &&
+            item.dataSource.mapName === 'M_3857'
+        )
+      ).toBeTruthy();
       expect(
         appreciableLayers.some((item) => item.id === 'CHINA_DARK' && !Object.keys(item.dataSource).length)
       ).toBeTruthy();
+      spyTest.calls.reset();
       done();
     });
   });
diff --git a/test/mapboxgl/mapping/utils/L7LayerUtilSpec.js b/test/mapboxgl/mapping/utils/L7LayerUtilSpec.js
@@ -459,7 +459,8 @@ describe('L7LayerUtil', () => {
           'http://localhost:8195/portalproxy/592c4095f464540e/iserver/services/map-LinkMap/restjsr/v1/vectortile/maps/%E5%8E%BF%E7%BA%A7%E8%A1%8C%E6%94%BF%E5%8C%BA%E5%88%92%40link/tiles/{z}/{x}/{y}.mvt'
         ],
         bounds: [102.98962307000005, 30.090978575000065, 104.89626180000005, 31.437765225000078],
-        type: 'vector'
+        type: 'vector',
+        promoteId: 'spmid'
       }
     };
     const nextOptions = {
diff --git a/test/mapboxgl/overlay/L7LayerSpec.js b/test/mapboxgl/overlay/L7LayerSpec.js
@@ -448,6 +448,7 @@ describe('mapboxgl L7Layer', () => {
           type: 'Feature',
           properties: {
             city: '北京',
+            spmid: 1
           },
           geometry: {
             type: 'Point',
@@ -490,6 +491,11 @@ describe('mapboxgl L7Layer', () => {
     layer.setSelectedDatas(geoData.features);
     expect(layer.selectedDatas.length).toEqual(geoData.features.length);
     expect(layerFilter.values('北京')).toBeFalsy();
+    layer.setSelectedDatas([]);
+    layer.l7layer.rawConfig.filter = ['all', ['==', '$type', 'LineString']];
+    const nextLayerFilter = layer.getFilter();
+    expect(nextLayerFilter.field).toEqual([]);
+    expect(nextLayerFilter.values('1')).toBeTruthy();
     spyOn(l7Layer, 'on');
     spyOn(l7Layer, 'once');
     spyOn(l7Layer, 'off');
diff --git a/test/resources/WebMapV3.js b/test/resources/WebMapV3.js
diff --git a/test/tool/mock_mapboxgl_map.js b/test/tool/mock_mapboxgl_map.js
