fix sonar

songyumeng · songyumeng · commit 458537033b57 · 2017-10-24T13:45:35.000+08:00
diff --git a/src/common/overlay/Point.js b/src/common/overlay/Point.js
@@ -155,7 +155,7 @@ export default  class Point 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;
             }
 
@@ -189,9 +189,9 @@ export default  class Point extends Graph {
         }
 
         // 数据范围检测未通过，清空图形
-        if (isDataEffective === false) {
-            this.shapes = [];
-        }
+        // if (isDataEffective === false) {
+        //     this.shapes = [];
+        // }
 
         // 重要步骤：将图形转为由相对坐标表示的图形，以便在地图平移缩放过程中快速重绘图形
         // （统计专题图模块从结构上要求使用相对坐标，assembleShapes() 函数必须在图形装配完成后调用 shapesConvertToRelativeCoordinate() 函数）
diff --git a/src/common/overlay/levelRenderer/Animation.js b/src/common/overlay/levelRenderer/Animation.js
@@ -81,7 +81,7 @@ export default class Animation extends Eventful {
         this.stage = options.stage || {};
 
         this.onframe = options.onframe || function () {
-        };
+            };
 
         // private properties
         this._clips = [];
@@ -552,12 +552,7 @@ SuperMap.LevelRenderer.Animation.Animator = class Animator {
             keyframes.sort(function (a, b) {
                 return a.time - b.time;
             });
-            var trackMaxTime;
-            if (trackLen) {
-                trackMaxTime = keyframes[trackLen - 1].time;
-            } else {
-                return;
-            }
+            var trackMaxTime = keyframes[trackLen - 1].time;
             // Percents of each keyframe
             var kfPercents = [];
             // Value of each keyframe
@@ -638,10 +633,10 @@ SuperMap.LevelRenderer.Animation.Animator = class Animator {
                     } else {
                         let value;
                         if (isValueColor) {
-                            value = SuperMap.LevelRenderer.Animation._catmullRomInterpolateArray(
-                                p0, p1, p2, p3, w, w * w, w * w * w,
-                                rgba, 1
-                            );
+                            // value = SuperMap.LevelRenderer.Animation._catmullRomInterpolateArray(
+                            //     p0, p1, p2, p3, w, w * w, w * w * w,
+                            //     rgba, 1
+                            // );
                             value = SuperMap.LevelRenderer.Animation.rgba2String(rgba);
                         } else {
                             value = SuperMap.LevelRenderer.Animation._catmullRomInterpolate(
diff --git a/src/common/overlay/levelRenderer/Area.js b/src/common/overlay/levelRenderer/Area.js
@@ -471,7 +471,7 @@ export default class Area {
         }
         var _l = Math.max(lineWidth, 5);
         var _a = 0;
-        var _b = x0;
+        var _b = 0;
         // Quick reject
         if (
             (y > y0 + _l && y > y1 + _l)
diff --git a/src/common/overlay/levelRenderer/Http.js b/src/common/overlay/levelRenderer/Http.js
@@ -36,12 +36,13 @@ export default class Http {
             url = obj.url;
             onsuccess = obj.onsuccess;
             onerror = obj.onerror;
-            opts = obj;
-        } else {
-            if (typeof(onerror) === 'object') {
-                opts = onerror;
-            }
+           // opts = obj;
         }
+        // else {
+        //     if (typeof(onerror) === 'object') {
+        //         opts = onerror;
+        //     }
+        // }
         /* jshint ignore:start */
         var xhr = window.XMLHttpRequest
             ? new XMLHttpRequest()
diff --git a/src/common/overlay/levelRenderer/Painter.js b/src/common/overlay/levelRenderer/Painter.js
@@ -297,14 +297,14 @@ export default class Painter {
             }
 
             // Stop group clipping
-            if (shape.__stopClip) {
+            if (ctx && shape.__stopClip) {
                 ctx.restore();
             }
 
             shape.__dirty = false;
         }
 
-        if (currentLayer && currentLayer.needTransform) {
+        if (ctx && currentLayer && currentLayer.needTransform) {
             ctx.restore();
         }
 
diff --git a/src/leaflet/mapping/TiledMapLayer.js b/src/leaflet/mapping/TiledMapLayer.js
@@ -301,7 +301,9 @@ export var TiledMapLayer = L.TileLayer.extend({
 
         //切片的起始参考点，默认为地图范围的左上角。
         var crs = me._crs;
-        if (crs.projection && crs.projection.bounds) {
+        if (crs.options && crs.options.origin) {
+            params["origin"] = JSON.stringify({x: crs.options.origin[0], y: crs.options.origin[1]});
+        }else if (crs.projection && crs.projection.bounds) {
             var bounds = crs.projection.bounds;
             var tileOrigin = L.point(bounds.min.x, bounds.max.y);
             params["origin"] = JSON.stringify({x: tileOrigin.x, y: tileOrigin.y});

Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ export default class Area {`
`471`	`471`	`}`
`472`	`472`	`var _l = Math.max(lineWidth, 5);`
`473`	`473`	`var _a = 0;`
`474`		`- var _b = x0;`
	`474`	`+ var _b = 0;`
`475`	`475`	`// Quick reject`
`476`	`476`	`if (`
`477`	`477`	`(y > y0 + _l && y > y1 + _l)`
Original file line number	Diff line number	Diff line change
`@@ -297,14 +297,14 @@ export default class Painter {`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`// Stop group clipping`
`300`		`- if (shape.__stopClip) {`
	`300`	`+ if (ctx && shape.__stopClip) {`
`301`	`301`	`ctx.restore();`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`shape.__dirty = false;`
`305`	`305`	`}`
`306`	`306`
`307`		`- if (currentLayer && currentLayer.needTransform) {`
	`307`	`+ if (ctx && currentLayer && currentLayer.needTransform) {`
`308`	`308`	`ctx.restore();`
`309`	`309`	`}`
`310`	`310`