Skip to content

Commit a95abe2

Browse files
luoxiao-supermapluoxiao-supermap
committed
[fix]修复异味
1 parent 5675db0 commit a95abe2

File tree

2 files changed

+29
-33
lines changed

2 files changed

+29
-33
lines changed

‎src/mapboxgl/mapping/WebMap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,7 @@ export class WebMap extends mapboxgl.Evented {
15061506
const properties = feature.properties;
15071507
const conditions = parseCondition(condition, Object.keys(properties));
15081508
const filterFeature = parseConditionFeature(properties);
1509-
const sql = 'select * from json where (' + conditions + ')';
1509+
const sql = `select * from json where (${conditions})`;
15101510
filterResult = window.jsonsql.query(sql, { attr: filterFeature });
15111511
} catch (err) {
15121512
//必须把要过滤得内容封装成一个对象,主要是处理jsonsql(line : 62)中由于with语句遍历对象造成的问题

‎src/openlayers/mapping/WebMap.js

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,8 +1927,8 @@ export class WebMap extends Observable {
19271927
fileterAttrs.push(value);
19281928
}
19291929
}
1930-
that.getFeatures(fileterAttrs, layer, async function (features) {
1931-
await that.addLayer(layer, features, layerIndex);
1930+
that.getFeatures(fileterAttrs, layer, async function (params) {
1931+
await that.addLayer(layer, params, layerIndex);
19321932
that.layerAdded++;
19331933
that.sendMapToUser(len);
19341934
}, function (e) {
@@ -2029,8 +2029,7 @@ export class WebMap extends Observable {
20292029
let that = this;
20302030
let isMapService = info ? !info.isMvt : layer.layerType === 'HOSTED_TILE',
20312031
isAdded = false;
2032-
for (let i = 0; i < dataItemServices.length; i++) {
2033-
const service = dataItemServices[i];
2032+
for (const service of dataItemServices) {
20342033
if (isAdded) {
20352034
return;
20362035
}
@@ -2074,8 +2073,6 @@ export class WebMap extends Observable {
20742073
that.sendMapToUser(len);
20752074

20762075
} else {
2077-
//数据服务
2078-
isAdded = true;
20792076
//关系型文件发布的数据服务
20802077
that.getDatasources(service.address).then(function (datasourceName) {
20812078
layer.dataSource.dataSourceName = datasourceName + ":" + datasetName;
@@ -2702,7 +2699,7 @@ export class WebMap extends Observable {
27022699
});
27032700
};
27042701
let featureType = layerInfo.featureType;
2705-
let style = await StyleUtils.toOpenLayersStyle(this.getDataVectorTileStyle(featureType), featureType);
2702+
const style = await StyleUtils.toOpenLayersStyle(this.getDataVectorTileStyle(featureType), featureType);
27062703
return new olLayer.VectorTile({
27072704
//设置避让参数
27082705
source: new VectorTileSuperMapRest({
@@ -2758,7 +2755,7 @@ export class WebMap extends Observable {
27582755
const properties = feature.get('attributes');
27592756
const conditions = parseCondition(condition, Object.keys(properties));
27602757
const filterFeature = parseConditionFeature(properties);
2761-
const sql = 'select * from json where (' + conditions + ')';
2758+
const sql = `select * from json where (${conditions})`;
27622759
filterResult = window.jsonsql.query(sql, { attributes: filterFeature });
27632760
} catch (err) {
27642761
//必须把要过滤得内容封装成一个对象,主要是处理jsonsql(line : 62)中由于with语句遍历对象造成的问题
@@ -2831,9 +2828,9 @@ export class WebMap extends Observable {
28312828
* @return {Array} 大数据图层要素数组
28322829
*/
28332830
async getGraphicsFromFeatures(features, style, featureType) {
2834-
let olStyle = await StyleUtils.getOpenlayersStyle(style, featureType),
2831+
const olStyle = await StyleUtils.getOpenlayersStyle(style, featureType),
28352832
shape = olStyle.getImage();
2836-
let graphics = [];
2833+
const graphics = [];
28372834
//构建graphic
28382835
for (let i in features) {
28392836
let graphic = new OverlayGraphic(features[i].getGeometry());
@@ -3089,7 +3086,7 @@ export class WebMap extends Observable {
30893086
* @param {Array} features - 所有feature结合
30903087
*/
30913088
async createUniqueLayer(layerInfo, features) {
3092-
let styleSource = await this.createUniqueSource(layerInfo, features);
3089+
const styleSource = await this.createUniqueSource(layerInfo, features);
30933090
let layer = new olLayer.Vector({
30943091
styleSource: styleSource,
30953092
source: new Vector({
@@ -3120,7 +3117,7 @@ export class WebMap extends Observable {
31203117
*/
31213118
async createUniqueSource(parameters, features) {
31223119
//找到合适的专题字段
3123-
let styleGroup = await this.getUniqueStyleGroup(parameters, features);
3120+
const styleGroup = await this.getUniqueStyleGroup(parameters, features);
31243121
return {
31253122
map: this.map, //必传参数 API居然不提示
31263123
style: parameters.style,
@@ -3224,7 +3221,7 @@ export class WebMap extends Observable {
32243221
*/
32253222
async createRangeLayer(layerInfo, features) {
32263223
//这里获取styleGroup要用所以的feature
3227-
let styleSource = await this.createRangeSource(layerInfo, features);
3224+
const styleSource = await this.createRangeSource(layerInfo, features);
32283225
let layer = new olLayer.Vector({
32293226
styleSource: styleSource,
32303227
source: new Vector({
@@ -3266,7 +3263,7 @@ export class WebMap extends Observable {
32663263
*/
32673264
async createRangeSource(parameters, features) {
32683265
//找到合适的专题字段
3269-
let styleGroup = await this.getRangeStyleGroup(parameters, features);
3266+
const styleGroup = await this.getRangeStyleGroup(parameters, features);
32703267
if (styleGroup) {
32713268
return {
32723269
style: parameters.style,
@@ -3378,7 +3375,7 @@ export class WebMap extends Observable {
33783375
}
33793376

33803377
// 转化成 ol 样式
3381-
let olStyle = await StyleUtils.toOpenLayersStyle(style, featureType);
3378+
const olStyle = await StyleUtils.toOpenLayersStyle(style, featureType);
33823379

33833380
let start = segements[i];
33843381
let end = segements[i + 1];
@@ -3423,9 +3420,9 @@ export class WebMap extends Observable {
34233420
* @returns {ol.layer.Vector} 数据流图层
34243421
*/
34253422
async createDataflowLayer(layerInfo, layerIndex) {
3426-
let layerStyle = layerInfo.pointStyle, style;
3423+
let layerStyle = layerInfo.pointStyle;
34273424
//获取样式
3428-
style = await StyleUtils.getOpenlayersStyle(layerStyle, layerInfo.featureType);
3425+
const style = await StyleUtils.getOpenlayersStyle(layerStyle, layerInfo.featureType);
34293426

34303427
let source = new Vector({
34313428
wrapX: false
@@ -3465,8 +3462,8 @@ export class WebMap extends Observable {
34653462
const properties = feature.get('attributes');
34663463
const conditions = parseCondition(condition, Object.keys(properties));
34673464
const filterFeature = parseConditionFeature(properties);
3468-
const sql = 'select * from json where (' + conditions + ')';
3469-
let filterResult = window.jsonsql.query(sql, { attributes: filterFeature });
3465+
const sql = `select * from json where (${conditions})`;
3466+
const filterResult = window.jsonsql.query(sql, { attributes: filterFeature });
34703467
if (filterResult && filterResult.length > 0) {
34713468
that.addDataflowFeature(feature, layerInfo.identifyField, {
34723469
dataflowSource: source,
@@ -3616,8 +3613,8 @@ export class WebMap extends Observable {
36163613
const properties = feature.get('attributes');
36173614
const conditions = parseCondition(condition, Object.keys(properties));
36183615
const filterFeature = parseConditionFeature(properties);
3619-
const sql = 'select * from json where (' + conditions + ')';
3620-
let filterResult = window.jsonsql.query(sql, { attributes: filterFeature });
3616+
const sql = `select * from json where (${conditions})`;
3617+
const filterResult = window.jsonsql.query(sql, { attributes: filterFeature });
36213618
if (filterResult && filterResult.length > 0) {
36223619
that.addDataflowFeature(feature, layerInfo.identifyField, {
36233620
dataflowSource: source,
@@ -3696,8 +3693,7 @@ export class WebMap extends Observable {
36963693
async setEachFeatureDefaultStyle(features) {
36973694
let that = this;
36983695
features = (Util.isArray(features) || features instanceof Collection) ? features : [features];
3699-
for(let i = 0; i < features.length; i++) {
3700-
const feature = features[i];
3696+
for (const feature of features) {
37013697
let geomType = feature.getGeometry().getType().toUpperCase();
37023698
// let styleType = geomType === "POINT" ? 'MARKER' : geomType;
37033699
let defaultStyle = feature.getProperties().useStyle;
@@ -3760,7 +3756,7 @@ export class WebMap extends Observable {
37603756
* @returns {ol.layer.Vector} 矢量图层
37613757
*/
37623758
async createRankSymbolLayer(layerInfo, features) {
3763-
let styleSource = await this.createRankStyleSource(layerInfo, features, layerInfo.featureType);
3759+
const styleSource = await this.createRankStyleSource(layerInfo, features, layerInfo.featureType);
37643760
let layer = new olLayer.Vector({
37653761
styleSource,
37663762
source: new Vector({
@@ -3770,10 +3766,10 @@ export class WebMap extends Observable {
37703766
renderMode: 'image'
37713767
});
37723768
layer.setStyle(feature => {
3773-
let styleSource = layer.get('styleSource');
3774-
let themeField = styleSource.parameters.themeSetting.themeField;
3775-
let value = Number(feature.get('attributes')[themeField]);
3776-
let styleGroups = styleSource.styleGroups;
3769+
const styleSource = layer.get('styleSource');
3770+
const themeField = styleSource.parameters.themeSetting.themeField;
3771+
const value = Number(feature.get('attributes')[themeField]);
3772+
const styleGroups = styleSource.styleGroups;
37773773
for (let i = 0, len = styleGroups.length; i < len; i++) {
37783774
if (value >= styleGroups[i].start && value < styleGroups[i].end) {
37793775
return styleSource.styleGroups[i].olStyle;
@@ -3792,9 +3788,9 @@ export class WebMap extends Observable {
37923788
* @returns {Object} styleGroups
37933789
*/
37943790
async createRankStyleSource(parameters, features, featureType) {
3795-
let themeSetting = parameters.themeSetting,
3796-
themeField = themeSetting.themeField;
3797-
let styleGroups = await this.getRankStyleGroup(themeField, features, parameters, featureType);
3791+
const themeSetting = parameters.themeSetting;
3792+
const themeField = themeSetting.themeField;
3793+
const styleGroups = await this.getRankStyleGroup(themeField, features, parameters, featureType);
37983794
return styleGroups ? {parameters, styleGroups} : false
37993795
}
38003796
/**
@@ -3865,7 +3861,7 @@ export class WebMap extends Observable {
38653861
// 转化成 ol 样式
38663862
style.radius = radius;
38673863
style.fillColor = customSettings[j] && customSettings[j].color ? customSettings[j].color : rangeColors[j] || fillColor;
3868-
let olStyle = await StyleUtils.getOpenlayersStyle(style, featureType, true);
3864+
const olStyle = await StyleUtils.getOpenlayersStyle(style, featureType, true);
38693865
styleGroup.push({olStyle: olStyle, radius, start, end, fillColor: style.fillColor});
38703866
}
38713867
return styleGroup;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy