Skip to content

Commit 7f535b8

Browse files
songyumengsongyumeng
committed
fix sonar
1 parent aa061ed commit 7f535b8

File tree

11 files changed

+1440
-1458
lines changed

11 files changed

+1440
-1458
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 1315 additions & 1303 deletions
Large diffs are not rendered by default.

‎dist/iclient9-leaflet.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/iclient9-mapboxgl.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2486,8 +2486,7 @@ var GeoJSON = function (_JSONFormat) {
24862486
}, {
24872487
key: 'toGeoPoint',
24882488
value: function toGeoPoint(geometry) {
2489-
var me = this,
2490-
geoPoints = geometry.points || [],
2489+
var geoPoints = geometry.points || [],
24912490
geoParts = geometry.parts || [geoPoints.length],
24922491
len = geoParts.length;
24932492
if (len < 1) {
@@ -2530,12 +2529,12 @@ var GeoJSON = function (_JSONFormat) {
25302529
}
25312530
return { type: "LineString", components: pointList };
25322531
} else {
2533-
for (var i = 0, lineList = []; i < len; i++) {
2534-
for (var j = 0, pointList = []; j < geoParts[i]; j++) {
2535-
pointList.push({ x: parseFloat(geoPoints[j].x), y: parseFloat(geoPoints[j].y) });
2532+
for (var k = 0, lineList = []; k < len; k++) {
2533+
for (var j = 0, pointArr = []; j < geoParts[k]; j++) {
2534+
pointArr.push({ x: parseFloat(geoPoints[j].x), y: parseFloat(geoPoints[j].y) });
25362535
}
2537-
lineList.push(pointList);
2538-
geoPoints.splice(0, geoParts[i]);
2536+
lineList.push(pointArr);
2537+
geoPoints.splice(0, geoParts[k]);
25392538
}
25402539
return { type: "MultiLineString", components: lineList };
25412540
}
@@ -9793,7 +9792,7 @@ var Bar3D = function (_Graph) {
97939792
}
97949793

97959794
// 获取 x 轴上的图形信息
9796-
var xShapeInfo = this.calculateXShapeInfo(dvb, sets, "Bar3D", fv.length);
9795+
var xShapeInfo = this.calculateXShapeInfo();
97979796
if (!xShapeInfo) return;
97989797
// 每个柱条 x 位置
97999798
var xsLoc = xShapeInfo.xPositions;

‎dist/iclient9-mapboxgl.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/iclient9-openlayers.js‎

Lines changed: 36 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2409,8 +2409,7 @@ var GeoJSON = function (_JSONFormat) {
24092409
}, {
24102410
key: 'toGeoPoint',
24112411
value: function toGeoPoint(geometry) {
2412-
var me = this,
2413-
geoPoints = geometry.points || [],
2412+
var geoPoints = geometry.points || [],
24142413
geoParts = geometry.parts || [geoPoints.length],
24152414
len = geoParts.length;
24162415
if (len < 1) {
@@ -2453,12 +2452,12 @@ var GeoJSON = function (_JSONFormat) {
24532452
}
24542453
return { type: "LineString", components: pointList };
24552454
} else {
2456-
for (var i = 0, lineList = []; i < len; i++) {
2457-
for (var j = 0, pointList = []; j < geoParts[i]; j++) {
2458-
pointList.push({ x: parseFloat(geoPoints[j].x), y: parseFloat(geoPoints[j].y) });
2455+
for (var k = 0, lineList = []; k < len; k++) {
2456+
for (var j = 0, pointArr = []; j < geoParts[k]; j++) {
2457+
pointArr.push({ x: parseFloat(geoPoints[j].x), y: parseFloat(geoPoints[j].y) });
24592458
}
2460-
lineList.push(pointList);
2461-
geoPoints.splice(0, geoParts[i]);
2459+
lineList.push(pointArr);
2460+
geoPoints.splice(0, geoParts[k]);
24622461
}
24632462
return { type: "MultiLineString", components: lineList };
24642463
}
@@ -6642,8 +6641,6 @@ var ThemeVector = function (_ThemeFeature) {
66426641
for (var i = 0; i < components.length; i++) {
66436642
var components_i = components[i];
66446643
refLocal = [];
6645-
localLX = [];
6646-
66476644
localLX = this.getLocalXY(components_i);
66486645

66496646
refLocal[0] = localLX[0] - location[0];
@@ -6729,8 +6726,6 @@ var ThemeVector = function (_ThemeFeature) {
67296726
for (var i = 0; i < components.length; i++) {
67306727
var components_i = components[i];
67316728
refLocal = [];
6732-
localLX = [];
6733-
67346729
localLX = this.getLocalXY(components_i);
67356730

67366731
refLocal[0] = localLX[0] - location[0];
@@ -6900,8 +6895,6 @@ var ThemeVector = function (_ThemeFeature) {
69006895

69016896
for (var j = 0; j < components_i.length; j++) {
69026897
refLocal = [];
6903-
localLX = [];
6904-
69056898
localLX = this.getLocalXY(components_i[j]);
69066899

69076900
refLocal[0] = localLX[0] - location[0];
@@ -6920,19 +6913,17 @@ var ThemeVector = function (_ThemeFeature) {
69206913
// 其它 component 作为岛洞
69216914
holePolygonPointList = [];
69226915

6923-
for (var j = 0; j < components_i.length; j++) {
6916+
for (var k = 0; k < components_i.length; k++) {
69246917
refLocal = [];
6925-
localLX = [];
6926-
6927-
localLX = this.getLocalXY(components_i[j]);
6918+
localLX = this.getLocalXY(components_i[k]);
69286919

69296920
refLocal[0] = localLX[0] - location[0];
69306921
refLocal[1] = localLX[1] - location[1];
69316922

69326923
//抽稀 - 2 px
69336924
if (holePolygonPointList.length > 0) {
6934-
var lastLocalXY = holePolygonPointList[holePolygonPointList.length - 1];
6935-
if (Math.abs(lastLocalXY[0] - refLocal[0]) <= nCPx && Math.abs(lastLocalXY[1] - refLocal[1]) <= nCPx) continue;
6925+
var lastXY = holePolygonPointList[holePolygonPointList.length - 1];
6926+
if (Math.abs(lastXY[0] - refLocal[0]) <= nCPx && Math.abs(lastXY[1] - refLocal[1]) <= nCPx) continue;
69366927
}
69376928

69386929
//使用参考点
@@ -6952,7 +6943,7 @@ var ThemeVector = function (_ThemeFeature) {
69526943
}
69536944

69546945
//赋 style
6955-
var style = new Object();
6946+
var style = {};
69566947
style = _SuperMap2.default.Util.copyAttributesWithClip(style, this.style, ['pointList']);
69576948
style.pointList = pointList;
69586949

@@ -15173,16 +15164,15 @@ var WebMap = function (_ol$Observable) {
1517315164
}
1517415165
var layerQueue = [];
1517515166
for (var i = 0; i < layersJson.length; i++) {
15176-
var layerInfo = layersJson[i];
15177-
layerInfo["_originIndex"] = i;
15178-
var layerType = layerInfo.layerType = layerInfo.layerType || "BASE_LAYER";
15179-
var type = layerInfo.type;
15180-
if (layerType !== "BASE_LAYER") {
15167+
var layerJson = layersJson[i];
15168+
layerJson["_originIndex"] = i;
15169+
var layerJsonType = layerJson.layerType = layerJson.layerType || "BASE_LAYER";
15170+
if (layerJsonType !== "BASE_LAYER") {
1518115171
//如果图层不是底图，则先加到图层队列里面等待底图完成后再处理
15182-
layerQueue.unshift(layerInfo);
15172+
layerQueue.unshift(layerJson);
1518315173
continue;
1518415174
} else {
15185-
this.createLayer(type, layerInfo);
15175+
this.createLayer(layerJson.type, layerJson);
1518615176
}
1518715177
}
1518815178
//底图加载完成后开始处理图层队列里的图层
@@ -15471,22 +15461,14 @@ var WebMap = function (_ol$Observable) {
1547115461
}, {
1547215462
key: 'createMarkersLayer',
1547315463
value: function createMarkersLayer(layerInfo) {
15474-
var markers = layerInfo.markers || [],
15475-
style = layerInfo.style,
15476-
opacity = layerInfo.opacity,
15477-
marker,
15478-
point,
15479-
size,
15480-
offset,
15481-
icon,
15482-
that = this;
15464+
var markers = layerInfo.markers || [];
1548315465
//todo offset
1548415466
var layer = new _olDebug2.default.layer.Vector({
1548515467
style: function style(feature) {
1548615468
return _StyleUtils2.default.getStyleFromiPortalMarker(feature.getProperties().icon);
1548715469
},
1548815470
source: new _olDebug2.default.source.Vector({
15489-
features: new _olDebug2.default.format.GeoJSON().readFeatures(_olDebug2.default.supermap.Util.toGeoJSON(layerInfo.markers)),
15471+
features: new _olDebug2.default.format.GeoJSON().readFeatures(_olDebug2.default.supermap.Util.toGeoJSON(markers)),
1549015472
wrapX: false
1549115473
})
1549215474
});
@@ -15504,9 +15486,9 @@ var WebMap = function (_ol$Observable) {
1550415486
}, {
1550515487
key: 'createVectorLayer',
1550615488
value: function createVectorLayer(layerInfo) {
15507-
var _style = layerInfo.style,
15508-
opacity = layerInfo.opacity,
15509-
isVisible = layerInfo.isVisible;
15489+
var _style = layerInfo.style;
15490+
//opacity = layerInfo.opacity,
15491+
//isVisible = layerInfo.isVisible;
1551015492
//todo readonly = layerInfo.readonly;
1551115493
if (!layerInfo.url) {
1551215494
var layer = new _olDebug2.default.layer.Vector({
@@ -15526,6 +15508,18 @@ var WebMap = function (_ol$Observable) {
1552615508
datasets = layerInfo.features;
1552715509
_style = layerInfo.style;
1552815510
var me = this;
15511+
var fun = function fun(serviceResult) {
15512+
var layer = new _olDebug2.default.layer.Vector({
15513+
style: function style(feature) {
15514+
return _StyleUtils2.default.getStyleFromiPortalStyle(_style, feature.getGeometry().getType(), feature.getProperties().style);
15515+
},
15516+
source: new _olDebug2.default.source.Vector({
15517+
features: new _olDebug2.default.format.GeoJSON().readFeatures(serviceResult.element.result),
15518+
wrapX: false
15519+
})
15520+
});
15521+
me.map.addLayer(layer);
15522+
};
1552915523
for (var setNameIndex = 0; setNameIndex < datasets.length; setNameIndex++) {
1553015524
var dataset = datasets[setNameIndex];
1553115525
if (dataset.visible) {
@@ -15536,18 +15530,7 @@ var WebMap = function (_ol$Observable) {
1553615530
},
1553715531
datasetNames: [datasourceName + ":" + dataset.name]
1553815532
});
15539-
new _olDebug2.default.supermap.GetFeaturesService(url).getFeaturesBySQL(sqlParam).on("complete", function (serviceResult) {
15540-
var layer = new _olDebug2.default.layer.Vector({
15541-
style: function style(feature) {
15542-
return _StyleUtils2.default.getStyleFromiPortalStyle(_style, feature.getGeometry().getType(), feature.getProperties().style);
15543-
},
15544-
source: new _olDebug2.default.source.Vector({
15545-
features: new _olDebug2.default.format.GeoJSON().readFeatures(serviceResult.element.result),
15546-
wrapX: false
15547-
})
15548-
});
15549-
me.map.addLayer(layer);
15550-
});
15533+
new _olDebug2.default.supermap.GetFeaturesService(url).getFeaturesBySQL(sqlParam).on("complete", fun);
1555115534
}
1555215535
}
1555315536
}
@@ -23486,7 +23469,7 @@ var Bar3D = function (_Graph) {
2348623469
}
2348723470

2348823471
// 获取 x 轴上的图形信息
23489-
var xShapeInfo = this.calculateXShapeInfo(dvb, sets, "Bar3D", fv.length);
23472+
var xShapeInfo = this.calculateXShapeInfo();
2349023473
if (!xShapeInfo) return;
2349123474
// 每个柱条 x 位置
2349223475
var xsLoc = xShapeInfo.xPositions;

‎dist/iclient9-openlayers.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/common/format/GeoJSON.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -664,8 +664,7 @@ export default class GeoJSON extends JSONFormat {
664664
* @description 将服务端的点几何对象转换为几何对象
665665
*/
666666
toGeoPoint(geometry) {
667-
var me = this,
668-
geoPoints = geometry.points || [],
667+
var geoPoints = geometry.points || [],
669668
geoParts = geometry.parts || [geoPoints.length],
670669
len = geoParts.length;
671670
if (len < 1) {
@@ -707,12 +706,12 @@ export default class GeoJSON extends JSONFormat {
707706
}
708707
return {type: "LineString", components: pointList};
709708
} else {
710-
for (var i = 0, lineList = []; i < len; i++) {
711-
for (var j = 0, pointList = []; j < geoParts[i]; j++) {
712-
pointList.push({x: parseFloat(geoPoints[j].x), y: parseFloat(geoPoints[j].y)});
709+
for (var k = 0, lineList = []; k < len; k++) {
710+
for (var j = 0, pointArr = []; j < geoParts[k]; j++) {
711+
pointArr.push({x: parseFloat(geoPoints[j].x), y: parseFloat(geoPoints[j].y)});
713712
}
714-
lineList.push(pointList);
715-
geoPoints.splice(0, geoParts[i]);
713+
lineList.push(pointArr);
714+
geoPoints.splice(0, geoParts[k]);
716715
}
717716
return {type: "MultiLineString", components: lineList};
718717
}

‎src/common/iServer/Bar3D.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ export default class Bar3D extends Graph {
232232
}
233233

234234
// 获取 x 轴上的图形信息
235-
var xShapeInfo = this.calculateXShapeInfo(dvb, sets, "Bar3D", fv.length);
235+
var xShapeInfo = this.calculateXShapeInfo();
236236
if (!xShapeInfo) return;
237237
// 每个柱条 x 位置
238238
var xsLoc = xShapeInfo.xPositions;

‎src/common/iServer/ThemeVector.js‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,6 @@ export default class ThemeVector extends ThemeFeature {
181181
for (var i = 0; i < components.length; i++) {
182182
var components_i = components[i];
183183
refLocal = [];
184-
localLX = [];
185-
186184
localLX = this.getLocalXY(components_i);
187185

188186
refLocal[0] = localLX[0] - location[0];
@@ -267,8 +265,6 @@ export default class ThemeVector extends ThemeFeature {
267265
for (var i = 0; i < components.length; i++) {
268266
var components_i = components[i];
269267
refLocal = [];
270-
localLX = [];
271-
272268
localLX = this.getLocalXY(components_i);
273269

274270
refLocal[0] = localLX[0] - location[0];
@@ -431,8 +427,6 @@ export default class ThemeVector extends ThemeFeature {
431427

432428
for (var j = 0; j < components_i.length; j++) {
433429
refLocal = [];
434-
localLX = [];
435-
436430
localLX = this.getLocalXY(components_i[j]);
437431

438432
refLocal[0] = localLX[0] - location[0];
@@ -452,19 +446,17 @@ export default class ThemeVector extends ThemeFeature {
452446
// 其它 component 作为岛洞
453447
holePolygonPointList = [];
454448

455-
for (var j = 0; j < components_i.length; j++) {
449+
for (var k = 0; k < components_i.length; k++) {
456450
refLocal = [];
457-
localLX = [];
458-
459-
localLX = this.getLocalXY(components_i[j]);
451+
localLX = this.getLocalXY(components_i[k]);
460452

461453
refLocal[0] = localLX[0] - location[0];
462454
refLocal[1] = localLX[1] - location[1];
463455

464456
//抽稀 - 2 px
465457
if (holePolygonPointList.length > 0) {
466-
var lastLocalXY = holePolygonPointList[holePolygonPointList.length - 1];
467-
if ((Math.abs(lastLocalXY[0] - refLocal[0]) <= nCPx) && (Math.abs(lastLocalXY[1] - refLocal[1]) <= nCPx)) continue;
458+
var lastXY = holePolygonPointList[holePolygonPointList.length - 1];
459+
if ((Math.abs(lastXY[0] - refLocal[0]) <= nCPx) && (Math.abs(lastXY[1] - refLocal[1]) <= nCPx)) continue;
468460
}
469461

470462
//使用参考点
@@ -484,7 +476,7 @@ export default class ThemeVector extends ThemeFeature {
484476
}
485477

486478
//赋 style
487-
var style = new Object();
479+
var style = {};
488480
style = SuperMap.Util.copyAttributesWithClip(style, this.style, ['pointList']);
489481
style.pointList = pointList;
490482

0 commit comments

Comments
 (0)