[fix]合并冲突 AI-GEN:

Author: luoxiao-supermap

src/common/commontypes/Util.js

@@ -1129,7 +1129,7 @@ const Util = {
     * @param {string} url - 验证地址。
     * @returns {boolean} 是否是绝对地址。
     */
-   isAbsoluteURL(url) {
+  isAbsoluteURL(url) {
     try {
       const res = new URL(url);
       return !!res;

src/common/mapping/MapBase.js

@@ -26,6 +26,10 @@ export function createMapClassExtending(SuperClass = class {}) {
       return this._legendList;
     }
 
+    setLegends(legendList) {
+      this._legendList = legendList || [];
+    }
+
     getSelfAppreciableLayers() {
       return (this._sourceListModel && this._sourceListModel.getSelfLayers(...arguments)) || [];
     }
@@ -84,7 +88,9 @@ export function createMapClassExtending(SuperClass = class {}) {
         }
       }
       Array.from(new Set(sourceList)).forEach((sourceId) => {
-        this.map.removeSource(sourceId);
+        if (this.map.getSource(sourceId)) {
+          this.map.removeSource(sourceId);
+        }
       });
     }
   };

src/common/mapping/WebMapBase.js

@@ -358,6 +358,26 @@ export function createWebMapBaseExtending(SuperClass, { mapRepo }) {
       pitch && this.setPitch(pitch);
     }
 
+    /**
+     * @version 12.0.2
+     * @function WebMapBase.prototype.getPopupInfos
+     * @description 获取地图上所有图层的弹窗信息。
+     * @returns {Array} 弹窗信息数组。
+     */
+    getPopupInfos() {
+      return (this._handler && this._handler._getPopupInfos()) || [];
+    }
+
+    /**
+     * @version 11.3.0
+     * @function WebMapBase.prototype.getLegendInfos
+     * @description 获取地图本身所有图层的legend状态。
+     * @returns {Array} 图例信息数组，包含 showLegend、id、title 三个属性。
+     */
+    getLegendInfos() {
+      return (this._handler && this._handler._getLegendInfos()) || [];
+    }
+
     /**
      * @version 11.2.1
      * @function WebMapBase.prototype.getLayers
@@ -475,16 +495,23 @@ export function createWebMapBaseExtending(SuperClass, { mapRepo }) {
      * @version 11.2.1
      * @function WebMapBase.prototype.cleanLayers
      * @description 删除追加的图层和事件。当设置 `map` 时有效
+     * @param {Array<Object>} [layersToClean] - 要删除的图层数组，默认为所有可删除的缓存图层（非 reused）。每个图层对象包含 id 属性
+     * @param {boolean} [isClean=true] - 是否调用 clean(false) 销毁内部资源。为 false 时只删除指定图层并同步清理 legends
      */
-    cleanLayers() {
+    cleanLayers(layersToClean = this._cacheCleanLayers.filter(item => !item.reused), isClean = true) {
       // 清空追加的地图图层以及对应的事件
       if (!this.map) {
         return;
       }
-      const layersToClean = this._cacheCleanLayers.filter((item) => !item.reused);
+      const cacheLayers = this._cacheCleanLayers.filter((item) => !item.reused);
       this._handler && this._handler.cleanLayers(layersToClean);
-      this._cacheCleanLayers = [];
-      this.clean(false);
+      this._cacheCleanLayers = cacheLayers.filter(item => !layersToClean.some((item1=> item1.id === item.id)));
+      if (isClean) {
+        this.clean(false);
+      } else {
+        const legends = this.getLegends();
+        this._handler.setLegends(legends.filter(item => !layersToClean.some((item1=> item1.id === item.layerId))));
+      }
     }
 
     /**

src/common/mapping/WebMapV2.js

@@ -2,11 +2,11 @@
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html. */
 import cloneDeep from 'lodash.clonedeep';
-import { getProjection, toEpsgCode, transformCoodinates } from './utils/epsg-define';
-import { ColorsPickerUtil } from '../util/ColorsPickerUtil';
 import { Util } from '../commontypes/Util';
 import { ArrayStatistic } from '../util/ArrayStatistic';
+import { ColorsPickerUtil } from '../util/ColorsPickerUtil';
 import { FetchRequest } from '../util/FetchRequest';
+import { getProjection, toEpsgCode, transformCoodinates } from './utils/epsg-define';
 import { SourceListModelV2 } from './utils/SourceListModelV2';
 import { isSameRasterLayer, mergeFeatures } from './utils/util';
 
@@ -60,6 +60,10 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, crsMa
           }
           this._appendLayers = true;
           this.map = map;
+          if (this.map.addLocalIdeographFontFamily) {
+            const fontFamilys = this._getLabelFontFamily(mapInfo);
+            this.map.addLocalIdeographFontFamily(fontFamilys);
+          }
         }
         this._mapInfo = mapInfo;
         this._loadLayers(mapInfo, this._taskID);
