Skip to content

Commit 5b8b699

Browse files
zhurczhurc
committed
fix sonar block
1 parent 3d3a353 commit 5b8b699

File tree

15 files changed

+206
-170
lines changed

15 files changed

+206
-170
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 51 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3643,6 +3643,7 @@ SuperMap.Feature.Theme.Graph = SuperMap.Class(SuperMap.Feature.Theme, {
36433643
* PS: (目前用于二维柱状图渐变色 所以子类实现此方法)
36443644
*/
36453645
resetLinearGradient: function () {
3646+
//子类实现此方法
36463647
},
36473648

36483649
/**
@@ -3673,6 +3674,8 @@ SuperMap.Feature.Theme.Graph = SuperMap.Class(SuperMap.Feature.Theme, {
36733674
case "y":
36743675
style[sty] -= shapeROP[1];
36753676
break;
3677+
default:
3678+
break;
36763679
}
36773680
}
36783681
}
@@ -3737,6 +3740,7 @@ SuperMap.Feature.Theme.Graph = SuperMap.Class(SuperMap.Feature.Theme, {
37373740
*
37383741
*/
37393742
assembleShapes: function () {
3743+
//子类必须实现此方法
37403744
},
37413745

37423746
//地理坐标转为像素坐标。
@@ -4813,8 +4817,8 @@ SuperMap.REST.GetFeaturesServiceBase = SuperMap.Class(SuperMap.ServiceBase, {
48134817
me.url += "returnContent=" + me.returnContent;
48144818
firstPara = false;
48154819
}
4816-
if (me.fromIndex != null &&
4817-
me.toIndex != null && !isNaN(me.fromIndex) && !isNaN(me.toIndex) && me.fromIndex >= 0 && me.toIndex >= 0 && !firstPara) {
4820+
var isValidNumber = me.fromIndex != null && me.toIndex != null && !isNaN(me.fromIndex) && !isNaN(me.toIndex);
4821+
if (isValidNumber && me.fromIndex >= 0 && me.toIndex >= 0 && !firstPara) {
48184822
me.url += "&fromIndex=" + me.fromIndex + "&toIndex=" + me.toIndex;
48194823
}
48204824

@@ -11460,10 +11464,12 @@ var ThemeLayer = L.Layer.extend({
1146011464
//向专题图图层中添加数据, 支持的feature类型为:
1146111465
//iServer返回的feature json对象 或L.supermap.themeFeature类型
1146211466
addFeatures: function (features) {
11467+
//子类实现此方法
1146311468
},
1146411469

1146511470
//抽象方法，可实例化子类必须实现此方法。
1146611471
redrawThematicFeatures: function (bounds) {
11472+
//子类必须实现此方法
1146711473
},
1146811474

1146911475
destroyFeatures: function (features) {
@@ -12019,6 +12025,7 @@ SuperMap.TimeFlowControl = SuperMap.Class(SuperMap.TimeControlBase, {
1201912025
var aArgs = Array.prototype.slice.call(arguments, 1),
1202012026
fToBind = this,
1202112027
fNOP = function () {
12028+
//empty Function
1202212029
},
1202312030
fBound = function () {
1202412031
return fToBind.apply(this instanceof fNOP && oThis
@@ -12143,8 +12150,7 @@ SuperMap.TimeFlowControl = SuperMap.Class(SuperMap.TimeControlBase, {
1214312150
me.currentTime = me.endTime;
1214412151
}
1214512152

12146-
}
12147-
else {
12153+
} else {
1214812154
//如果相等，则代表上一帧已经运行到了最前，下一帧运行结束的状态
1214912155
if (me.currentTime === me.startTime) {
1215012156
//不循环时
@@ -36606,8 +36612,10 @@ SuperMap.PointWithMeasure = SuperMap.Class(SuperMap.Geometry.Point, {
3660636612
equals: function (geom) {
3660736613
var equals = false;
3660836614
if (geom != null) {
36609-
equals = ((this.x === geom.x && this.y === geom.y && this.measure === geom.measure) ||
36610-
(isNaN(this.x) && isNaN(this.y) && isNaN(this.measure) && isNaN(geom.x) && isNaN(geom.y) && isNaN(geom.measure)));
36615+
var isValueEquals = this.x === geom.x && this.y === geom.y && this.measure === geom.measure;
36616+
var isNaNValue = isNaN(this.x) && isNaN(this.y) && isNaN(this.measure);
36617+
var isNaNGeometry = isNaN(geom.x) && isNaN(geom.y) && isNaN(geom.measure);
36618+
equals = ( isValueEquals || ( isNaNValue && isNaNGeometry ));
3661136619
}
3661236620
return equals;
3661336621
},
@@ -37507,10 +37515,12 @@ SuperMap.Feature.Theme.Ring = SuperMap.Class(SuperMap.Feature.Theme.Graph, {
3750737515
var r = this.DVBHeight < this.DVBWidth ? this.DVBHeight / 2 : this.DVBWidth / 2;
3750837516

3750937517
// 扇形内环（自适应）半径
37510-
var r0 = (typeof(sets.innerRingRadius) !== "undefined"
37511-
&& !isNaN(sets.innerRingRadius)
37512-
&& sets.innerRingRadius >= 0
37513-
&& sets.innerRingRadius < r) ? sets.innerRingRadius : 0;
37518+
var isInRange = sets.innerRingRadius >= 0 && sets.innerRingRadius < r;
37519+
var r0 = (
37520+
typeof(sets.innerRingRadius) !== "undefined"
37521+
&& !isNaN(sets.innerRingRadius)
37522+
&& isInRange
37523+
) ? sets.innerRingRadius : 0;
3751437524

3751537525
for (var i = 0; i < fv.length; i++) {
3751637526
var fvi = Math.abs(fv[i]);
@@ -37625,23 +37635,22 @@ SuperMap.RouteCalculateMeasureParameters = SuperMap.Class({
3762537635
*
3762637636
*/
3762737637
initialize: function (options) {
37628-
if (options) {
37629-
var routeFromClient = options.sourceRoute;
37630-
var routeHandle = {};
37631-
if (routeFromClient) {
37632-
if (routeFromClient instanceof SuperMap.Geometry && routeFromClient.components) {
37633-
routeHandle.type = routeFromClient.type;
37634-
routeHandle.parts = routeFromClient.parts;
37635-
var parts = [];
37636-
for (var i = 0, len = routeFromClient.components.length; i < len; i++) {
37637-
parts = parts.concat(routeFromClient.components[i].components);
37638-
}
37639-
routeHandle.points = parts;
37640-
options.sourceRoute = routeHandle;
37641-
}
37638+
if (!options) {
37639+
return this;
37640+
}
37641+
var routeFromClient = options.sourceRoute;
37642+
var routeHandle = {};
37643+
if (routeFromClient && routeFromClient instanceof SuperMap.Geometry && routeFromClient.components) {
37644+
routeHandle.type = routeFromClient.type;
37645+
routeHandle.parts = routeFromClient.parts;
37646+
var parts = [];
37647+
for (var i = 0, len = routeFromClient.components.length; i < len; i++) {
37648+
parts = parts.concat(routeFromClient.components[i].components);
3764237649
}
37643-
SuperMap.Util.extend(this, options);
37650+
routeHandle.points = parts;
37651+
options.sourceRoute = routeHandle;
3764437652
}
37653+
SuperMap.Util.extend(this, options);
3764537654
},
3764637655

3764737656
/**
@@ -37907,23 +37916,22 @@ SuperMap.RouteLocatorParameters = SuperMap.Class({
3790737916
* endMeasure - {Double} 定位线的终止M值。只当路由对象定位线时有意义。
3790837917
*/
3790937918
initialize: function (options) {
37910-
if (options) {
37911-
var routeFromClient = options.sourceRoute;
37912-
var routeHandle = {};
37913-
if (routeFromClient) {
37914-
if (routeFromClient instanceof SuperMap.Geometry && routeFromClient.components) {
37915-
routeHandle.type = routeFromClient.type;
37916-
routeHandle.parts = routeFromClient.parts;
37917-
var parts = [];
37918-
for (var i = 0, len = routeFromClient.components.length; i < len; i++) {
37919-
parts = parts.concat(routeFromClient.components[i].components);
37920-
}
37921-
routeHandle.points = parts;
37922-
options.sourceRoute = routeHandle;
37923-
}
37919+
if (!options) {
37920+
return this;
37921+
}
37922+
var routeFromClient = options.sourceRoute;
37923+
var routeHandle = {};
37924+
if (routeFromClient && routeFromClient instanceof SuperMap.Geometry && routeFromClient.components) {
37925+
routeHandle.type = routeFromClient.type;
37926+
routeHandle.parts = routeFromClient.parts;
37927+
var parts = [];
37928+
for (var i = 0, len = routeFromClient.components.length; i < len; i++) {
37929+
parts = parts.concat(routeFromClient.components[i].components);
3792437930
}
37925-
SuperMap.Util.extend(this, options);
37931+
routeHandle.points = parts;
37932+
options.sourceRoute = routeHandle;
3792637933
}
37934+
SuperMap.Util.extend(this, options);
3792737935
},
3792837936

3792937937
/**
@@ -50739,7 +50747,7 @@ var VectorTilePBF = L.Class.extend({
5073950747
var feat = vectorTile.layers[layerName].feature(i);
5074050748
feat.geometry = feat.loadGeometry();
5074150749
feat.layerName = layerName;
50742-
feat.properties = {attributes: L.Util.extend({}, feat.properties),id:feat.id};
50750+
feat.properties = {attributes: L.Util.extend({}, feat.properties), id: feat.id};
5074350751
switch (feat.type) {
5074450752
case 1:
5074550753
feat.type = L.supermap.VectorFeatureType.POINT;
@@ -50750,6 +50758,8 @@ var VectorTilePBF = L.Class.extend({
5075050758
case 3:
5075150759
feat.type = L.supermap.VectorFeatureType.REGION;
5075250760
break;
50761+
default:
50762+
break;
5075350763
}
5075450764
feats.push(feat);
5075550765
}

‎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.

0 commit comments

Comments
 (0)