【bug】1) 修复等级符号，修改为符号样式，半径大小没有根据等级的大小变化

Yuki-Zhao · Yuki-Zhao · commit 3d5d4b6bc020 · 2019-05-21T09:33:03.000+08:00
2）图层加载失败，给出错误提示

（reviewed by yuzy）
diff --git a/src/openlayers/core/StyleUtils.js b/src/openlayers/core/StyleUtils.js
@@ -980,14 +980,15 @@ export class StyleUtils {
      * @function ol.supermap.StyleUtils.getOpenlayerStyle 获取专题图对应的openlayers格式的style
      * @param styleParams {String} 样式参数
      * @param featureType {String} feature类型
+     * @param isRank {Boolean} 是否为等级符号
      * @returns {Object} style对象
      */
-    static getOpenlayersStyle(styleParams, featureType) {
+    static getOpenlayersStyle(styleParams, featureType, isRank) {
         let style;
         if(styleParams.type === "BASIC_POINT") {
             style = this.toOpenLayersStyle(styleParams, featureType);
         } else if(styleParams.type === "SYMBOL_POINT") {
-            style = this.getSymbolStyle(styleParams);
+            style = this.getSymbolStyle(styleParams, isRank);
         } else if(styleParams.type === "SVG_POINT"){
             style = this.getSVGStyle(styleParams);
         } else if (styleParams.type === 'IMAGE_POINT') {
@@ -1001,7 +1002,7 @@ export class StyleUtils {
      * @param {object} parameters - 样式参数
      * @returns {Object} style对象
      */
-    static getSymbolStyle(parameters) {
+    static getSymbolStyle(parameters, isRank) {
         let text = '';
         if (parameters.unicode) {
             text = String.fromCharCode(parseInt(parameters.unicode.replace(/^&#x/, ''), 16));
@@ -1013,10 +1014,12 @@ export class StyleUtils {
         let strokeColor = StyleUtils.hexToRgb(parameters.strokeColor);
         strokeColor.push(parameters.strokeOpacity);
 
+        let fontSize = isRank ? 2 * parameters.radius + "px" : parameters.fontSize;  
+
         return new ol.style.Style({
             text: new ol.style.Text({
                 text: text,
-                font: parameters.fontSize + " " + "supermapol-icons",
+                font: fontSize + " supermapol-icons",
                 placement: 'point',
                 textAlign: 'center',
                 fill: new ol.style.Fill({
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -991,6 +991,10 @@ export class WebMap extends ol.Observable {
                                 that.sendMapToUser(len);
                                 that.errorCallback && that.errorCallback(null, 'getLayerFaild', that.map);
                             }
+                        }).catch(function(error){
+                            that.layerAdded++;
+                            that.sendMapToUser(len);
+                            that.errorCallback && that.errorCallback(error, 'getLayerFaild', that.map);
                         })
                     }
                 } else if (layer.layerType === 'SUPERMAP_REST' || 
@@ -2433,7 +2437,7 @@ export class WebMap extends ol.Observable {
                 radius = customSettings[i] && customSettings[i].radius ? customSettings[i].radius : radius;
                 // 转化成 ol 样式
                 style.radius = radius;
-                let olStyle = StyleUtils.getOpenlayersStyle(style, featureType);
+                let olStyle = StyleUtils.getOpenlayersStyle(style, featureType, true);
                 styleGroup.push({ olStyle: olStyle, radius, start, end });
             }
             return styleGroup;

Original file line number	Diff line number	Diff line change
`@@ -991,6 +991,10 @@ export class WebMap extends ol.Observable {`
`991`	`991`	`that.sendMapToUser(len);`
`992`	`992`	`that.errorCallback && that.errorCallback(null, 'getLayerFaild', that.map);`
`993`	`993`	`}`
	`994`	`+ }).catch(function(error){`
	`995`	`+ that.layerAdded++;`
	`996`	`+ that.sendMapToUser(len);`
	`997`	`+ that.errorCallback && that.errorCallback(error, 'getLayerFaild', that.map);`
`994`	`998`	`})`
`995`	`999`	`}`
`996`	`1000`	`} else if (layer.layerType === 'SUPERMAP_REST' \|\|`
`@@ -2433,7 +2437,7 @@ export class WebMap extends ol.Observable {`
`2433`	`2437`	`radius = customSettings[i] && customSettings[i].radius ? customSettings[i].radius : radius;`
`2434`	`2438`	`// 转化成 ol 样式`
`2435`	`2439`	`style.radius = radius;`
`2436`		`- let olStyle = StyleUtils.getOpenlayersStyle(style, featureType);`
	`2440`	`+ let olStyle = StyleUtils.getOpenlayersStyle(style, featureType, true);`
`2437`	`2441`	`styleGroup.push({ olStyle: olStyle, radius, start, end });`
`2438`	`2442`	`}`
`2439`	`2443`	`return styleGroup;`