@@ -181,6 +185,45 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, crsMa
       crsManager.registerCRS(crs);
       return epsgCode;
     }
+    _getPopupInfos() {
+      const { layers = [] } = this._mapInfo;
+      return layers.map((layer) => {
+        const { popupInfo, enableFields, name, layerID: layerId, captions: fieldCaptions } = layer;
+        if (popupInfo){ 
+          let elements = popupInfo.elements || [];
+          if (fieldCaptions) {
+            elements = (popupInfo.elements || []).map(item => {
+              if (item.type === 'FIELD') {
+                item.fieldCaption = fieldCaptions[item.fieldName] || item.fieldName;
+              }
+              return item;
+            });
+          }
+          return { ...popupInfo, layerId: [layerId], elements, title: name };
+        }
+        if (enableFields) {
+          const elements = enableFields.map((fieldName) => ({
+            type: 'FIELD',
+            fieldName,
+            fieldCaption: fieldCaptions ? (fieldCaptions[fieldName] || fieldName) : fieldName
+          }));
+          return { elements, layerId: [layerId], title: name };
+        }
+        return null;
+      }).filter(item => item !== null);
+    }
+
+    _getLegendInfos() {
+      const { layers = [] } = this._mapInfo;
+      return layers.map((layer) => {
+        const { legendSetting, name, layerID: layerId } = layer;
+        return {
+          showLegend: legendSetting ? legendSetting?.isShow !== false : false,
+          id: layerId,
+          title: name
+        };
+      });
+    }
 
     _handleLayerInfo(mapInfo, _taskID) {
       mapInfo = this._setLayerID(mapInfo);
@@ -812,6 +855,9 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, crsMa
             bounds = this._getBoundList(res);
           }
         }
+        if (bounds && !this._isValidBounds(bounds)) {
+          bounds = null;
+        }
       }
       this._addBaselayer({
         url: [url],
@@ -2764,6 +2810,35 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, crsMa
       return coor;
     }
 
+    // 校验 bounds 是否为合法的经纬度范围(EPSG:4326)
+    // 不合法返回 false：值非数字/无穷、左>=右、下>=上、四个坐标都在 ±0.5 度内(认为退化为原点附近)、超出经纬度范围
+    _isValidBounds(bounds) {
+      if (!Array.isArray(bounds) || bounds.length !== 4) {
+        return false;
+      }
+      const [left, bottom, right, top] = bounds;
+      if (![left, bottom, right, top].every((v) => typeof v === 'number' && Number.isFinite(v))) {
+        return false;
+      }
+      if (left >= right || bottom >= top) {
+        return false;
+      }
+      // 容差，吸收浮点计算误差(如 180.00000000000006)
+      const tolerance = 1e-6;
+      if (
+        Math.abs(left) > 180 + tolerance ||
+        Math.abs(right) > 180 + tolerance ||
+        Math.abs(bottom) > 90 + tolerance ||
+        Math.abs(top) > 90 + tolerance
+      ) {
+        return false;
+      }
+      if (Math.abs(left) < 0.5 && Math.abs(right) < 0.5 && Math.abs(bottom) < 0.5 && Math.abs(top) < 0.5) {
+        return false;
+      }
+      return true;
+    }
+
     _getMapCenter(mapInfo) {
       // center
       let center = mapInfo.center && [mapInfo.center.x, mapInfo.center.y];

src/common/mapping/WebMapV3.js

@@ -4,6 +4,7 @@
 import { FetchRequest } from '../util/FetchRequest';
 import { getLayerCatalogRenderLayers, getLayerInfosFromCatalogs, getMainLayerFromCatalog, isSameRasterLayer, mergeFeatures, transformUrl } from './utils/util';
 import { SourceListModelV3 } from './utils/SourceListModelV3';
+import cloneDeep from 'lodash.clonedeep';
 
 const LEGEND_RENDER_TYPE = {
   TEXT: 'TEXT',
@@ -191,6 +192,10 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa
           sprite
          });
        }
