fix sonar

songyumeng · songyumeng · commit 8e50eeb240b9 · 2017-05-08T14:31:01.000+08:00
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -6,7 +6,7 @@ sonar.projectVersion=9.0.0
 # Comma-separated paths to directories with sources (required)
 sonar.sources=src/
 sonar.inclusions=src/**/*.js
-sonar.exclusions=src/legacy/**/*.js
+sonar.exclusions=src/legacy/**/*.js,src/common/style/CartoCSS.js
 sonar.test.inclusions=test/**/*.js
 
 # Language
diff --git a/src/common/iServer/BuildCacheJobParameter.js b/src/common/iServer/BuildCacheJobParameter.js
@@ -91,7 +91,7 @@ SuperMap.BuildCacheJobParameter.toObject = function (buildCacheJobParameter, tem
             tempObj['input'][name] = buildCacheJobParameter[name];
             continue;
         }
-        if (name === "cacheName" || name === "cacheType" || name === "serverAdresses" || name === "database" || name === "version") {
+        if (SuperMap.Util.indexOf(["cacheName", "cacheType", "serverAdresses", "database", "version"], name) > -1) {
             tempObj['output'] = tempObj['output'] || {};
             tempObj['output'][name] = buildCacheJobParameter[name];
             continue;
diff --git a/src/leaflet/core/Util.js b/src/leaflet/core/Util.js
@@ -112,7 +112,7 @@ L.Util.Csv2GeoJSON = function (csv, options) {
             var campos = csv[num_linea].trim().split(options.fieldSeparator)
                 , lng = parseFloat(campos[titulos.indexOf(options.longitudeTitle)])
                 , lat = parseFloat(campos[titulos.indexOf(options.latitudeTitle)]);
-            if (campos.length == titulos.length && lng < 180 && lng > -180 && lat < 90 && lat > -90) {
+            if (campos.length == titulos.length && Math.abs(lng) < 180 && Math.abs(lat) < 90) {
                 var feature = {};
                 feature["type"] = "Feature";
                 feature["geometry"] = {};

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ SuperMap.BuildCacheJobParameter.toObject = function (buildCacheJobParameter, tem`
`91`	`91`	`tempObj['input'][name] = buildCacheJobParameter[name];`
`92`	`92`	`continue;`
`93`	`93`	`}`
`94`		`- if (name === "cacheName" \|\| name === "cacheType" \|\| name === "serverAdresses" \|\| name === "database" \|\| name === "version") {`
	`94`	`+ if (SuperMap.Util.indexOf(["cacheName", "cacheType", "serverAdresses", "database", "version"], name) > -1) {`
`95`	`95`	`tempObj['output'] = tempObj['output'] \|\| {};`
`96`	`96`	`tempObj['output'][name] = buildCacheJobParameter[name];`
`97`	`97`	`continue;`