fix sonar

songyumeng · songyumeng · commit 6928da6ddf2a · 2017-10-23T00:14:07.000+08:00
diff --git a/dist/iclient-classic.js b/dist/iclient-classic.js
diff --git a/dist/iclient-classic.min.js b/dist/iclient-classic.min.js
diff --git a/dist/iclient9-leaflet.js b/dist/iclient9-leaflet.js
diff --git a/dist/iclient9-leaflet.min.js b/dist/iclient9-leaflet.min.js
diff --git a/dist/iclient9-mapboxgl.js b/dist/iclient9-mapboxgl.js
diff --git a/dist/iclient9-mapboxgl.min.js b/dist/iclient9-mapboxgl.min.js
diff --git a/dist/iclient9-openlayers.js b/dist/iclient9-openlayers.js
diff --git a/dist/iclient9-openlayers.min.js b/dist/iclient9-openlayers.min.js
diff --git a/src/common/commontypes/Event.js b/src/common/commontypes/Event.js
@@ -248,7 +248,7 @@ export var Event = SuperMap.Event = {
             for (var i = elementObservers.length - 1; i >= 0; i--) {
                 var entry = elementObservers[i];
                 var args = new Array(entry.element, entry.name, entry.observer, entry.useCapture);
-                var removed = SuperMap.Event.stopObserving.apply(this, args);
+                SuperMap.Event.stopObserving.apply(this, args);
             }
         }
     },
diff --git a/src/common/commontypes/Util.js b/src/common/commontypes/Util.js
@@ -697,11 +697,11 @@ SuperMap.Util.isInTheSameDomain = function (url) {
         documentIndex = documentSubString.indexOf("/");
         var documentPortIndex = documentSubString.indexOf(":");
         var documentDomainWithPort = documentSubString.substring(0, documentIndex);
-        var documentPort;
+        //var documentPort;
 
         var documentprotocol = document.location.protocol;
         if (documentPortIndex !== -1) {
-            documentPort = +documentSubString.substring(documentPortIndex, documentIndex);
+           // documentPort = +documentSubString.substring(documentPortIndex, documentIndex);
         } else {
             documentDomainWithPort += ':' + (documentprotocol.toLowerCase() === 'http:' ? 80 : 443);
         }
diff --git a/src/common/commontypes/geometry/LineString.js b/src/common/commontypes/geometry/LineString.js
@@ -113,8 +113,7 @@ export default class LineString extends Curve {
         if (points.length < 3) {
             return points
         }
-        var len = points.length,
-            centerPoint = {},
+        var centerPoint = {},
             p1 = points[0],
             p2 = points[1],
             p3 = points[2];
diff --git a/src/common/iServer/ChartQueryParameters.js b/src/common/iServer/ChartQueryParameters.js
@@ -110,8 +110,7 @@ export default class ChartQueryParameters {
             var chartParamArray = [];
             var chartLength = this.chartQueryFilterParameters.length;
             for (var j = 0; j < chartLength; j++) {
-                var chartQueryFilterParameter = new ChartQueryFilterParameter();
-                chartQueryFilterParameter = this.chartQueryFilterParameters[j];
+                var chartQueryFilterParameter = this.chartQueryFilterParameters[j];
                 chartParamArray.push(chartQueryFilterParameter.toJson());
             }
             var chartParamsJson = "[" + chartParamArray.join(",") + "]";
diff --git a/src/common/iServer/FindMTSPPathsService.js b/src/common/iServer/FindMTSPPathsService.js
@@ -49,7 +49,7 @@ export default class FindMTSPPathsService extends NetworkAnalystServiceBase {
             return;
         }
         var me = this, jsonObject,
-            end = me.url.substr(me.url.length - 1, 1),
+            //end = me.url.substr(me.url.length - 1, 1),
             centers = me.getJson(params.isAnalyzeById, params.centers),
             nodes = me.getJson(params.isAnalyzeById, params.nodes);
         me.url = me.url + "/mtsppath" + ".json?";
diff --git a/src/common/iServer/ServerFeature.js b/src/common/iServer/ServerFeature.js
@@ -100,8 +100,7 @@ export default class ServerFeature {
      * {SuperMap.ServerFeature} 转化后的 ServerFeature 对象。
      */
     static fromJson(jsonObject) {
-        var me = this,
-            geo = null;
+        var geo = null;
         if (!jsonObject) {
             return;
         }
diff --git a/src/common/iServer/ServerGeometry.js b/src/common/iServer/ServerGeometry.js
@@ -291,7 +291,6 @@ export default class ServerGeometry {
                     [new LinearRing(pointList)]
                 )
             );
-            pointList = [];
             return new MultiPolygon(polygonArray);
         }
         //处理复杂面
@@ -411,7 +410,6 @@ export default class ServerGeometry {
                     [new LinearRing(lineEPS)]
                 )
             );
-            pointList = [];
             return new MultiPolygon(polygonArray);
         }
         //处理复杂面
diff --git a/src/common/iServer/TransportationAnalystParameter.js b/src/common/iServer/TransportationAnalystParameter.js
@@ -80,7 +80,7 @@ export default  class TransportationAnalystParameter {
         }
         if (me.barrierPoints && me.barrierPoints.length) {
             for (var i in me.barrierPoints) {
-                me.barrierPoints.destroy();
+                me.barrierPoints[i].destroy();
             }
         }
         me.barrierPoints = null;
diff --git a/src/common/online/Online.js b/src/common/online/Online.js
@@ -1,6 +1,5 @@
 import SuperMap from '../SuperMap';
 import '../security/SecurityManager';
-import OnlineQueryDatasParameter from './OnlineQueryDatasParameter';
 import OnlineData from './OnlineData';
 import {FetchRequest} from '../util/FetchRequest';
 
diff --git a/src/common/overlay/Line.js b/src/common/overlay/Line.js
@@ -160,7 +160,7 @@ export default class Line extends Graph {
         // 折线图必须使用坐标轴
         this.shapes = this.shapes.concat(SuperMap.Feature.ShapeFactory.GraphAxis(this.shapeFactory, dvb, sets, xShapeInfo));
 
-        var isDataEffective = true;
+       // var isDataEffective = true;
 
         var xPx;        // 折线节点 x 坐标
         var yPx;        // 折线节点 y 坐标
@@ -170,7 +170,7 @@ export default class Line extends Graph {
         for (var i = 0, len = fv.length; i < len; i++) {
             // 数据溢出值域检查
             if (fv[i] < codomain[0] || fv[i] > codomain[1]) {
-                isDataEffective = false;
+               // isDataEffective = false;
                 return null;
             }
 
@@ -219,10 +219,10 @@ export default class Line extends Graph {
         // 添加节点到图表图形数组
         this.shapes = this.shapes.concat(shapePois);
 
-        // 数据范围检测未通过，清空图形
-        if (isDataEffective === false) {
-            this.shapes = [];
-        }
+        // // 数据范围检测未通过，清空图形
+        // if (isDataEffective === false) {
+        //     this.shapes = [];
+        // }
 
         // 重要步骤：将图形转为由相对坐标表示的图形，以便在地图平移缩放过程中快速重绘图形
         // （统计专题图模块从结构上要求使用相对坐标，assembleShapes() 函数必须在图形装配完成后调用 shapesConvertToRelativeCoordinate() 函数）
diff --git a/src/common/overlay/levelRenderer/Painter.js b/src/common/overlay/levelRenderer/Painter.js
@@ -246,7 +246,7 @@ export default class Painter {
             }
 
             // Start group clipping
-            if (shape.__startClip) {
+            if (ctx && shape.__startClip) {
                 var clipShape = shape.__startClip;
                 ctx.save();
                 // Set transform
@@ -275,7 +275,7 @@ export default class Painter {
                 }
             }
 
-            if ((currentLayer.dirty || paintAll) && !shape.invisible) {
+            if (((currentLayer && currentLayer.dirty) || paintAll) && !shape.invisible) {
                 if (
                     !shape.onbrush
                     || (shape.onbrush && !shape.onbrush(ctx, false))
diff --git a/src/common/overlay/levelRenderer/SmicCircle.js b/src/common/overlay/levelRenderer/SmicCircle.js
@@ -137,10 +137,10 @@ export default class SmicCircle extends Shape {
             lineWidth = 0;
         }
         style.__rect = {
-            x: Math.round(x - style.r - lineWidth / 2),
-            y: Math.round(y - style.r - lineWidth / 2),
-            width: style.r * 2 + lineWidth,
-            height: style.r * 2 + lineWidth
+            x: Math.round(x - r - lineWidth / 2),
+            y: Math.round(y - r - lineWidth / 2),
+            width: r * 2 + lineWidth,
+            height: r * 2 + lineWidth
         };
 
         return style.__rect;
diff --git a/src/common/overlay/levelRenderer/SmicPolygon.js b/src/common/overlay/levelRenderer/SmicPolygon.js
@@ -228,8 +228,6 @@ export default class SmicPolygon extends Shape {
             }
 
         }
-        hpStyle = null;
-
         ctx.restore();
         return;
     }
diff --git a/src/leaflet/mapping/WebMap.js b/src/leaflet/mapping/WebMap.js
@@ -398,7 +398,6 @@ export var WebMap = L.LayerGroup.extend({
     createVectorLayer: function (layerInfo, crs) {
         var style = layerInfo.style,
             opacity = layerInfo.opacity,
-            isVisible = layerInfo.isVisible,
             me = this;
         //todo readonly = layerInfo.readonly;
         var coordsToLatLng = function (coords) {
diff --git a/src/leaflet/overlay/GraphThemeLayer.js b/src/leaflet/overlay/GraphThemeLayer.js
@@ -432,10 +432,6 @@ export var GraphThemeLayer = ThemeLayer.extend({
             mapBounds.getEast(),
             mapBounds.getNorth()
         );
-
-        if (!mapBounds) {
-            return;
-        }
         var charts = me.charts;
         var chartsBounds = [];
         // 获取地图像素 bounds
diff --git a/src/leaflet/overlay/carto/CartoCSSToLeaflet.js b/src/leaflet/overlay/carto/CartoCSSToLeaflet.js
@@ -260,6 +260,7 @@ export class CartoCSSToLeaflet {
                     style.fontSize = fontSize;
                 } else if (prop === "fontName") {
                     fontName = value;
+                    style.fontName = fontName;
                 } else {
                     if (prop === "globalCompositeOperation") {
                         value = L.supermap.CompOpMap[value];
diff --git a/src/leaflet/overlay/vectortile/PointSymbolizer.js b/src/leaflet/overlay/vectortile/PointSymbolizer.js
@@ -114,7 +114,7 @@ export var PointSymbolizer = L.CircleMarker.extend({
         img.src = src;
         img.className = 'leaflet-marker-' + name + ' ' + (this.layerName || '');
 
-        var options = this.options;
+       // var options = this.options;
         var sizeOption = iconSize;
 
         if (typeof sizeOption === 'number') {
diff --git a/src/leaflet/overlay/vectortile/SVGRenderer.js b/src/leaflet/overlay/vectortile/SVGRenderer.js
@@ -76,7 +76,7 @@ export var  SVGRenderer = L.SVG.extend({
 
     _initContainer: function () {
         L.SVG.prototype._initContainer.call(this);
-        var rect = L.SVG.create('rect');
+       // var rect = L.SVG.create('rect');
     },
 
     _addPath: function (layer) {
diff --git a/src/leaflet/overlay/vectortile/VectorTile.js b/src/leaflet/overlay/vectortile/VectorTile.js
@@ -201,7 +201,7 @@ export var VectorTile = L.Class.extend({
         }
         var vectorLayer = this.layer;
 
-        if (vectorLayer.options.interactive) {
+        if (layer && vectorLayer.options.interactive) {
             layer.addEventParent(vectorLayer);
         }
 
diff --git a/src/mapboxgl/overlay/GraphThemeLayer.js b/src/mapboxgl/overlay/GraphThemeLayer.js
@@ -85,13 +85,13 @@ export default class Graph extends Theme {
         var features = this.features;
         for (var i = 0, len = features.length; i < len; i++) {
             var feature = features[i];
-            // 要素范围判断
-            var feaBounds = feature.geometry.getBounds();
-            //剔除当前视图（地理）范围以外的数据
-            if (extent) {
-                var bounds = new SuperMap.Bounds(extent.getWest(), extent.getSouth(), extent.getEast(), extent.getNorth());
-                // if (!bounds.intersectsBounds(feaBounds)) continue;
-            }
+            // // 要素范围判断
+            // var feaBounds = feature.geometry.getBounds();
+            // //剔除当前视图（地理）范围以外的数据
+            // if (extent) {
+            //     var bounds = new SuperMap.Bounds(extent.getWest(), extent.getSouth(), extent.getEast(), extent.getNorth());
+            //     // if (!bounds.intersectsBounds(feaBounds)) continue;
+            // }
             var cache = this.cache;
             // 用 feature id 做缓存标识
             var cacheField = feature.id;
diff --git a/src/mapboxgl/overlay/theme/GeoFeatureThemeLayer.js b/src/mapboxgl/overlay/theme/GeoFeatureThemeLayer.js
@@ -101,13 +101,13 @@ export default class GeoFeature extends Theme {
 
         for (var i = 0, len = features.length; i < len; i++) {
             var feature = features[i];
-            var feaBounds = feature.geometry.getBounds();
-
-            //剔除当前视图（地理）范围以外的数据
-            if (extent) {
-                var bounds = new SuperMap.Bounds(extent.getWest(), extent.getSouth(), extent.getEast(), extent.getNorth());
-                // if (!bounds.intersectsBounds(feaBounds)) continue;
-            }
+            // var feaBounds = feature.geometry.getBounds();
+            //
+            // //剔除当前视图（地理）范围以外的数据
+            // if (extent) {
+            //     var bounds = new SuperMap.Bounds(extent.getWest(), extent.getSouth(), extent.getEast(), extent.getNorth());
+            //     // if (!bounds.intersectsBounds(feaBounds)) continue;
+            // }
 
             //缓存字段
             var fields = feature.id + "_zoom_" + cmZoom.toString();
diff --git a/src/mapboxgl/services/SpatialAnalystService.js b/src/mapboxgl/services/SpatialAnalystService.js
@@ -308,8 +308,6 @@ export default class SpatialAnalystService extends ServiceBase {
     }
 
     _processParams(params) {
-        var me = this;
-
         if (!params) {
             return {};
         }
diff --git a/src/openlayers/core/StyleUtils.js b/src/openlayers/core/StyleUtils.js
@@ -261,6 +261,7 @@ export default class StyleUtils {
                         style.fontSize = fontSize;
                     } else if (prop === "fontName") {
                         fontName = value;
+                        style.fontName = fontName;
                     } else {
                         if (prop === "globalCompositeOperation") {
                             value = StyleMap.CartoCompOpMap[value];

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ export var Event = SuperMap.Event = {`
`248`	`248`	`for (var i = elementObservers.length - 1; i >= 0; i--) {`
`249`	`249`	`var entry = elementObservers[i];`
`250`	`250`	`var args = new Array(entry.element, entry.name, entry.observer, entry.useCapture);`
`251`		`- var removed = SuperMap.Event.stopObserving.apply(this, args);`
	`251`	`+ SuperMap.Event.stopObserving.apply(this, args);`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`	`},`