【feature】对接serverId的mapboxstyle样式，UT待测试

ChenGuanglin · ChenGuanglin · commit d87b7bb2e137 · 2020-02-10T17:53:41.000+08:00
diff --git a/src/mapboxgl/mapping/WebMap.js b/src/mapboxgl/mapping/WebMap.js
@@ -344,11 +344,56 @@ export class WebMap extends mapboxgl.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
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -3378,20 +3378,31 @@ export class WebMap extends Observable {
      * @param {object} mapInfo - 地图信息
      */
     getMBStyle(mapInfo) {
-        let baseLayer = mapInfo.baseLayer,
-            url = baseLayer.dataSource.url,
-            layerInfo = {};
-        return FetchRequest.get(this.getRequestUrl(url)).then(result => {
+        let _this = this,
+            baseLayer = mapInfo.baseLayer,
+            dataSource = baseLayer.dataSource || {},
+            { url, serverId } = dataSource,
+            layerInfo = {},
+            styleUrl;
+        styleUrl = serverId !== undefined ? `${this.server}web/datas/${serverId}/download` : url;
+        return FetchRequest.get(this.getRequestUrl(styleUrl), null, {
+            withCredentials: this.withCredentials,
+            withoutFormatSuffix: true,
+			headers: {
+				'Content-Type': 'application/json;chartset=uft-8'
+			}
+        }).then(result => {
             return result.json();
         }).then(styles => {
+            _this._matchStyleObject(styles);
             let extent = styles.metadata.mapbounds;
             baseLayer.extent = extent; // 这里把extent保存一下
 
             layerInfo.projection = mapInfo.projection,
             layerInfo.epsgCode = mapInfo.projection,
             layerInfo.visible = baseLayer.visible,
             layerInfo.name = baseLayer.name,
-            layerInfo.url = url,
+            layerInfo.url = styleUrl,
             layerInfo.sourceType = 'VECTOR_TILE',
             layerInfo.layerType = 'VECTOR_TILE',
             layerInfo.styles = styles,
@@ -3408,6 +3419,23 @@ export class WebMap extends Observable {
         })
     }
 
+    /**
+	 * @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 ol.supermap.WebMap.prototype.createMVTLayer
