@supermapgis/iclient-ol 11.2.1 → 12.0.0-r

package/mapping/WebMap.js

@@ -1,4 +1,4 @@
-/* Copyright© 2000 - 2024 SuperMap Software Co.Ltd. All rights reserved.
+/* Copyright© 2000 - 2025 SuperMap Software Co.Ltd. All rights reserved.
  * 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 proj4 from 'proj4';
@@ -9,15 +9,15 @@ import { SecurityManager } from '@supermapgis/iclient-common/security/SecurityMa
 import { Events } from '@supermapgis/iclient-common/commontypes/Events';
 import { Util as CommonUtil } from '@supermapgis/iclient-common/commontypes/Util';
 import { parseCondition, parseConditionFeature } from '@supermapgis/iclient-common/util/FilterCondition';
+import { createLinesData } from '@supermapgis/iclient-common/mapping/utils/util';
 import { Util } from '../core/Util';
 import { getFeatureBySQL, queryFeatureBySQL, getFeatureProperties } from './webmap/Util';
 import { StyleUtils } from '../core/StyleUtils';
 import { TileSuperMapRest, Tianditu, BaiduMap } from '../mapping';
 import { VectorTileSuperMapRest, Graphic as GraphicSource, MapboxStyles, OverlayGraphic } from '../overlay';
 import { DataFlowService } from '../services';
+import cloneDeep from 'lodash.clonedeep';
 
-import provincialCenterData from './webmap/config/ProvinceCenter.json'; // eslint-disable-line import/extensions
-import municipalCenterData from './webmap/config/MunicipalCenter.json'; // eslint-disable-line import/extensions
 import SampleDataInfo from './webmap/config/SampleDataInfo.json'; // eslint-disable-line import/extensions
 
 import GeoJSON from 'ol/format/GeoJSON';
@@ -32,6 +32,7 @@ import * as olLayer from 'ol/layer';
 import WMTSCapabilities from 'ol/format/WMTSCapabilities';
 import WMSCapabilities from 'ol/format/WMSCapabilities';
 import TileGrid from 'ol/tilegrid/TileGrid';
+import * as olTilegrid from 'ol/tilegrid';
 import WMTSTileGrid from 'ol/tilegrid/WMTS';
 import * as olGeometry from 'ol/geom';
 import Vector from 'ol/source/Vector';
@@ -83,8 +84,8 @@ const dpiConfig = {
  * @param {function} [options.errorCallback] - 加载地图失败调用的函数。
  * @param {string} [options.credentialKey] - 凭证密钥。例如为 "key"、"token"，或者用户自定义的密钥。用户申请了密钥，此参数必填。
  * @param {string} [options.credentialValue] - 凭证密钥对应的值，credentialKey 和 credentialValue 必须一起使用。
- * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
- * @param {boolean} [options.excludePortalProxyUrl] - server 传递过来的 URL 是否带有代理。
+ * @deprecated {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+ * @deprecated {boolean} [options.excludePortalProxyUrl] - server 传递过来的 URL 是否带有代理。
  * @param {Object} [options.serviceProxy] - SuperMap iPortal 内置代理信息，仅矢量瓦片图层上图才会使用。
  * @param {string} [options.tiandituKey] - 天地图的 key。
  * @param {string} [options.bingMapsKey] - 必应地图的 key。
@@ -115,9 +116,7 @@ export class WebMap extends Observable {
     this.errorCallback = options.errorCallback;
     this.credentialKey = options.credentialKey;
     this.credentialValue = options.credentialValue;
-    this.withCredentials = options.withCredentials || false;
     this.target = options.target || 'map';
-    this.excludePortalProxyUrl = options.excludePortalProxyUrl || false;
     this.serviceProxy = options.serviceProxy || null;
     this.tiandituKey = options.tiandituKey;
     this.bingMapsKey = options.bingMapsKey || '';
@@ -130,6 +129,7 @@ export class WebMap extends Observable {
     this.webMap = options.webMap;
     this.tileFormat = options.tileFormat && options.tileFormat.toLowerCase();
     this.restDataSingleRequestCount = options.restDataSingleRequestCount || 1000;
+    this.tileRequestParameters = options.tileRequestParameters;
     this.createMap(options.mapSetting);
     if (this.webMap) {
       // webmap有可能是url地址，有可能是webmap对象
@@ -265,7 +265,7 @@ export class WebMap extends Observable {
       }
       mapUrl = this.server + 'web/maps/' + this.mapId + '/map';
       let filter = 'getUrlResource.json?url=';
-      if (this.excludePortalProxyUrl && this.server.indexOf(filter) > -1) {
+      if (this.server.indexOf(filter) > -1) {
         //大屏需求,或者有加上代理的
         let urlArray = this.server.split(filter);
         if (urlArray.length > 1) {
@@ -291,7 +291,7 @@ export class WebMap extends Observable {
       mapUrl = url;
     }
     FetchRequest.get(that.getRequestUrl(mapUrl), null, {
-      withCredentials: this.withCredentials
+      withCredentials: that.isCredentail(mapUrl)
     })
       .then(function (response) {
         return response.json();
@@ -380,7 +380,7 @@ export class WebMap extends Observable {
     if (this.isCustomProjection(crs)) {
       // 去iServer请求wkt  否则只能预览出图
       await FetchRequest.get(that.getRequestUrl(`${baseLayerUrl}/prjCoordSys.wkt`), null, {
-        withCredentials: that.withCredentials,
+        withCredentials: that.isCredentail(baseLayerUrl),
         withoutFormatSuffix: true
       })
         .then(function (response) {
@@ -431,7 +431,7 @@ export class WebMap extends Observable {
       res,
       scale,
       resolutionArray = [],
-      coordUnit = baseLayerInfo.coordUnit || olProj.get(baseLayerInfo.projection).getUnits();
+      coordUnit = baseLayerInfo.coordUnit || baseLayerInfo.units || olProj.get(baseLayerInfo.projection).getUnits();
     if (!coordUnit) {
       coordUnit = this.baseProjection == 'EPSG:3857' ? 'm' : 'degree';
     }
@@ -455,6 +455,14 @@ export class WebMap extends Observable {
         resolutionArray.push(res);
         scales.push(scale);
       }, this);
+    } else if(baseLayerInfo.layerType === 'ZXY_TILE') {
+      const { resolutions: visibleResolution } = baseLayerInfo;
+      visibleResolution.forEach(result => {
+        const currentScale = this.getScaleFromRes(result, coordUnit);
+        resolutions[this.formatScale(currentScale)] = result;
+        scales.push(currentScale);
+      })
+      resolutionArray = visibleResolution;
     } else {
       let { minZoom = 0, maxZoom = 22 } = baseLayerInfo,
         view = this.map.getView();
@@ -564,7 +572,7 @@ export class WebMap extends Observable {
     if (baseLayerType === 'TILE') {
       url = this.handleJSONSuffix(url);
       FetchRequest.get(me.getRequestUrl(url), null, {
-        withCredentials: this.withCredentials
+        withCredentials: me.isCredentail(url)
       })
         .then(function (response) {
           return response.json();
@@ -589,9 +597,10 @@ export class WebMap extends Observable {
           let options = {
             serverType,
             url,
-            tileGrid: TileSuperMapRest.optionsFromMapJSON(url, result).tileGrid
+            tileGrid: TileSuperMapRest.optionsFromMapJSON(url, result).tileGrid,
+            tileLoadFunction: me.getCustomTileLoadFunction()
           };
-          if (url && !CommonUtil.isInTheSameDomain(url) && !this.isIportalProxyServiceUrl(url)) {
+          if (url && this.isAddProxy(url)) {
             options.tileProxy = me.server + 'apps/viewer/getUrlResource.png?url=';
           }
           source = new TileSuperMapRest(options);
@@ -604,8 +613,8 @@ export class WebMap extends Observable {
       source = me.createWMSSource(baseLayerInfo);
       me.addSpecToMap(source);
     } else if (baseLayerType === 'WMTS') {
-      FetchRequest.get(me.getRequestUrl(url, true), null, {
-        withCredentials: this.withCredentials
+      FetchRequest.get(me.getRequestUrl(url), null, {
+        withCredentials: me.isCredentail(url)
       })
         .then(function (response) {
           return response.text();
@@ -772,9 +781,10 @@ export class WebMap extends Observable {
         [minZoom, maxZoom] = [maxZoom, minZoom];
       }
       if (minZoom !== 0 || maxZoom !== visibleScales.length - 1) {
+        const oldViewOptions = this.map.getView().options_ || this.map.getView().getProperties();
         this.map.setView(
           new View(
-            Object.assign({}, this.map.getView().options_, {
+            Object.assign({}, oldViewOptions, {
               maxResolution: undefined,
               minResolution: undefined,
               minZoom,
@@ -879,7 +889,7 @@ export class WebMap extends Observable {
     ) {
       //底图有固定比例尺，就直接获取。不用view计算
       this.getScales(baseLayer);
-    } else if (options.baseLayer && extent && extent.length === 4) {
+    } else if (baseLayer && baseLayer.layerType !=="ZXY_TILE" && extent && extent.length === 4) {
       let width = extent[2] - extent[0];
       let height = extent[3] - extent[1];
       let maxResolution1 = width / 512;
@@ -893,7 +903,11 @@ export class WebMap extends Observable {
     this.map.setView(new View({ zoom, center, projection, maxZoom, maxResolution }));
     let viewOptions = {};
 
-    if (
+    if (baseLayer.layerType === "ZXY_TILE") {
+      const { resolutions, minZoom, maxZoom } = baseLayer;
+      viewOptions = { minZoom, maxZoom, zoom, center, projection, resolutions};
+      this.getScales(baseLayer);
+    } else if (
       (baseLayer.scales && baseLayer.scales.length > 0 && baseLayer.layerType === 'WMTS') ||
       (this.resolutionArray && this.resolutionArray.length > 0)
     ) {
@@ -968,6 +982,9 @@ export class WebMap extends Observable {
       case 'SUPERMAP_REST':
         source = that.createDynamicTiledSource(layerInfo, isBaseLayer);
         break;
+      case 'ZXY_TILE':
+        source = this.createXYZTileSource(layerInfo);
+        break;
       case 'CLOUD':
       case 'CLOUD_BLACK':
       case 'OSM':
@@ -985,7 +1002,8 @@ export class WebMap extends Observable {
     var layer = new olLayer.Tile({
       source: source,
       zIndex: layerInfo.zIndex || 1,
-      visible: layerInfo.visible
+      visible: layerInfo.visible,
+      ...this.getLayerOtherOptions(layerInfo)
     });
     var layerID = Util.newGuid(8);
     if (layerInfo.name) {
@@ -1173,6 +1191,42 @@ export class WebMap extends Observable {
         break;
     }
   }
+
+  getCustomTileLoadFunction(transformImageUrl) {
+    const that = this;
+    if (this.tileRequestParameters) {
+      return function(imageTile, url) {
+        const src = transformImageUrl ? transformImageUrl(url) : url;
+        const requestParameters = that.tileRequestParameters(src);
+        if (requestParameters) {
+          FetchRequest.get(src, null, {
+            ...requestParameters,
+            withoutFormatSuffix: true
+          })
+            .then(function (response) {
+              return response.blob();
+            })
+            .then(function (blob) {
+              const imageUrl = URL.createObjectURL(blob);
+              imageTile.getImage().src = imageUrl;
+            })
+            .catch(function (error) {
+              console.error('Error fetching the image:', error);
+              imageTile.setState('error');
+            });
+        } else {
+          imageTile.getImage().src = src;
+        }
+      }
+    }
+    if(transformImageUrl) {
+      return function(imageTile, url) {
+        const src = transformImageUrl(url);
+        imageTile.getImage().src = src;
+      }
+    }
+  }
+
   /**
    * @private
    * @function WebMap.prototype.createDynamicTiledSource
@@ -1203,7 +1257,8 @@ export class WebMap extends Observable {
       // crossOrigin: 'anonymous', //在IE11.0.9600版本，会影响通过注册服务打开的iserver地图，不出图。因为没有携带cookie会报跨域问题
       // extent: this.baseLayerExtent,
       // prjCoordSys: {epsgCode: isBaseLayer ? layerInfo.projection.split(':')[1] : this.baseProjection.split(':')[1]},
-      format: layerInfo.format
+      format: layerInfo.format,
+      tileLoadFunction: this.getCustomTileLoadFunction()
     };
     if (!isBaseLayer && !this.isCustomProjection(this.baseProjection)) {
       options.prjCoordSys = { epsgCode: this.baseProjection.split(':')[1] };
@@ -1232,9 +1287,8 @@ export class WebMap extends Observable {
     //主机名相同时不添加代理,iportal geturlResource不支持webp代理
     if (
       layerInfo.url &&
-      !CommonUtil.isInTheSameDomain(layerInfo.url) &&
-      !this.isIportalProxyServiceUrl(layerInfo.url) &&
-      layerInfo.format !== 'webp'
+      layerInfo.format !== 'webp' && 
+      this.isAddProxy(layerInfo.url, layerInfo.proxy)
     ) {
       options.tileProxy = this.server + 'apps/viewer/getUrlResource.png?url=';
     }
@@ -1317,10 +1371,67 @@ export class WebMap extends Observable {
     return new XYZ({
       url: layerInfo.url,
       wrapX: false,
-      crossOrigin: 'anonymous'
+      crossOrigin: 'anonymous',
+      tileLoadFunction: this.getCustomTileLoadFunction()
     });
   }
 
+  getLayerOtherOptions(layerInfo) {
+    const { layerType, extent, minZoom, maxZoom } = layerInfo;
+    const extentVal = layerType === 'ZXY_TILE' ? this._getZXYTileMapBounds(layerInfo) : extent;
+    const options = { extent: extentVal };
+    if (typeof minZoom === 'number' && minZoom !== 0) {
+      options.minZoom = minZoom - 1;
+    }
+    if (typeof maxZoom === 'number') {
+      options.maxZoom = maxZoom;
+    }
+    return options;
+  }
+  _getZXYTileMapBounds(layerInfo) {
+    const { mapBounds, tileSize = 256, resolutions, origin } = layerInfo;
+    if (mapBounds) {
+      return mapBounds;
+    }
+    if (resolutions) {
+      const maxResolution = resolutions.sort((a, b) => b - a)[0];
+      const size = maxResolution * tileSize;
+      return [origin[0], origin[1] - size, origin[0] + size, origin[1]];
+    }
+    // 兼容之前的3857全球剖分
+    if (this.baseProjection == 'EPSG:3857') {
+      return [-20037508.3427892, -20037508.3427892, 20037508.3427892, 20037508.3427892];
+    }
+  }
+  /**
+   * @private
+   * @function WebMap.prototype.createXYZTileSource
+   * @description 创建图层的XYZTilesource。
+   * @param {Object} layerInfo - 图层信息
+   * @returns {ol.source.XYZ} xyz的source
+   */
+  createXYZTileSource(layerInfo) {
+    const { url, subdomains, origin, resolutions, tileSize } = layerInfo;
+    const urls = subdomains && subdomains.length ? subdomains.map((item) => url.replace('{s}', item)) : [url];
+    const options = {
+      urls,
+      wrapX: false,
+      crossOrigin: 'anonymous',
+      tileGrid: this._getTileGrid({ origin, resolutions, tileSize }),
+      projection: this.baseProjection,
+      tileLoadFunction: this.getCustomTileLoadFunction()
+    };
+    return new XYZ(options);
+  }
+  _getTileGrid({ origin, resolutions, tileSize }) {
+    if (origin === undefined && resolutions === undefined) {
+      // 兼容上一版webMercator全球剖分
+      const extent = [-20037508.3427892, -20037508.3427892, 20037508.3427892, 20037508.3427892];
+      return olTilegrid.createXYZ({ extent });
+    } else {
+      return new TileGrid({ origin, resolutions, tileSize });
+    }
+  }
   /**
    * @private
    * @function WebMap.prototype.createWMSSource
@@ -1339,9 +1450,9 @@ export class WebMap extends Observable {
         VERSION: layerInfo.version || '1.3.0'
       },
       projection: layerInfo.projection || that.baseProjection,
-      tileLoadFunction: function (imageTile, src) {
-        imageTile.getImage().src = src;
-      }
+      tileLoadFunction: this.getCustomTileLoadFunction((src) => {
+        return that.isAddProxy(src, layerInfo.proxy) ? `${that.getProxy('png')}${encodeURIComponent(src)}`: src;
+      })
     });
   }
 
@@ -1389,7 +1500,7 @@ export class WebMap extends Observable {
       url = layerInfo.url.trim(),
       credential = layerInfo.credential,
       options = {
-        withCredentials: this.withCredentials,
+        withCredentials: that.isCredentail(url, layerInfo.proxy),
         withoutFormatSuffix: true
       };
     if (isDynamic) {
@@ -1406,7 +1517,7 @@ export class WebMap extends Observable {
       token = credential.token;
     }
     url = this.handleJSONSuffix(url);
-    return FetchRequest.get(that.getRequestUrl(url), null, options)
+    return FetchRequest.get(that.getRequestUrl(url, layerInfo.proxy), null, options)
       .then(function (response) {
         return response.json();
       })
@@ -1416,7 +1527,7 @@ export class WebMap extends Observable {
         }
         let format = 'png';
         if (that.tileFormat === 'webp') {
-          const isSupportWebp = await that.isSupportWebp(layerInfo.url, token);
+          const isSupportWebp = await that.isSupportWebp(layerInfo.url, token, layerInfo.proxy);
           format = isSupportWebp ? 'webp' : 'png';
         }
         return {
@@ -1446,7 +1557,7 @@ export class WebMap extends Observable {
   getTileInfo(layerInfo, callback, mapInfo) {
     let that = this;
     let options = {
-      withCredentials: this.withCredentials,
+      withCredentials: that.isCredentail(layerInfo.url, layerInfo.proxy),
       withoutFormatSuffix: true
     };
     let tempUrl = layerInfo.url;
@@ -1455,7 +1566,7 @@ export class WebMap extends Observable {
       layerInfo.url = layerInfo.url.split('?token=')[0];
     }
     let url = this.handleJSONSuffix(tempUrl);
-    return FetchRequest.get(that.getRequestUrl(url), null, options)
+    return FetchRequest.get(that.getRequestUrl(url, layerInfo.proxy), null, options)
       .then(function (response) {
         return response.json();
       })
@@ -1479,7 +1590,7 @@ export class WebMap extends Observable {
           that.tileFormat === 'webp' &&
           layerInfo.url !== 'https://maptiles.supermapol.com/iserver/services/map_China/rest/maps/China_Dark'
         ) {
-          const isSupprtWebp = await that.isSupportWebp(layerInfo.url, token);
+          const isSupprtWebp = await that.isSupportWebp(layerInfo.url, token, layerInfo.proxy);
           layerInfo.format = isSupprtWebp ? 'webp' : 'png';
         }
         // 请求结果完成 继续添加图层
@@ -1500,8 +1611,9 @@ export class WebMap extends Observable {
    * @description 获取wmts请求文档的url
    * @param {string} url - 图层信息。
    * @param {boolean} isKvp - 是否为kvp模式
+   * @param {boolean} proxy - 是否带上代理地址 
    */
