Skip to content

Commit c881047

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
尝试修复iclient9 sonar上的严重问题。review by zhurch
1 parent 6dec668 commit c881047

File tree

12 files changed

+1985
-1934
lines changed

12 files changed

+1985
-1934
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 1907 additions & 1898 deletions
Large diffs are not rendered by default.

‎dist/iclient9-openlayers.js‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,6 +1544,7 @@ SuperMap.Format.GeoJSON = SuperMap.Class(SuperMap.Format.JSON, {
15441544
}
15451545
}
15461546
break;
1547+
default:break;
15471548
}
15481549
}
15491550
return results;
@@ -10684,6 +10685,7 @@ SuperMap.Format = SuperMap.Class({
1068410685
* 销毁该格式类，释放相关资源。
1068510686
*/
1068610687
destroy: function () {
10688+
//用来销毁该格式类，释放相关资源
1068710689
},
1068810690

1068910691
/**
@@ -10698,6 +10700,7 @@ SuperMap.Format = SuperMap.Class({
1069810700
* Depends on the subclass
1069910701
*/
1070010702
read: function (data) {
10703+
//用来从字符串中读取数据
1070110704
},
1070210705

1070310706
/**
@@ -10711,6 +10714,7 @@ SuperMap.Format = SuperMap.Class({
1071110714
* {String} A string representation of the object.
1071210715
*/
1071310716
write: function (object) {
10717+
//用来写字符串
1071410718
},
1071510719

1071610720
CLASS_NAME: "SuperMap.Format"
@@ -11267,9 +11271,10 @@ SuperMap.AreaSolarRadiationParameters.toObject = function (derrainCurvatureCalcu
1126711271
var parameter = {};
1126811272
for (var name in derrainCurvatureCalculationParameters) {
1126911273
if (name !== "dataset") {
11270-
if (name === "latitude" || name === "timeMode" || name === "dayStart" ||
11271-
name === "dayEnd" || name === "hourStart" || name === "hourEnd" ||
11272-
name === "transmittance" || name === "hourInterval" || name === "dayInterval") {
11274+
var name1 = (name === "latitude" || name === "timeMode" || name === "dayStart");
11275+
var name2 = (name === "dayEnd" || name === "hourStart" || name === "hourEnd");
11276+
var name3 = (name === "transmittance" || name === "hourInterval" || name === "dayInterval");
11277+
if (name1 || name2 || name3) {
1127311278
parameter[name] = derrainCurvatureCalculationParameters[name];
1127411279
}
1127511280
else {
@@ -18711,6 +18716,8 @@ SuperMap.REST.GetLayersInfoService = SuperMap.Class(SuperMap.ServiceBase, {
1871118716
tempLayer.fromJson(layers[i]);
1871218717
layers[i] = tempLayer;
1871318718
break;
18719+
default:
18720+
break;
1871418721
}
1871518722
}
1871618723

@@ -20466,7 +20473,9 @@ SuperMap.REST.MapService = SuperMap.Class(ServiceBase, {
2046620473
serviceProcessCompleted: function (result) {
2046720474
var me = this;
2046820475
result = SuperMap.Util.transformResult(result);
20469-
if (!result.code || (result.code && ((result.code >= 200 && result.code < 300) || result.code == 0 || result.code === 304))) {
20476+
var codeStatus = (result.code >= 200 && result.code < 300) || result.code == 0 || result.code === 304;
20477+
var isCodeValid = result.code && codeStatus;
20478+
if (!result.code || isCodeValid) {
2047020479
me.events && me.events.triggerEvent("processCompleted", {result: result});
2047120480
}
2047220481
//在没有token是返回的是200，但是其实是没有权限，所以这里也应该是触发失败事件
@@ -22263,6 +22272,8 @@ SuperMap.ServerTheme = SuperMap.Class(SuperMap.UGCSubLayer, {
2226322272
case 'RANGE':
2226422273
this.theme = SuperMap.ThemeRange.fromObj(themeObj);
2226522274
break;
22275+
default:
22276+
break;
2226622277
}
2226722278
if (this.themeElementPosition) {
2226822279
//待测试
@@ -27140,6 +27151,7 @@ SuperMap.CartoCSS = SuperMap.Class({
2714027151
// This function is called after all files
2714127152
// have been imported through `@import`.
2714227153
var finish = function () {
27154+
//所有文件导入完成之后调用
2714327155
};
2714427156

2714527157
function save() {
@@ -27245,7 +27257,7 @@ SuperMap.CartoCSS = SuperMap.Class({
2724527257
};
2724627258
if (defautls) {
2724727259
for (var prop in defautls) {
27248-
if (err[prop] === void 0) err[prop] = defautls[prop];
27260+
if (err[prop] === 0) err[prop] = defautls[prop];
2724927261
}
2725027262
}
2725127263

@@ -27646,12 +27658,10 @@ SuperMap.CartoCSS = SuperMap.Class({
2764627658
// Entities are the smallest recognized token,
2764727659
// and can be found inside a rule's value.
2764827660
entity: function () {
27649-
return $(this.entities.call) ||
27650-
$(this.entities.literal) ||
27651-
$(this.entities.field) ||
27652-
$(this.entities.variable) ||
27653-
$(this.entities.url) ||
27654-
$(this.entities.keyword);
27661+
var property1 = $(this.entities.call) || $(this.entities.literal);
27662+
var property2 = $(this.entities.field) || $(this.entities.variable);
27663+
var property3 = $(this.entities.url) || $(this.entities.keyword);
27664+
return property1 || property2 || property3;
2765527665
},
2765627666

2765727667
// A Rule terminator. Note that we use `peek()` to check for '}',
@@ -27996,7 +28006,7 @@ SuperMap.CartoCSS = SuperMap.Class({
2799628006
for (var prop in shader) {
2799728007
if (prop !== 'zoom' && prop !== 'frames' && prop !== "attachment" && prop != "elements") {
2799828008
//对layer-index作特殊处理以实现图层的控制
27999-
if (prop === "layer-index") {
28009+
if (prop === "layer-index") {
2800028010
var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");
2800128011
var layerIndex = getLayerIndex();
2800228012
Object.defineProperty(shaderArray, "layerIndex", {
@@ -30230,7 +30240,7 @@ SuperMap.CartoCSS.Tree.Call = SuperMap.Class({
3023030240
};
3023130241
}
3023230242
if (fn !== args.length &&
30233-
// support variable-arg functions like `colorize-alpha`
30243+
// support variable-arg functions like `colorize-alpha`
3023430244
fn !== -1) {
3023530245
env.error({
3023630246
message: 'function ' + this.name + '() takes ' +
@@ -30350,6 +30360,8 @@ SuperMap.CartoCSS.Tree.Color = SuperMap.Class({
3035030360
case b:
3035130361
h = (r - g) / d + 4;
3035230362
break;
30363+
default:
30364+
break;
3035330365
}
3035430366
h /= 6;
3035530367
}
@@ -30482,8 +30494,8 @@ SuperMap.CartoCSS.Tree.Definition = SuperMap.Class({
3048230494
// Get a simple list of the symbolizers, in order
3048330495
function symbolizerList(sym_order) {
3048430496
return sym_order.sort(function (a, b) {
30485-
return a[1] - b[1];
30486-
})
30497+
return a[1] - b[1];
30498+
})
3048730499
.map(function (v) {
3048830500
return v[0];
3048930501
});
@@ -30994,6 +31006,9 @@ SuperMap.CartoCSS.Tree.Filterset = SuperMap.Class({
3099431006
if (this.filters[key + '<'] !== undefined && this.filters[key + '<'].val <= value) return null;
3099531007
if (this.filters[key + '<='] !== undefined && this.filters[key + '<='].val <= value) return null;
3099631008
return true;
31009+
31010+
default:
31011+
break;
3099731012
}
3099831013
},
3099931014

@@ -31019,12 +31034,10 @@ SuperMap.CartoCSS.Tree.Filterset = SuperMap.Class({
3101931034
},
3102031035

3102131036
add: function (filter, env) {
31022-
var key = filter.key.toString(),
31023-
id,
31037+
var key = filter.key.toString(), id,
3102431038
op = filter.op,
3102531039
conflict = this.conflict(filter),
3102631040
numval;
31027-
3102831041
if (conflict) return conflict;
3102931042

3103031043
if (op === '=') {
@@ -31926,6 +31939,9 @@ SuperMap.CartoCSS.Tree.Zoom = SuperMap.Class({
3192631939
case '<=':
3192731940
this.zoom = "zoom && zoom <= " + value;
3192831941
break;
31942+
default:
31943+
return this;
31944+
break;
3192931945
}
3193031946
/*
3193131947
for (var i = 0; i <= SuperMap.CartoCSS.Tree.Zoom.maxZoom; i++) {

‎src/common/format/Format.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ SuperMap.Format = SuperMap.Class({
7070
* 销毁该格式类，释放相关资源。
7171
*/
7272
destroy: function () {
73+
//用来销毁该格式类，释放相关资源
7374
},
7475

7576
/**
@@ -84,6 +85,7 @@ SuperMap.Format = SuperMap.Class({
8485
* Depends on the subclass
8586
*/
8687
read: function (data) {
88+
//用来从字符串中读取数据
8789
},
8890

8991
/**
@@ -97,6 +99,7 @@ SuperMap.Format = SuperMap.Class({
9799
* {String} A string representation of the object.
98100
*/
99101
write: function (object) {
102+
//用来写字符串
100103
},
101104

102105
CLASS_NAME: "SuperMap.Format"

‎src/common/format/GeoJSON.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ SuperMap.Format.GeoJSON = SuperMap.Class(SuperMap.Format.JSON, {
104104
}
105105
}
106106
break;
107+
default:break;
107108
}
108109
}
109110
return results;

‎src/common/iServer/AreaSolarRadiationParameters.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,10 @@ SuperMap.AreaSolarRadiationParameters.toObject = function (derrainCurvatureCalcu
158158
var parameter = {};
159159
for (var name in derrainCurvatureCalculationParameters) {
160160
if (name !== "dataset") {
161-
if (name === "latitude" || name === "timeMode" || name === "dayStart" ||
162-
name === "dayEnd" || name === "hourStart" || name === "hourEnd" ||
163-
name === "transmittance" || name === "hourInterval" || name === "dayInterval") {
161+
var name1 = (name === "latitude" || name === "timeMode" || name === "dayStart");
162+
var name2 = (name === "dayEnd" || name === "hourStart" || name === "hourEnd");
163+
var name3 = (name === "transmittance" || name === "hourInterval" || name === "dayInterval");
164+
if (name1 || name2 || name3) {
164165
parameter[name] = derrainCurvatureCalculationParameters[name];
165166
}
166167
else {

‎src/common/iServer/GetLayersInfoService.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ SuperMap.REST.GetLayersInfoService = SuperMap.Class(SuperMap.ServiceBase, {
133133
tempLayer.fromJson(layers[i]);
134134
layers[i] = tempLayer;
135135
break;
136+
default:
137+
break;
136138
}
137139
}
138140

‎src/common/iServer/MapService.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ SuperMap.REST.MapService = SuperMap.Class(ServiceBase, {
102102
serviceProcessCompleted: function (result) {
103103
var me = this;
104104
result = SuperMap.Util.transformResult(result);
105-
if (!result.code || (result.code && ((result.code >= 200 && result.code < 300) || result.code == 0 || result.code === 304))) {
105+
var codeStatus = (result.code >= 200 && result.code < 300) || result.code == 0 || result.code === 304;
106+
var isCodeValid = result.code && codeStatus;
107+
if (!result.code || isCodeValid) {
106108
me.events && me.events.triggerEvent("processCompleted", {result: result});
107109
}
108110
//在没有token是返回的是200，但是其实是没有权限，所以这里也应该是触发失败事件

‎src/common/iServer/ServerTheme.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ SuperMap.ServerTheme = SuperMap.Class(SuperMap.UGCSubLayer, {
7474
case 'RANGE':
7575
this.theme = SuperMap.ThemeRange.fromObj(themeObj);
7676
break;
77+
default:
78+
break;
7779
}
7880
if (this.themeElementPosition) {
7981
//待测试

‎src/common/style/CartoCSS.js‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ SuperMap.CartoCSS = SuperMap.Class({
8787
// This function is called after all files
8888
// have been imported through `@import`.
8989
var finish = function () {
90+
//所有文件导入完成之后调用
9091
};
9192

9293
function save() {
@@ -192,7 +193,7 @@ SuperMap.CartoCSS = SuperMap.Class({
192193
};
193194
if (defautls) {
194195
for (var prop in defautls) {
195-
if (err[prop] === void 0) err[prop] = defautls[prop];
196+
if (err[prop] === 0) err[prop] = defautls[prop];
196197
}
197198
}
198199

@@ -593,12 +594,10 @@ SuperMap.CartoCSS = SuperMap.Class({
593594
// Entities are the smallest recognized token,
594595
// and can be found inside a rule's value.
595596
entity: function () {
596-
return $(this.entities.call) ||
597-
$(this.entities.literal) ||
598-
$(this.entities.field) ||
599-
$(this.entities.variable) ||
600-
$(this.entities.url) ||
601-
$(this.entities.keyword);
597+
var property1 = $(this.entities.call) || $(this.entities.literal);
598+
var property2 = $(this.entities.field) || $(this.entities.variable);
599+
var property3 = $(this.entities.url) || $(this.entities.keyword);
600+
return property1 || property2 || property3;
602601
},
603602

604603
// A Rule terminator. Note that we use `peek()` to check for '}',
@@ -943,7 +942,7 @@ SuperMap.CartoCSS = SuperMap.Class({
943942
for (var prop in shader) {
944943
if (prop !== 'zoom' && prop !== 'frames' && prop !== "attachment" && prop != "elements") {
945944
//对layer-index作特殊处理以实现图层的控制
946-
if (prop === "layer-index") {
945+
if (prop === "layer-index") {
947946
var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");
948947
var layerIndex = getLayerIndex();
949948
Object.defineProperty(shaderArray, "layerIndex", {
@@ -3177,7 +3176,7 @@ SuperMap.CartoCSS.Tree.Call = SuperMap.Class({
31773176
};
31783177
}
31793178
if (fn !== args.length &&
3180-
// support variable-arg functions like `colorize-alpha`
3179+
// support variable-arg functions like `colorize-alpha`
31813180
fn !== -1) {
31823181
env.error({
31833182
message: 'function ' + this.name + '() takes ' +
@@ -3297,6 +3296,8 @@ SuperMap.CartoCSS.Tree.Color = SuperMap.Class({
32973296
case b:
32983297
h = (r - g) / d + 4;
32993298
break;
3299+
default:
3300+
break;
33003301
}
33013302
h /= 6;
33023303
}
@@ -3429,8 +3430,8 @@ SuperMap.CartoCSS.Tree.Definition = SuperMap.Class({
34293430
// Get a simple list of the symbolizers, in order
34303431
function symbolizerList(sym_order) {
34313432
return sym_order.sort(function (a, b) {
3432-
return a[1] - b[1];
3433-
})
3433+
return a[1] - b[1];
3434+
})
34343435
.map(function (v) {
34353436
return v[0];
34363437
});
@@ -3941,6 +3942,9 @@ SuperMap.CartoCSS.Tree.Filterset = SuperMap.Class({
39413942
if (this.filters[key + '<'] !== undefined && this.filters[key + '<'].val <= value) return null;
39423943
if (this.filters[key + '<='] !== undefined && this.filters[key + '<='].val <= value) return null;
39433944
return true;
3945+
3946+
default:
3947+
break;
39443948
}
39453949
},
39463950

@@ -3966,12 +3970,10 @@ SuperMap.CartoCSS.Tree.Filterset = SuperMap.Class({
39663970
},
39673971

39683972
add: function (filter, env) {
3969-
var key = filter.key.toString(),
3970-
id,
3973+
var key = filter.key.toString(), id,
39713974
op = filter.op,
39723975
conflict = this.conflict(filter),
39733976
numval;
3974-
39753977
if (conflict) return conflict;
39763978

39773979
if (op === '=') {
@@ -4873,6 +4875,9 @@ SuperMap.CartoCSS.Tree.Zoom = SuperMap.Class({
48734875
case '<=':
48744876
this.zoom = "zoom && zoom <= " + value;
48754877
break;
4878+
default:
4879+
return this;
4880+
break;
48764881
}
48774882
/*
48784883
for (var i = 0; i <= SuperMap.CartoCSS.Tree.Zoom.maxZoom; i++) {

‎src/leaflet/overlay/PBFTileVectorLayer.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ L.PBFTileVectorLayer = L.VectorGrid.extend({
108108
case 3:
109109
layer = new L.RegionSymbolizer(feat, pxPerExtent);
110110
break;
111+
default:
112+
break;
111113
}
112114

113115
if (this.options.interactive) {

0 commit comments

Comments
 (0)