+      if (this.map.addLocalIdeographFontFamily) {
+        const fontFamilys = this._getLabelFontFamily(mapInfo);
+        this.map.addLocalIdeographFontFamily(fontFamilys);
+      }
       this._initLayers();
       return;
     }
@@ -336,6 +341,86 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa
     return epsgCode;
   }
 
+  _getFieldCaption(msDatasetId) {
+    const { datas = [] } = this._mapResourceInfo;
+    let fieldCaptions = null;
+    datas.forEach(data => {
+      if (data.datasets) {
+        const index = data.datasets.findIndex(dataset => dataset.msDatasetId === msDatasetId);
+        if (index !== -1) {
+          fieldCaptions = data.datasets[index].fieldsCaptions;
+        }
+      }
+    });
+    return fieldCaptions;
+  }
+
+  _getPopupInfoContent(data, msDatasetId) {
+    const popupInfo = cloneDeep(data);
+    const fieldCaptions = this._getFieldCaption(msDatasetId);
+    if (fieldCaptions) {
+      popupInfo.elements = popupInfo.elements ? popupInfo.elements.map(item => {
+        if (item.type === 'FIELD') {
+          item.fieldCaption = fieldCaptions[item.fieldName] || item.fieldName;
+        }
+        return item;
+      }) : [];
+    }
+    return popupInfo;
+  }
+
+  _getPopupInfoByCatalog(catalog, res = []) {
+    const { catalogType, children } = catalog;
+    if(catalogType === 'group' && children) {
+      children.forEach(child => {
+        this._getPopupInfoByCatalog(child, res);
+      })
+    }
+    if (catalogType === 'layer') {
+      const { popupInfo, msDatasetId, title, layersContent } = catalog;
+      if (popupInfo) {
+        const popupInfoVal = this._getPopupInfoContent(popupInfo, msDatasetId);
+        if (popupInfoVal) {
+          res.push({...popupInfoVal, layerId: layersContent, title});
+        }
+      }
+    }
+  }
+
+  _getPopupInfos(_mapResourceInfo = this._mapResourceInfo) {
+    const { catalogs = [] } = _mapResourceInfo;
+    const res = [];
+    catalogs.forEach((item) => {
+      this._getPopupInfoByCatalog(item, res);
+    })
+    return res;
+  }
+
+  _getLegendInfoByCatalog(catalog, res = []) {
+    const { catalogType, children, showLegend, title, id } = catalog;
+    if (catalogType === 'group' && children) {
+      children.forEach(child => {
+        this._getLegendInfoByCatalog(child, res);
+      });
+    }
+    if (catalogType === 'layer') {
+      res.push({
+        showLegend: showLegend !== false,
+        id: id,
+        title: title
+      });
+    }
+  }
+
+  _getLegendInfos(_mapResourceInfo = this._mapResourceInfo) {
+    const { catalogs = [] } = _mapResourceInfo;
+    const res = [];
+    catalogs.forEach((item) => {
+      this._getLegendInfoByCatalog(item, res);
+    });
+    return res;
+  }
+
   /**
    * @private
    * @function WebMapV3.prototype._initLayers
@@ -644,9 +729,9 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa
    * @function WebMapV3.prototype._getLabelFontFamily
    * @description 获取图层字体类型。
    */