-  getWMTSUrl(url, isKvp) {
+  getWMTSUrl(url, isKvp, proxy) {
     let splitStr = '?';
     if (url.indexOf('?') > -1) {
       splitStr = '&';
@@ -1511,7 +1623,7 @@ export class WebMap extends Observable {
     } else {
       url += splitStr + '/1.0.0/WMTSCapabilities.xml';
     }
-    return this.getRequestUrl(url, true);
+    return this.getRequestUrl(url, proxy);
   }
 
   /**
@@ -1524,11 +1636,11 @@ export class WebMap extends Observable {
   getWmtsInfo(layerInfo, callback) {
     let that = this;
     let options = {
-      withCredentials: that.withCredentials,
+      withCredentials: that.isCredentail(layerInfo.url, layerInfo.proxy), 
       withoutFormatSuffix: true
     };
     const isKvp = !layerInfo.requestEncoding || layerInfo.requestEncoding === 'KVP';
-    return FetchRequest.get(that.getWMTSUrl(layerInfo.url, isKvp), null, options)
+    return FetchRequest.get(that.getWMTSUrl(layerInfo.url, isKvp, layerInfo.proxy), null, options)
       .then(function (response) {
         return response.text();
       })
@@ -1631,12 +1743,12 @@ export class WebMap extends Observable {
     let url = layerInfo.url.trim();
     url += url.indexOf('?') > -1 ? '&SERVICE=WMS&REQUEST=GetCapabilities' : '?SERVICE=WMS&REQUEST=GetCapabilities';
     let options = {
-      withCredentials: that.withCredentials,
+      withCredentials: that.isCredentail(url, layerInfo.proxy),
       withoutFormatSuffix: true
     };
 
     let promise = new Promise(function (resolve) {
-      return FetchRequest.get(that.getRequestUrl(url, true), null, options)
+      return FetchRequest.get(that.getRequestUrl(url, layerInfo.proxy), null, options)
         .then(function (response) {
           return response.text();
         })
@@ -1718,7 +1830,7 @@ export class WebMap extends Observable {
 
     // 单位通过坐标系获取 （PS: 以前代码非4326 都默认是米）
     let unit = olProj.get(this.baseProjection).getUnits();
-
+    const that = this;
     return new WMTS({
       url: layerInfo.tileUrl || layerInfo.url,
       layer: layerInfo.layer,
@@ -1734,13 +1846,15 @@ export class WebMap extends Observable {
         layerInfo.origin,
         layerInfo.matrixIds
       ),
-      tileLoadFunction: function (imageTile, src) {
+      tileLoadFunction: this.getCustomTileLoadFunction(function (src) {
         if (src.indexOf('tianditu.gov.cn') >= 0) {
-          imageTile.getImage().src = `${src}&tk=${CommonUtil.getParameters(layerInfo.url)['tk']}`;
-          return;
+          return `${src}&tk=${CommonUtil.getParameters(layerInfo.url)['tk']}`;
         }
-        imageTile.getImage().src = src;
-      }
+        if(that.isAddProxy(src, layerInfo.proxy)) {
+          return `${that.getProxy('png')}${encodeURIComponent(src)}`;
+        }
+        return src;
+      })
     });
   }
 
@@ -1891,7 +2005,7 @@ export class WebMap extends Observable {
             await that.addLayer(layer, null, layerIndex);
             that.layerAdded++;
             that.sendMapToUser(len);
-            return;
+            continue;
           }
           if (
             layer.layerType === 'MARKER' ||
@@ -1902,9 +2016,9 @@ export class WebMap extends Observable {
             let url = isSampleData
               ? `${that.server}apps/dataviz/libs/sample-datas/${dataSource.name}.json`
               : `${that.server}web/datas/${serverId}/content.json?pageSize=9999999&currentPage=1`;
-            url = that.getRequestUrl(url);
+            url = that.getRequestUrl(url, layer.proxy);
             FetchRequest.get(url, null, {
-              withCredentials: this.withCredentials
+              withCredentials: that.isCredentail(url, layer.proxy)
             })
               .then(function (response) {
                 return response.json();
@@ -1926,7 +2040,7 @@ export class WebMap extends Observable {
                       //行政规划信息
                       data.content.rows.unshift(data.content.colTitles);
                       let { divisionType, divisionField } = layer.dataSource.administrativeInfo;
-                      let geojson = that.excelData2FeatureByDivision(data.content, divisionType, divisionField);
+                      let geojson = await that.excelData2FeatureByDivision(data.content, divisionType, divisionField);
                       features = that._parseGeoJsonData2Feature({
                         allDatas: { features: geojson.features },
                         fileCode: layer.projection
@@ -1971,7 +2085,7 @@ export class WebMap extends Observable {
                       //需要判断是使用tile还是mvt服务
                       let dataService = that.getService(dataItemServices, 'RESTDATA');
                       that
-                        .isMvt(dataService.address, datasetName)
+                        .isMvt(dataService.address, datasetName, layer.proxy)
                         .then(async (info) => {
                           await that.getServiceInfoFromLayer(
                             layerIndex,
@@ -2018,7 +2132,7 @@ export class WebMap extends Observable {
               });
           }
         } else if (dataSource && dataSource.type === 'USER_DATA') {
-          that.addGeojsonFromUrl(layer, len, layerIndex, false);
+          that.addGeojsonFromUrl(layer, len, layerIndex);
         } else if (layer.layerType === 'TILE') {
           that.getTileLayerExtent(
             layer,
@@ -2107,6 +2221,10 @@ export class WebMap extends Observable {
               that.errorCallback && that.errorCallback(e, 'getFeatureFaild', that.map);
             }
           );
+        } else if (layer.layerType === 'ZXY_TILE') {
+          that.map.addLayer(that.createBaseLayer(layer, layerIndex));
+          that.layerAdded++;
+          that.sendMapToUser(len);
         }
       }
     }
@@ -2118,15 +2236,14 @@ export class WebMap extends Observable {
    * @param {Object} layerInfo - 图层信息
    * @param {number} len - 总的图层数量
    * @param {number} layerIndex - 当前图层index
-   * @param {boolean} withCredentials - 是否携带cookie
    */
-  addGeojsonFromUrl(layerInfo, len, layerIndex, withCredentials = this.withCredentials) {
+  addGeojsonFromUrl(layerInfo, len, layerIndex) {
     // 通过web添加geojson不需要携带cookie
     let { dataSource } = layerInfo,
       { url } = dataSource,
       that = this;
     FetchRequest.get(url, null, {
-      withCredentials,
+      withCredentials: that.isCredentail(url),
       withoutFormatSuffix: true
     })
       .then(function (response) {
@@ -2205,7 +2322,7 @@ export class WebMap extends Observable {
       if (service && isMapService && service.serviceType === 'RESTMAP') {
         isAdded = true;
         //地图服务,判断使用mvt还是tile
-        that.getTileLayerInfo(service.address).then(function (restMaps) {
+        that.getTileLayerInfo(service.address, layer.proxy).then(function (restMaps) {
           restMaps.forEach(function (restMapInfo) {
             let bounds = restMapInfo.bounds;
             layer.layerType = 'TILE';
@@ -2272,13 +2389,13 @@ export class WebMap extends Observable {
     let url = layerInfo.url,
       token;
     url = this.handleJSONSuffix(url);
-    let requestUrl = that.getRequestUrl(url, false);
+    let requestUrl = that.getRequestUrl(url, layerInfo.proxy);
     if (layerInfo.credential && layerInfo.credential.token) {
       token = layerInfo.credential.token;
       requestUrl += `?token=${token}`;
     }
     FetchRequest.get(requestUrl, null, {
-      withCredentials: this.withCredentials
+      withCredentials: that.isCredentail(url, layerInfo.proxy)
     })
       .then(function (response) {
         return response.json();
@@ -2311,11 +2428,9 @@ export class WebMap extends Observable {
       dataSourceName = dataSource.dataSourceName || layer.name;
     let requestUrl = that.formatUrlWithCredential(url),
       serviceOptions = {};
-    serviceOptions.withCredentials = this.withCredentials;
+    serviceOptions.withCredentials = this.isCredentail(url, layer.proxy);
     if (
-      !this.excludePortalProxyUrl &&
-      !CommonUtil.isInTheSameDomain(requestUrl) &&
-      !this.isIportalProxyServiceUrl(requestUrl)
+      that.isAddProxy(requestUrl, layer.proxy)
     ) {
       serviceOptions.proxy = this.getProxy();
     }
@@ -2437,8 +2552,9 @@ export class WebMap extends Observable {
     if (layerInfo.layerType === 'MIGRATION') {
       try {
         if (dataSource.type === 'PORTAL_DATA') {
-          const { dataMetaInfo } = await FetchRequest.get(`${this.server}web/datas/${dataSource.serverId}.json`, null, {
-            withCredentials: this.withCredentials
+          const requestUrl = `${this.server}web/datas/${dataSource.serverId}.json`;
+          const { dataMetaInfo } = await FetchRequest.get(requestUrl, null, {
+            withCredentials: this.isCredentail(requestUrl)
           }).then((res) => res.json());
           // eslint-disable-next-line require-atomic-updates
           layerInfo.xyField = {
@@ -2512,7 +2628,7 @@ export class WebMap extends Observable {
    * @returns {Object}  geojson对象
    */
   excelData2FeatureByDivision(content, divisionType, divisionField) {
-    let me = this;
+
     let asyncInport;
     if (divisionType === 'Province') {
       asyncInport = window.ProvinceData;
@@ -2522,10 +2638,33 @@ export class WebMap extends Observable {
       // let geojso;
       asyncInport = window.AdministrativeArea;
     }
-    if (asyncInport) {
-      let geojson = me.changeExcel2Geojson(asyncInport.features, content.rows, divisionType, divisionField);
-      return geojson;
+    if(asyncInport){
+      return new Promise(resolve => {
+        resolve(this.changeExcel2Geojson(asyncInport.features, content.rows, divisionType, divisionField));
+      });
+    }
+    if(divisionType === 'GB-T_2260'){
+      return new Promise(resolve => {
+        resolve({
+          type: 'FeatureCollection',
+          features: []
+        });
+      });
     }
+    const dataName = divisionType === 'City' ? 'MunicipalData' : 'ProvinceData';
+    const dataFileName = divisionType === 'City' ? 'MunicipalData.js' : 'ProvincialData.js';
+    const dataUrl = CommonUtil.urlPathAppend(this.server,`apps/dataviz/libs/administrative_data/${dataFileName}`);
+    return FetchRequest.get(this.getRequestUrl(dataUrl), null, {
+      withCredentials: this.isCredentail(dataUrl),
+      withoutFormatSuffix: true
+    })
+      .then(response => {
+        return response.text();
+      })
+      .then(result => {
+        new Function(result)();
+        return this.changeExcel2Geojson(window[dataName].features, content.rows, divisionType, divisionField);
+      });
   }
 
   /**
@@ -2581,12 +2720,15 @@ export class WebMap extends Observable {
       }
       //todo 需提示忽略无效数据
       if (feature) {
-        let newFeature = window.cloneDeep(feature);
+        let newFeature = (window.cloneDeep || cloneDeep)(feature);
         newFeature.properties = {};
+        const titleLen = titles.length;
         row.forEach((item, idx) => {
           //空格问题，看见DV多处处理空格问题，TODO统一整理
-          let key = titles[idx].trim();
-          newFeature.properties[key] = item;
+          if (idx < titleLen) {
+            let key = titles[idx].trim();
+            newFeature.properties[key] = item;
+          }
         });
         geojson.features.push(newFeature);
       }
@@ -2617,6 +2759,7 @@ export class WebMap extends Observable {
       if (allFeatures[i].geometry.type === 'Point') {
         // 标注图层 还没有属性值时候不加
         if (allFeatures[i].properties) {
+          
           allFeatures[i].properties.lon = coordinate[0];
           allFeatures[i].properties.lat = coordinate[1];
         }
@@ -2845,11 +2988,9 @@ export class WebMap extends Observable {
     } else {
       let requestUrl = that.formatUrlWithCredential(url),
         serviceOptions = {};
-      serviceOptions.withCredentials = this.withCredentials;
+      serviceOptions.withCredentials = that.isCredentail(requestUrl);
       if (
-        !this.excludePortalProxyUrl &&
-        !CommonUtil.isInTheSameDomain(requestUrl) &&
-        !this.isIportalProxyServiceUrl(requestUrl)
+        that.isAddProxy(requestUrl)
       ) {
         serviceOptions.proxy = this.getProxy();
       }
@@ -2931,13 +3072,15 @@ export class WebMap extends Observable {
     };
     let featureType = layerInfo.featureType;
     let style = await StyleUtils.toOpenLayersStyle(this.getDataVectorTileStyle(featureType), featureType);
+    const requestParameters = this.tileRequestParameters && this.tileRequestParameters(layerInfo.url);
     return new olLayer.VectorTile({
       //设置避让参数
       source: new VectorTileSuperMapRest({
         url: layerInfo.url,
         projection: layerInfo.projection,
         tileType: 'ScaleXY',
-        format: format
+        format: format,
+        ...requestParameters
       }),
       style: style
     });
@@ -4173,7 +4316,7 @@ export class WebMap extends Observable {
   checkUploadToRelationship(fileId) {
     let url = this.getRequestUrl(`${this.server}web/datas/${fileId}/datasets.json`);
     return FetchRequest.get(url, null, {
-      withCredentials: this.withCredentials
+      withCredentials: this.isCredentail(url)
     })
       .then(function (response) {
         return response.json();
@@ -4192,7 +4335,7 @@ export class WebMap extends Observable {
   getDatasources(url) {
     let requestUrl = this.getRequestUrl(`${url}/data/datasources.json`);
     return FetchRequest.get(requestUrl, null, {
-      withCredentials: this.withCredentials
+      withCredentials: this.isCredentail(requestUrl)
     })
       .then(function (response) {
         return response.json();
@@ -4213,7 +4356,7 @@ export class WebMap extends Observable {
   getDataService(fileId, datasetName) {
     let url = this.getRequestUrl(`${this.server}web/datas/${fileId}.json`);
     return FetchRequest.get(url, null, {
-      withCredentials: this.withCredentials
+      withCredentials: this.isCredentail(url)
     })
       .then(function (response) {
         return response.json();
@@ -4225,23 +4368,41 @@ export class WebMap extends Observable {
       });
   }
 
+  /**
+   * 请求是否带上cookie
+   * @param {string} url 请求地址，必选参数。
+   * @param {boolean} proxy 是否需要加上代理，可选参数。
+   * @returns { boolean | undefined } 是否带上cookie
+   */
+  isCredentail(url, proxy) {
+    if(proxy || this.isIportalProxyServiceUrl(url) || CommonUtil.isInTheSameDomain(url)) {
+      return true
+    }
+    return;
+  }
+  /**
+   * url是否要带上代理
+   * @param {*} url 请求地址，必选参数。 
+   * @param {*} proxy 是否需要加上代理，可选参数。 
+   * @returns { boolean } 是否带上代理
+   */
+  isAddProxy(url, proxy) {
+    return !CommonUtil.isInTheSameDomain(url) && !this.isIportalProxyServiceUrl(url) && proxy !== false;
+  }
+
   /**
    * @private
    * @function WebMap.prototype.getRootUrl
    * @description 获取请求地址。
    * @param {string} url 请求的地址。
-   * @param {boolean} 请求是否带上Credential。
+   * @param {boolean | undefined} proxy 是否带上代理。
    * @returns {Promise<T | never>} 请求地址。
    */
-  getRequestUrl(url, excludeCreditial) {
-    url = excludeCreditial ? url : this.formatUrlWithCredential(url);
-    //如果传入进来的url带了代理则不需要处理
-    if (this.excludePortalProxyUrl) {
-      return;
-    }
-    return CommonUtil.isInTheSameDomain(url) || this.isIportalProxyServiceUrl(url)
-      ? url
-      : `${this.getProxy()}${encodeURIComponent(url)}`;
+  getRequestUrl(url, proxy) {
+    url = this.formatUrlWithCredential(url);
+    return this.isAddProxy(url, proxy) ? 
+    `${this.getProxy()}${encodeURIComponent(url)}`: 
+    url
   }
 
   /**
@@ -4277,14 +4438,15 @@ export class WebMap extends Observable {
    * @function WebMap.prototype.getTileLayerInfo
    * @description 获取地图服务的信息
    * @param {string} url 地图服务的url（没有地图名字）
+   * @param {boolean | undefined} proxy 是否需要代理
    * @returns {Promise<T | never>} 地图服务信息
    */
-  getTileLayerInfo(url) {
+  getTileLayerInfo(url, proxy) {
     let that = this,
       epsgCode = that.baseProjection.split('EPSG:')[1];
-    let requestUrl = that.getRequestUrl(`${url}/maps.json`);
+    let requestUrl = that.getRequestUrl(`${url}/maps.json`, proxy);
     return FetchRequest.get(requestUrl, null, {
-      withCredentials: this.withCredentials
+      withCredentials: this.isCredentail(url, proxy)
     })
       .then(function (response) {
         return response.json();
@@ -4294,10 +4456,11 @@ export class WebMap extends Observable {
         if (mapInfo) {
           mapInfo.forEach(function (info) {
             let mapUrl = that.getRequestUrl(
-              `${info.path}.json?prjCoordSys=${encodeURI(JSON.stringify({ epsgCode: epsgCode }))}`
+              `${info.path}.json?prjCoordSys=${encodeURI(JSON.stringify({ epsgCode: epsgCode }))}`,
+              proxy
             );
             let promise = FetchRequest.get(mapUrl, null, {
-              withCredentials: that.withCredentials
+              withCredentials: that.isCredentail(mapUrl, proxy)
             })
               .then(function (response) {
                 return response.json();
@@ -4617,51 +4780,7 @@ export class WebMap extends Observable {
    * @returns {Array} 线数据
    */
   createLinesData(layerInfo, properties) {
-    let data = [];
-    if (properties && properties.length) {
-      // 重新获取数据
-      let from = layerInfo.from,
-        to = layerInfo.to,
-        fromCoord,
-        toCoord;
-      if (from.type === 'XY_FIELD' && from['xField'] && from['yField'] && to['xField'] && to['yField']) {
-        properties.forEach((property) => {
-          let fromX = property[from['xField']],
-            fromY = property[from['yField']],
-            toX = property[to['xField']],
-            toY = property[to['yField']];
-          if (!fromX || !fromY || !toX || !toY) {
-            return;
-          }
-
-          fromCoord = [property[from['xField']], property[from['yField']]];
-          toCoord = [property[to['xField']], property[to['yField']]];
-          data.push({
-            coords: [fromCoord, toCoord]
-          });
-        });
-      } else if (from.type === 'PLACE_FIELD' && from['field'] && to['field']) {
-        const centerDatas = provincialCenterData.concat(municipalCenterData);
-
-        properties.forEach((property) => {
-          let fromField = property[from['field']],
-            toField = property[to['field']];
-          fromCoord = centerDatas.find((item) => {
-            return Util.isMatchAdministrativeName(item.name, fromField);
-          });
-          toCoord = centerDatas.find((item) => {
-            return Util.isMatchAdministrativeName(item.name, toField);
-          });
-          if (!fromCoord || !toCoord) {
-            return;
-          }
-          data.push({
-            coords: [fromCoord.coord, toCoord.coord]
-          });
-        });
-      }
-    }
-    return data;
+    return createLinesData(layerInfo, properties);
   }
 
   /**
@@ -4685,15 +4804,16 @@ export class WebMap extends Observable {
    * @description 判断当前能否使用数据服务的mvt上图方式
    * @param {string} serviceUrl 数据服务的地址
    * @param {string} datasetName 数据服务的数据集名称
+   * @param {boolean | undefined} proxy 是否带上代理
    * @returns {Object} 数据服务的信息
    */
-  isMvt(serviceUrl, datasetName) {
+  isMvt(serviceUrl, datasetName, proxy) {
     let that = this;
     return this.getDatasetsInfo(serviceUrl, datasetName).then((info) => {
       //判断是否和底图坐标系一直
       if (info.epsgCode == that.baseProjection.split('EPSG:')[1]) {
-        return FetchRequest.get(that.getRequestUrl(`${info.url}/tilefeature.mvt`), null, {
-          withCredentials: that.withCredentials
+        return FetchRequest.get(that.getRequestUrl(`${info.url}/tilefeature.mvt`, proxy), null, {
+          withCredentials: that.isCredentail(info.url, proxy)
         })
           .then(function (response) {
             return response.json();
@@ -4724,7 +4844,7 @@ export class WebMap extends Observable {
       //判断mvt服务是否可用
       let url = `${serviceUrl}/data/datasources/${datasourceName}/datasets/${datasetName}.json`;
       return FetchRequest.get(that.getRequestUrl(url), null, {
-        withCredentials: that.withCredentials
+        withCredentials: that.isCredentail(url)
       })
         .then(function (response) {
           return response.json();
@@ -4801,8 +4921,13 @@ export class WebMap extends Observable {
     let url = dataSource.url;
     if (this.isRestMapMapboxStyle(layerInfo)) {
       url = url.replace(restMapMVTStr, '');
+      url = this.getRequestUrl(url + '.json');
+    }
+    if (url.indexOf('/restjsr/') > -1 && !/\.json$/.test(url)) {
+      url = this.getRequestUrl(url + '.json');
+    } else {
+      url = this.getRequestUrl(url);
     }
-    url = this.getRequestUrl(url + '.json');
 
     let credential = layerInfo.credential;
     let credentialValue, keyfix;
@@ -4814,7 +4939,7 @@ export class WebMap extends Observable {
     }
 
     return FetchRequest.get(url, null, {
-      withCredentials: this.withCredentials,
+      withCredentials: this.isCredentail(url),
       withoutFormatSuffix: true,
       headers: {
         'Content-Type': 'application/json;chartset=uft-8'
@@ -4825,10 +4950,23 @@ export class WebMap extends Observable {
       })
       .then((result) => {
         layerInfo.visibleScales = result.visibleScales;
-        layerInfo.coordUnit = result.coordUnit;
+        layerInfo.coordUnit = result.coordUnit || 'METER';
         layerInfo.scale = result.scale;
-        layerInfo.epsgCode = result.prjCoordSys.epsgCode;
-        layerInfo.bounds = result.bounds;
+        layerInfo.epsgCode = (result.prjCoordSys && result.prjCoordSys.epsgCode) || '3857';
+        layerInfo.bounds = result.bounds || {
+          top: 20037508.342789244,
+          left: -20037508.342789244,
+          bottom: -20037508.342789244,
+          leftBottom: {
+            x: -20037508.342789244,
+            y: -20037508.342789244
+          },
+          right: 20037508.342789244,
+          rightTop: {
+            x: 20037508.342789244,
+            y: 20037508.342789244
+          }
+        };
         return layerInfo;
       })
       .catch((error) => {
@@ -4849,7 +4987,7 @@ export class WebMap extends Observable {
     let _this = this;
     let url = layerInfo.url || layerInfo.dataSource.url;
     let styleUrl = url;
-    if (styleUrl.indexOf('/restjsr/') > -1) {
+    if (styleUrl.indexOf('/restjsr/') > -1 && !/\/style\.json$/.test(url)) {
       styleUrl = `${styleUrl}/style.json`;
     }
     styleUrl = this.getRequestUrl(styleUrl);
@@ -4863,7 +5001,7 @@ export class WebMap extends Observable {
     }
 
     return FetchRequest.get(styleUrl, null, {
-      withCredentials: this.withCredentials,
+      withCredentials: this.isCredentail(styleUrl),
       withoutFormatSuffix: true,
       headers: {
         'Content-Type': 'application/json;chartset=uft-8'
@@ -4882,7 +5020,8 @@ export class WebMap extends Observable {
           let sourcesNames = Object.keys(sources);
           sourcesNames.forEach(function (sourceName) {
             styles.sources[sourceName].tiles.forEach(function (tiles, i) {
-              styles.sources[sourceName].tiles[i] = `${tiles}?${keyfix}=${credentialValue}`;
+              const splicing = tiles.includes('?') ? '&' : '?';
+              styles.sources[sourceName].tiles[i] = `${tiles}${splicing}${keyfix}=${credentialValue}`;
             });
           });
         }
@@ -5080,7 +5219,6 @@ export class WebMap extends Observable {
    * @param {Object} layerInfo - 图层信息
    */
   createMVTLayer(layerInfo) {
-    // let that = this;
     let styles = layerInfo.styles;
     const indexbounds = styles && styles.metadata && styles.metadata.indexbounds;
     const visibleResolution = this.createVisibleResolution(
@@ -5092,14 +5230,36 @@ export class WebMap extends Observable {
     const envelope = this.getEnvelope(indexbounds, layerInfo.bounds);
     const styleResolutions = this.getStyleResolutions(envelope);
     // const origin = [envelope.left, envelope.top];
-    let withCredentials = this.isIportalProxyServiceUrl(styles.sprite);
+    let baseUrl = layerInfo.url;
+    let paramUrl = baseUrl.split('?')[1];
+    if (layerInfo.dataSource.type === 'ARCGIS_VECTORTILE') {
+      Object.keys(styles.sources).forEach(function (key) {
+        Object.keys(styles.sources[key]).forEach(function(fieldName) {
+          if (fieldName === 'url') {
+            if (typeof styles.sources[key][fieldName] === 'string' && !CommonUtil.isAbsoluteURL(styles.sources[key][fieldName])) {
+              styles.sources[key][fieldName] = CommonUtil.relative2absolute(styles.sources[key][fieldName], baseUrl);
+            }
+            styles.sources[key][fieldName] = styles.sources[key][fieldName] + (paramUrl ? '?' + paramUrl + '&f=json' : '?f=json');
+          }
+        });
+      });
+    }
+    let sourceName = Object.keys(styles.sources)[0];
+    let checkUrl = styles.sources[sourceName].url || styles.sources[sourceName].tiles[0];
+    if (checkUrl && !CommonUtil.isAbsoluteURL(checkUrl)) {
+      checkUrl = CommonUtil.relative2absolute(checkUrl, baseUrl);
+    }
+    const withCredentials = CommonUtil.isInTheSameDomain(checkUrl) || this.isIportalProxyServiceUrl(checkUrl);
+    const requestParameters = this.tileRequestParameters && this.tileRequestParameters(checkUrl);
     // 创建MapBoxStyle样式
     let mapboxStyles = new MapboxStyles({
+      baseUrl,
       style: styles,
       source: styles.name,
       resolutions: styleResolutions,
       map: this.map,
-      withCredentials
+      withCredentials,
+      ...requestParameters
     });
     return new Promise((resolve) => {
       mapboxStyles.on('styleloaded', function () {
@@ -5109,13 +5269,15 @@ export class WebMap extends Observable {
           //设置避让参数
           declutter: true,
           source: new VectorTileSuperMapRest({
+            baseUrl,
             style: styles,
             withCredentials,
             projection: layerInfo.projection,
             format: new MVT({
               featureClass: olRenderFeature
             }),
-            wrapX: false
+            wrapX: false,
+            ...requestParameters
           }),
           style: mapboxStyles.featureStyleFuntion,
           visible: layerInfo.visible,
@@ -5136,9 +5298,10 @@ export class WebMap extends Observable {
    * @description 判断是否支持webP
    * @param {*} url 服务地址
    * @param {*} token 服务token
+   * @param {*} proxy
    * @returns {boolean}
    */
-  isSupportWebp(url, token) {
+  isSupportWebp(url, token, proxy) {
     // 还需要判断浏览器
     let isIE = this.isIE();
     if (
@@ -5149,17 +5312,9 @@ export class WebMap extends Observable {
       return false;
     }
     url = token ? `${url}/tileImage.webp?token=${token}` : `${url}/tileImage.webp`;
-    let isSameDomain = CommonUtil.isInTheSameDomain(url),
-      excledeCreditial;
-    if (isSameDomain && !token) {
-      // online上服务域名一直，要用token值
-      excledeCreditial = false;
-    } else {
-      excledeCreditial = true;
-    }
-    url = this.getRequestUrl(url, excledeCreditial);
+    url = this.getRequestUrl(url, proxy);
     return FetchRequest.get(url, null, {
-      withCredentials: this.withCredentials,
+      withCredentials: this.isCredentail(url, proxy),
       withoutFormatSuffix: true
     })
       .then(function (response) {