MartininCSU
diff --git a/‎dist/mapboxgl/iclient-mapboxgl-es6.js
Lines changed: 125 additions & 77 deletions b/‎dist/mapboxgl/iclient-mapboxgl-es6.js
Lines changed: 125 additions & 77 deletions
@@ -73958,7 +73958,6 @@ external_mapboxgl_default.a.supermap.HeatMapLayer = HeatMapLayer_HeatMapLayer;
  * @param {boolean} [options.props.colorRange=[[255,255,178,255],[254,217,118,255],[254,178,76,255],[253,141,60,255],[240,59,32,255],[189,0,38,255]]]   - "hexagon-layer" 配置项：色带。
  */
 class DeckglLayer_DeckglLayer {
-
     constructor(layerTypeID, options) {
         // Util.extend(defaultProps, options);
         /**
@@ -73967,22 +73966,23 @@ class DeckglLayer_DeckglLayer {
          */
         this.layerTypeID = layerTypeID;
         /**
-         * @member {Array.<mapboxgl.supermap.Graphic>} mapboxgl.supermap.DeckglLayer.prototype.graphics 
+         * @member {Array.<mapboxgl.supermap.Graphic>} mapboxgl.supermap.DeckglLayer.prototype.graphics
          * @description 点要素对象数组。
          */
         this.data = [].concat(options.data);
 
         this.props = options.props ? options.props : {};
         this.callback = options.callback ? options.callback : {};
 
-        this.id = options.layerId ? options.layerId : Util_Util.createUniqueID("graphicLayer_" + this.layerTypeID + "_");
+        this.id = options.layerId
+            ? options.layerId
+            : Util_Util.createUniqueID('graphicLayer_' + this.layerTypeID + '_');
 
         /**
          * @member {boolean} [mapboxgl.supermap.DeckglLayer.prototype.visibility=true]
          * @description 图层显示状态属性。
          */
         this.visibility = true;
-
     }
 
     /**
@@ -74077,10 +74077,8 @@ class DeckglLayer_DeckglLayer {
     setVisibility(visibility) {
         if (this.canvas && visibility !== this.visibility) {
             this.visibility = visibility;
-            this.canvas.style.display = visibility ? "block" : "none";
+            this.canvas.style.display = visibility ? 'block' : 'none';
         }
-
-
     }
 
     /**
@@ -74099,6 +74097,7 @@ class DeckglLayer_DeckglLayer {
      */
     setStyle(styleOptions) {
         core_Util_Util.extend(this.props, styleOptions);
+        this._createLayerByLayerTypeID();
         this.update();
     }
 
@@ -74123,7 +74122,6 @@ class DeckglLayer_DeckglLayer {
         this.update();
     }
 
-
     /**
      * @function mapboxgl.supermap.DeckglLayer.prototype.addData
      * @description 添加点要素，不会覆盖之前的要素。
@@ -74147,25 +74145,16 @@ class DeckglLayer_DeckglLayer {
      * @description 更新图层。
      */
     update() {
-        let changeFlags = {
+        if (this.layer.lifecycle !== 'Awaiting state') {
+            let changeFlags = {
                 dataChanged: true,
                 propsChanged: true,
                 viewportChanged: true,
                 updateTriggersChanged: true
-            },
-            state = this._getState();
-        if (this.layerTypeID === "polygon-layer") {
-            const subLayers = this.layer.getSubLayers();
-            for (let i = 0; i < subLayers.length; i++) {
-                subLayers[i].setChangeFlags(changeFlags);
-                subLayers[i].setState(state);
-            }
-            //todo 无法解释为什么 this.layer.setState(state);这样不行
-            this._draw();
-            return;
+            };
+            this.layer.setChangeFlags(changeFlags);
         }
-        this.layer.setChangeFlags(changeFlags);
-        this.layer.setState(state);
+        this._draw();
     }
 
     /**
@@ -74195,6 +74184,7 @@ class DeckglLayer_DeckglLayer {
         let deckOptions = this._getState();
         deckOptions.layers = [this.layer];
         deckOptions.canvas = this.canvas;
+        // this.deckGL.updateLayers();
         this.deckGL.setProps(deckOptions);
     }
 
@@ -74258,25 +74248,24 @@ class DeckglLayer_DeckglLayer {
         this.props.pickable = Boolean(this.props.onClick) || Boolean(this.props.onHover);
 
         //各类型各自从 defaultProps 取出相形的参数：
-        if (this.layerTypeID === "scatter-plot") {
+        if (this.layerTypeID === 'scatter-plot') {
             this.props.id = 'scatter-plot';
             this._createScatterPlotLayer();
-        } else if (this.layerTypeID === "path-layer") {
+        } else if (this.layerTypeID === 'path-layer') {
             this.props.id = 'path-layer';
             this._createPathLayer();
-        } else if (this.layerTypeID === "polygon-layer") {
+        } else if (this.layerTypeID === 'polygon-layer') {
             this.props.id = 'polygon-layer';
             this._createPolygonLayer();
-        } else if (this.layerTypeID === "arc-layer") {
+        } else if (this.layerTypeID === 'arc-layer') {
             this.props.id = 'arc-layer';
             this._createArcLineLayer();
-        } else if (this.layerTypeID === "hexagon-layer") {
+        } else if (this.layerTypeID === 'hexagon-layer') {
             this.props.id = 'hexagon-layer';
             this._createHexagonLayer();
         } else {
-            throw new Error(this.layerTypeID + " does not support");
+            throw new Error(this.layerTypeID + ' does not support');
         }
-
     }
 
     /**
@@ -74292,25 +74281,31 @@ class DeckglLayer_DeckglLayer {
               return point.geometry.coordinates;
           };*/
         var me = this;
-        this.props.getPosition = this.callback.getPosition ? this.callback.getPosition : function (point) {
-            if (!point) {
-                return [0, 0, 0];
-            }
-            let lngLat = point.getLngLat();
-            return lngLat && [lngLat.lng, lngLat.lat, 0];
-        };
+        this.props.getPosition = this.callback.getPosition
+            ? this.callback.getPosition
+            : function(point) {
+                  if (!point) {
+                      return [0, 0, 0];
+                  }
+                  let lngLat = point.getLngLat();
+                  return lngLat && [lngLat.lng, lngLat.lat, 0];
+              };
         if (this.callback.getColor) {
-            this.props.getColor = this.callback.getColor ? this.callback.getColor : function (point) {
-                let style = point && point.getStyle();
-                return style && style.color || me.props.color
-            };
+            this.props.getColor = this.callback.getColor
+                ? this.callback.getColor
+                : function(point) {
+                      let style = point && point.getStyle();
+                      return (style && style.color) || me.props.color;
+                  };
         }
 
         if (this.callback.getRadius) {
-            this.props.getRadius = this.callback.getRadius ? this.callback.getRadius : function (point) {
-                let style = point && point.getStyle();
-                return style && style.radius || me.props.radius
-            };
+            this.props.getRadius = this.callback.getRadius
+                ? this.callback.getRadius
+                : function(point) {
+                      let style = point && point.getStyle();
+                      return (style && style.radius) || me.props.radius;
+                  };
         }
 
         if (this.props.color || this.props.radius) {
@@ -74319,7 +74314,7 @@ class DeckglLayer_DeckglLayer {
                 this.props.updateTriggers.getRadius = [this.props.radius];
             }
             if (this.props.color) {
-                this.props.updateTriggers.getColor = [this.props.color]
+                this.props.updateTriggers.getColor = [this.props.color];
             }
         }
         this.layer = new window.DeckGL.ScatterplotLayer(this.props);
@@ -74330,9 +74325,11 @@ class DeckglLayer_DeckglLayer {
      * @private
      */
     _createPathLayer() {
-        this.props.getPath = this.callback.getPath ? this.callback.getPath : function (feature) {
-            return feature.geometry.coordinates;
-        };
+        this.props.getPath = this.callback.getPath
+            ? this.callback.getPath
+            : function(feature) {
+                  return feature.geometry.coordinates;
+              };
         //以下几个函数也可走默认值
         if (this.callback.getColor) {
             this.props.getColor = this.callback.getColor;
@@ -74352,9 +74349,11 @@ class DeckglLayer_DeckglLayer {
      * @private
      */
     _createPolygonLayer() {
-        this.props.getPolygon = this.callback.getPolygon ? this.callback.getPolygon : function (feature) {
-            return feature.geometry.coordinates;
-        };
+        this.props.getPolygon = this.callback.getPolygon
+            ? this.callback.getPolygon
+            : function(feature) {
+                  return feature.geometry.coordinates;
+              };
 
         //todo 思考下真的让用户配这么多回调么，或者先判断下数据属性里面有没有配置的属性值？
 
@@ -74381,20 +74380,24 @@ class DeckglLayer_DeckglLayer {
      */
     _createArcLineLayer() {
         //todo ArcLineLayer geojson coordinates数组中只能有一个线段
-        this.props.getSourcePosition = this.callback.getSourcePosition ? this.callback.getSourcePosition : function (feature) {
-            if (!feature) {
-                return [0, 0, 0];
-            }
-
-            return feature.geometry.coordinates[0];
-        };
-        this.props.getTargetPosition = this.callback.getTargetPosition ? this.callback.getTargetPosition : function (feature) {
-            if (!feature) {
-                return [0, 0, 0];
-            }
-
-            return feature.geometry.coordinates[1];
-        };
+        this.props.getSourcePosition = this.callback.getSourcePosition
+            ? this.callback.getSourcePosition
+            : function(feature) {
+                  if (!feature) {
+                      return [0, 0, 0];
+                  }
+
+                  return feature.geometry.coordinates[0];
+              };
+        this.props.getTargetPosition = this.callback.getTargetPosition
+            ? this.callback.getTargetPosition
+            : function(feature) {
+                  if (!feature) {
+                      return [0, 0, 0];
+                  }
+
+                  return feature.geometry.coordinates[1];
+              };
 
         if (this.callback.getStrokeWidth) {
             this.props.getStrokeWidth = this.callback.getStrokeWidth;
@@ -74414,23 +74417,23 @@ class DeckglLayer_DeckglLayer {
      * @private
      */
     _createHexagonLayer() {
-        this.props.getPosition = this.callback.getPosition ? this.callback.getPosition : function (feature) {
-            if (!feature) {
-                return [0, 0, 0];
-            }
+        this.props.getPosition = this.callback.getPosition
+            ? this.callback.getPosition
+            : function(feature) {
+                  if (!feature) {
+                      return [0, 0, 0];
+                  }
 
-            return feature.geometry.coordinates;
-        };
+                  return feature.geometry.coordinates;
+              };
 
         if (this.callback.getColorValue) {
             this.props.getColorValue = this.callback.getColorValue;
         }
         if (this.callback.getElevationValue) {
             this.props.getElevationValue = this.callback.getElevationValue;
         }
-
         this.layer = new window.DeckGL.HexagonLayer(this.props);
-
     }
 
     _initContainer() {
@@ -74443,9 +74446,9 @@ class DeckglLayer_DeckglLayer {
         let canvas = document.createElement('canvas');
         canvas.id = this.id;
         canvas.style.position = 'absolute';
-        canvas.style.top = 0 + "px";
-        canvas.style.left = 0 + "px";
-        canvas.style.cursor = "";
+        canvas.style.top = 0 + 'px';
+        canvas.style.left = 0 + 'px';
+        canvas.style.cursor = '';
         let map = this.map;
         canvas.width = parseInt(map.getCanvas().style.width);
         canvas.height = parseInt(map.getCanvas().style.height);
@@ -74467,10 +74470,10 @@ class DeckglLayer_DeckglLayer {
         canvas.style.height = map.getCanvas().style.height;
         this._draw();
     }
-
 }
 
 external_mapboxgl_default.a.supermap.DeckglLayer = DeckglLayer_DeckglLayer;
+
 // CONCATENATED MODULE: ./src/mapboxgl/overlay/mapv/MapvDataSet.js
 /* Copyright© 2000 - 2020 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
@@ -78531,11 +78534,56 @@ class WebMap_WebMap extends external_mapboxgl_default.a.Evented {
 				url = mapUrls[layerType];
 				this._createXYZLayer(layerInfo, url);
 				break;
+			case 'MAPBOXSTYLE':
+				this._createMapboxStyle(layerInfo);
+				break;
 			default:
 				break;
 		}
 	}
 
+	/**
+	 * @private
+	 * @function mapboxgl.supermap.WebMap.prototype._createMapboxStyle
+	 * @description 创建 Mapbox 样式。
+	 * @param {Object} mapInfo - map 信息。
+	 */
+	_createMapboxStyle(mapInfo) {
+		let _this = this,
+			{ dataSource = {} } = mapInfo,
+			{ serverId, url } = dataSource,
+			styleUrl;
+		styleUrl = serverId !== undefined ? `${this.server}web/datas/${serverId}/download` : url;
+		FetchRequest.get(styleUrl, null, { 
+			withCredentials: this.withCredentials,
+			withoutFormatSuffix: true,
+			headers: {
+				'Content-Type': 'application/json;chartset=uft-8'
+			}
+		}).then(response => {
+			return response.json();
+		}).then(style => {
+			_this._matchStyleObject(style);
+			_this.map.setStyle(style);
+		})
+	}
+
+	/**
+	 * @private
+	 * @function mapboxgl.supermap.WebMap.prototype._matchStyleObject
+	 * @description 恢复 style 为标准格式。
+	 * @param {Object} style - mapbox 样式。
+	 */
+	_matchStyleObject(style) {
+		let { sprite, glyphs } = style;
+		if (sprite && typeof sprite === 'object'){
+			style.sprite = Object.values(sprite)[0];
+		}
+		if (glyphs && typeof glyphs === 'object'){
+			style.glyphs = Object.values(glyphs)[0];
+		}
+	}
+
 	/**
 	 * @private
 	 * @function mapboxgl.supermap.WebMap.prototype._createTiandituLayer