优化代码

songyumeng · songyumeng · commit 7beb85a50f72 · 2018-09-14T23:46:04.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,16 @@
 
   - `L.supermap.tiledVectorLayer` 新增 `options.processCharacters` 参数,支持本地设置服务端的CartoCSS样式时替换特殊字符
 
+- `SuperMap.QueryParameters` 及其子类新增 `options.returnFeatureWithFieldCaption` 参数,支持指定返回的查询结果要素字段标识为字段别名
+
+### for OpenLayers
+
+- `SuperMap.QueryParameters` 及其子类新增 `options.returnFeatureWithFieldCaption` 参数,支持指定返回的查询结果要素字段标识为字段别名
+
+### for MapboxGL
+
+- `SuperMap.QueryParameters` 及其子类新增 `options.returnFeatureWithFieldCaption` 参数,支持指定返回的查询结果要素字段标识为字段别名
+
 ## Fixed
 
 ### for Leaflet
diff --git a/src/common/overlay/levelRenderer/Area.js b/src/common/overlay/levelRenderer/Area.js
@@ -324,11 +324,7 @@ export class Area {
                     }
 
                     // 捕获判断
-                    if (isOnBase === true && isOnHole === false) {
-                        return true;
-                    } else {
-                        return false;
-                    }
+                   return isOnBase === true && isOnHole === false;
                 } else {
                     return this.isInsidePolygon(area.pointList, icX, icY);
                 }
diff --git a/src/common/overlay/levelRenderer/Env.js b/src/common/overlay/levelRenderer/Env.js
@@ -76,7 +76,8 @@ export class Env {
                 os.version = blackberry[2];
             }
             if (bb10) {
-                os.bb10 = true, os.version = bb10[2];
+                os.bb10 = true;
+                os.version = bb10[2];
             }
             if (rimtabletos) {
                 os.rimtabletos = true;
diff --git a/src/leaflet/overlay/TileVectorLayer.js b/src/leaflet/overlay/TileVectorLayer.js
@@ -300,7 +300,7 @@ export var TileVectorLayer = VectorGrid.extend({
         feature = this._mergeFeatureTextField(feature, style);
 
         //次优先级是layers资源的默认的样式，最低优先级是CartoDefaultStyle的样式
-        if (feature.type === "TEXT") {
+        if (feature.type === "TEXT" ||  style.length === 0) {
             style = this.cartoCSSToLeaflet.getValidStyleFromLayerInfo(feature, layerStyleInfo);
             if (feature.type === "TEXT") {
                 style.textName = "[" + feature.properties.textField + "]";
diff --git a/src/leaflet/overlay/carto/CartoCSSToLeaflet.js b/src/leaflet/overlay/carto/CartoCSSToLeaflet.js
@@ -256,16 +256,18 @@ export class CartoCSSToLeaflet {
             var value = _shader.getValue(attributes, zoom, true);
             if ((value !== null) && prop) {
                 if (prop === "fontSize") {
-                    value = fromServer ? value *= 0.8 : value;
-                    fontSize = value + "px";
-                    style.fontSize = fontSize;
+                 if (fromServer) {
+                     value *= 0.8
+                 }
+                 fontSize = value + "px";
+                 style.fontSize = fontSize;
                 } else if (prop === "fontName") {
                     fontName = value;
                     style.fontName = fontName;
                 } else {
                     if (prop === "globalCompositeOperation") {
                         value = CompOpMap[value];
-                        if (!value || value === "") {
+                        if (!value) {
                             continue;
                         }
                     } else if (fromServer && prop === 'iconUrl') {
@@ -417,7 +419,7 @@ export class CartoCSSToLeaflet {
         }
 
         //处理标签文本的情况
-        if (layerInfo && layerInfo.textField) {
+        if (layerInfo.textField) {
             style.textAlign = "LEFT";
         }
         return style;
diff --git a/src/mapboxgl/overlay/GraphThemeLayer.js b/src/mapboxgl/overlay/GraphThemeLayer.js
@@ -198,7 +198,7 @@ export class Graph extends Theme {
             // 获取地图像素 bounds
             var mapPxLT = this.getLocalXY(new LonLat(mapBounds.left, mapBounds.top));
             var mapPxRB = this.getLocalXY(new LonLat(mapBounds.right, mapBounds.bottom));
-            var mBounds = new Bounds(mapPxLT[0], mapPxRB[1], mapPxRB[0], mapPxLT[1]);
+            //var mBounds = new Bounds(mapPxLT[0], mapPxRB[1], mapPxRB[0], mapPxLT[1]);
             // 压盖处理 & 添加图形
             for (let i = 0, len = charts.length; i < len; i++) {
                 var chart = charts[i];

Original file line number	Diff line number	Diff line change
`@@ -324,11 +324,7 @@ export class Area {`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`// 捕获判断`
`327`		`- if (isOnBase === true && isOnHole === false) {`
`328`		`- return true;`
`329`		`- } else {`
`330`		`- return false;`
`331`		`- }`
	`327`	`+ return isOnBase === true && isOnHole === false;`
`332`	`328`	`} else {`
`333`	`329`	`return this.isInsidePolygon(area.pointList, icX, icY);`
`334`	`330`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ export class Env {`
`76`	`76`	`os.version = blackberry[2];`
`77`	`77`	`}`
`78`	`78`	`if (bb10) {`
`79`		`- os.bb10 = true, os.version = bb10[2];`
	`79`	`+ os.bb10 = true;`
	`80`	`+ os.version = bb10[2];`
`80`	`81`	`}`
`81`	`82`	`if (rimtabletos) {`
`82`	`83`	`os.rimtabletos = true;`