Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: songyumeng

dist/leaflet/include-leaflet.js

@@ -147,11 +147,11 @@
             inputCSS(disturl + '/leaflet/iclient-leaflet.min.css');
         }
         if (inArray(includes, 'iclient-plot-leaflet')) {
-            inputCSS(libsurl + '/plotting/leaflet/11.2.0/iclient-plot-leaflet.css');
+            inputCSS(libsurl + '/plotting/leaflet/11.2.1/iclient-plot-leaflet.css');
             if (supportES6()) {
-                inputScript(libsurl + '/plotting/leaflet/11.2.0/iclient-plot-leaflet-es6.min.js');
+                inputScript(libsurl + '/plotting/leaflet/11.2.1/iclient-plot-leaflet-es6.min.js');
             } else {
-                inputScript(libsurl + '/plotting/leaflet/11.2.0/iclient-plot-leaflet.min.js');
+                inputScript(libsurl + '/plotting/leaflet/11.2.1/iclient-plot-leaflet.min.js');
             }
         }
         if (inArray(includes, 'ant-design-vue')) {

examples/js/plottingPanel/PlotMapPanel.js

@@ -87,7 +87,7 @@ L.supermap.plotting.initPlotMapPanel = function(div, plotMapManager){
 
         var activePlottingLayer = document.createElement("li");
         activePlottingLayer.id="activePlottingLayer";
-        activePlottingLayer.innerText = resource.text_active;
+        activePlottingLayer.innerText = resources.text_active;
         activePlottingLayer.style.margin = '1px 0';
         activePlottingLayer.style.padding = '0 5px';
         activePlottingLayer.style.cursor = 'pointer';
@@ -105,7 +105,7 @@ L.supermap.plotting.initPlotMapPanel = function(div, plotMapManager){
 
         var activeChildPlotLayer = document.createElement("li");
         activeChildPlotLayer.id="activeChildPlotLayer";
-        activeChildPlotLayer.innerText = resource.text_active;
+        activeChildPlotLayer.innerText = resources.text_active;
         activeChildPlotLayer.style.margin = '1px 0';
         activeChildPlotLayer.style.padding = '0 5px';
         activeChildPlotLayer.style.cursor = 'pointer';

examples/js/plottingPanel/PublicStyleFunction.js

@@ -67,7 +67,7 @@ <h5 class='panel-title text-center' data-i18n="resources.title_filetransfer" sty
    function getSMLInfosSucess(evt){
        L.supermap.plotting.initSMLInfosPanel("filetree", evt.smlInfoList, function(clickSmlFileName){
            var result = sitDataManager.downloadSmlFileURL(clickSmlFileName);
-           document.getElementById("downloadUrl").value = serverUrl + result;
+           document.getElementById("downloadUrl").value = result;
            document.getElementById("smlFileName").value =clickSmlFileName;
            sitDataManager.openSmlFileOnServer(clickSmlFileName);
        })

examples/js/plottingPanel/StylePanel.js

@@ -2514,7 +2514,8 @@ window.examplesResources = {
         "text_subLayer":"subLayer",
         "text_setCurrentMapScaleToMintVisibleScale":"set current map scale to min visible scale",
         "text_setCurrentMapScaleToMaxVisibleScale":"set current map scale to max visible scale",
-        "text_clearVisibleScaleSet":"clear visible scale set"
+        "text_clearVisibleScaleSet":"clear visible scale set",
+        "text_symbolAnnotations":"symbolAnnotations"
     }
 };
 

examples/leaflet/plot_filetransfer.html

@@ -2489,7 +2489,8 @@ window.examplesResources = {
         "text_subLayer":"子图层",
         "text_setCurrentMapScaleToMintVisibleScale":"设置当前地图比例尺为最小可见比例尺",
         "text_setCurrentMapScaleToMaxVisibleScale":"设置当前地图比例尺为最大可见比例尺",
-        "text_clearVisibleScaleSet":"清除可见比例尺设置"
+        "text_clearVisibleScaleSet":"清除可见比例尺设置",
+        "text_symbolAnnotations":"多注记"
 
 
     }

examples/locales/en-US/resources.js

@@ -1,5 +1,6 @@
 import { WebMapService } from './WebMapService';
 import { SourceListModelV2 } from './utils/SourceListModelV2';
+import { createAppreciableLayerId, isSameRasterLayer } from './utils/util';
 
 export function createMapStyleExtending(SuperClass, { MapManager, mapRepo }) {
   return class MapStyle extends SuperClass {
@@ -70,6 +71,10 @@ export function createMapStyleExtending(SuperClass, { MapManager, mapRepo }) {
     _addLayersToMap() {
       const { sources, layers, layerIdMapList } = this._setUniqueId(this.mapOptions.style);
       layers.forEach((layer) => {
+        const matchRenameLayer = layerIdMapList.find(sub => sub.renderId === layer.id);
+        if (matchRenameLayer && matchRenameLayer.reused) {
+          return;
+        }
         layer.source && !this.map.getSource(layer.source) && this.map.addSource(layer.source, sources[layer.source]);
         this.map.addLayer(layer);
       });
@@ -81,13 +86,15 @@ export function createMapStyleExtending(SuperClass, { MapManager, mapRepo }) {
     _setUniqueId(style) {
       const layersToMap = JSON.parse(JSON.stringify(style.layers));
       const nextSources = {};
+      const sourcesIdChangedMap = {};
       const layerIdToChange = [];
       const timestamp = `_${+new Date()}`;
       for (const sourceId in style.sources) {
         let nextSourceId = sourceId;
         if (this.map.getSource(sourceId)) {
           nextSourceId = sourceId + timestamp;
         }
+        sourcesIdChangedMap[nextSourceId] = sourceId;
         nextSources[nextSourceId] = style.sources[sourceId];
         for (const layer of layersToMap) {
           if (layer.source === sourceId) {
@@ -97,11 +104,22 @@ export function createMapStyleExtending(SuperClass, { MapManager, mapRepo }) {
       }
       for (const layer of layersToMap) {
         const originId = layer.id;
-        if (this.map.getLayer(layer.id)) {
-          const layerId = layer.id + timestamp;
-          layer.id = layerId;
+        let reused;
+        const existLayer = this.map.getLayer(layer.id);
+        if (existLayer) {
+          // 此时用 getSource(xx).tiles 为空
+          if (
+            this.options.checkSameLayer &&
+            isSameRasterLayer(nextSources[layer.source], this.map.getStyle().sources[existLayer.source])
+          ) {
+            reused = true;
+            layer.source = sourcesIdChangedMap[layer.source];
+          } else {
+            const layerId = layer.id + timestamp;
+            layer.id = layerId;
+          }
         }
-        layerIdToChange.push({ originId: originId, renderId: layer.id });
+        layerIdToChange.push({ originId: originId, renderId: layer.id, reused });
       }
       return {
         sources: nextSources,
@@ -112,7 +130,8 @@ export function createMapStyleExtending(SuperClass, { MapManager, mapRepo }) {
 
     _generateAppreciableLayers() {
       return this.mapOptions.style.layers.reduce((layers, layer) => {
-        const id = layer['source-layer'] || layer.source || layer.id;
+        const nameLayer = layer['source-layer'] ? layer : { ...layer, layerInfo: { id: layer.id } };
+        const id = createAppreciableLayerId(nameLayer);
         const matchLayer = layers.find(item => item.id === id);
         if (matchLayer) {
           matchLayer.renderLayers.push(layer.id);
@@ -122,7 +141,8 @@ export function createMapStyleExtending(SuperClass, { MapManager, mapRepo }) {
             ...layer,
             id,
             name: matchRenameLayer && matchRenameLayer.originId,
-            renderLayers: [layer.id]
+            renderLayers: [layer.id],
+            reused: matchRenameLayer && matchRenameLayer.reused
           });
         }
         return layers;

examples/locales/zh-CN/resources.js

@@ -266,7 +266,7 @@
     }
 
     /**
-     * @function WebMapBase.prototype.setRasterTileSize
+     * @function WebMapBase.prototype.setStyle
      * @description 更新地图样式。
      * @param {Object} style - 地图 style 样式
      */

src/common/mapping/MapStyle.js

@@ -1200,12 +1200,8 @@ export class WebMapService {
       maxFeatures: -1,
       returnContent: true
     });
-    if (baseProjection) {
-      if (baseProjection === 'EPSG:3857' || baseProjection === 'EPSG:-1000') {
-        getFeatureBySQLParams.targetEpsgCode = 4326;
-      } else {
-        getFeatureBySQLParams.targetEpsgCode = +baseProjection.split(':')[1];
-      }
+    if (baseProjection && baseProjection !== 'EPSG:4326') {
+      getFeatureBySQLParams.targetEpsgCode = 4326;
     }
     const proxy = this.handleProxy();
     let options = {