-  _getLabelFontFamily() {
+  _getLabelFontFamily(mapInfo = this._mapInfo) {
     const fonts = ['sans-serif'];
-    const layers = this._mapInfo.layers;
+    const layers = mapInfo.layers;
     if (layers && layers.length > 0) {
       layers.forEach((layer) => {
         const textFont = (layer.layout && layer.layout['text-font']) || [];

src/common/mapping/utils/AppreciableLayerBase.js

@@ -98,10 +98,12 @@ export class AppreciableLayerBase extends Events {
     }
   }
 
-  setLayersVisible(layers, visibility) {
+  setLayersVisible(layers, visibility, isSetVisible = true) {
     layers.forEach((layer) => {
       const visbleId = this._getLayerVisibleId(layer);
-      this.layersVisibleMap.set(visbleId, visibility === 'visible');
+      if (isSetVisible) {
+        this.layersVisibleMap.set(visbleId, visibility === 'visible');
+      }
       if (layer.CLASS_INSTANCE && layer.CLASS_INSTANCE.show && layer.CLASS_INSTANCE.hide) {
         visibility === 'visible' ? layer.CLASS_INSTANCE.show() : layer.CLASS_INSTANCE.hide();
         this.map.style.fire('data', { dataType: 'style' });

src/common/mapping/utils/SourceListModelV3.js

@@ -133,7 +133,7 @@ export class SourceListModelV3 extends AppreciableLayerBase {
         reused: layer.metadata && layer.metadata.reused
       };
       const matchProjectCatalog = projectCataglogs.find((item) => item.id === layerCatalog.id) || {};
-      const { msDatasetId, relationMsDatasetId } = matchProjectCatalog;
+      const { msDatasetId, relationMsDatasetId, serviceLayerId } = matchProjectCatalog;
       let dataSource = {};
       if (msDatasetId) {
         for (const data of datas) {
@@ -174,16 +174,33 @@ export class SourceListModelV3 extends AppreciableLayerBase {
       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/')) {
+        if (matchSource.tiles && matchSource.tiles.length > 0) {
           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';
+          switch (true) {
+            case tileUrl.includes('/rest/maps/'): {
+              const [serverUrl, leftParts] = tileUrl.split('/rest/maps/');
+              const [mapName] = leftParts.split('/tileFeature');
+              dataSource.url = `${serverUrl}/rest/maps`;
+              dataSource.mapName = mapName;
+              dataSource.type = 'REST_MAP';
+              break;
+            }
+            case tileUrl.includes('/restjsr/v1/'): {
+              const [serverUrl, leftParts] = tileUrl.split('/restjsr/v1/');
+              const [mapName] = leftParts.split('/tiles/');
+              dataSource.url = `${serverUrl}/restjsr/v1/vectortile/maps`;
+              dataSource.mapName = mapName;
+              dataSource.type = 'RESTJSR';
+              break;
+            }
+            default: {
+              dataSource.url = tileUrl;
+              dataSource.type = 'VECTOR_OTHER';
+            }
+          }
         }
       }
-      layerInfo.dataSource = dataSource;
+      layerInfo.dataSource = Object.assign(dataSource, { serviceLayerId });
       if (this._l7LayerUtil.isL7Layer(layer)) {
         layerInfo.CLASS_NAME = 'L7Layer';
       }

src/common/util/MapExtend.js

@@ -101,8 +101,10 @@ export function createMapExtendExtending(product) {
         }
         return this;
       }
-      this.style.setLayoutProperty(layerID, name, value);
-      this._update(true);
+      if (this.getLayer(layerID)) {
+        this.style.setLayoutProperty(layerID, name, value);
+        this._update(true);
+      }
       return this;
     }