解决iclient9的sonar blocker问题。review by zhurch

chenmeiyiSupermap · chenmeiyiSupermap · commit 23d522d4a027 · 2017-04-26T16:10:29.000+08:00
diff --git a/src/common/iServer/AreaSolarRadiationService.js b/src/common/iServer/AreaSolarRadiationService.js
@@ -61,7 +61,7 @@ SuperMap.REST.AreaSolarRadiationService = SuperMap.Class(SuperMap.REST.SpatialAn
 
         var parameterObject = new Object();
 
-        if (parameter instanceof AreaSolarRadiationService) {
+        if (parameter instanceof SuperMap.AreaSolarRadiationParameter) {
             me.url += 'datasets/' + parameter.dataset + '/solarradiation';
         }
 
diff --git a/src/common/iServer/ChartQueryService.js b/src/common/iServer/ChartQueryService.js
@@ -96,6 +96,7 @@ SuperMap.REST.ChartQueryService = SuperMap.Class(SuperMap.ServiceBase, {
      *
      */
     destroy: function () {
+        var me = this;
         SuperMap.ServiceBase.prototype.destroy.apply(this, arguments);
         me.returnContent = null;
         me.format = null;
diff --git a/src/common/iServer/ThemeGraph.js b/src/common/iServer/ThemeGraph.js
@@ -359,7 +359,7 @@ SuperMap.ThemeGraph.fromObj = function (obj) {
     res.graphText = SuperMap.ThemeGraphText.fromObj(obj);
     res.offset = SuperMap.ThemeOffset.fromObj(obj);
     for (var i = 0; i < len; i++) {
-        res.items.push(ThemeGraphItem.fromObj(itemsG[i]));
+        res.items.push(SuperMap.ThemeGraphItem.fromObj(itemsG[i]));
     }
     return res;
 };
diff --git a/src/leaflet/overlay/TileVectorLayer.js b/src/leaflet/overlay/TileVectorLayer.js
@@ -40,7 +40,7 @@ TileVectorLayer = L.VectorGrid.extend({
 
         me.options.url = url;
         if (url && url.indexOf("/") === (url.length - 1)) {
-            url = url.substr(0, str.length - 1);
+            url = url.substr(0, url.length - 1);
             me.options.url = url;
         }
         me._initLayerUrl();
@@ -283,7 +283,7 @@ TileVectorLayer = L.VectorGrid.extend({
         me.resolutions = me._resolutionsFromScales(me.scales);
         var len = me.resolutions.length;
         me.scales = [len];
-        for (i = 0; i < len; i++) {
+        for (var i = 0; i < len; i++) {
             me.scales[i] = SuperMap.Util.getScaleFromResolutionDpi(
                 me.resolutions[i], me.dpi, me.units, me.datumAxis
             );
diff --git a/src/leaflet/overlay/carto/CartoCSSToLeaflet.js b/src/leaflet/overlay/carto/CartoCSSToLeaflet.js
@@ -123,7 +123,7 @@ L.supermap.CartoCSSToLeaflet = {
             return style;
         }
         if (type === "POINT") {
-            size = Math.ceil(shader.markerSize * SuperMap.DOTS_PER_INCH * SuperMap.INCHES_PER_UNIT["mm"]) || 8;
+            var size = Math.ceil(shader.markerSize * SuperMap.DOTS_PER_INCH * SuperMap.INCHES_PER_UNIT["mm"]) || 8;
             var symbolParameters = {
                 "transparent": true,
                 "resourceType": "SYMBOLMARKER",
@@ -136,7 +136,7 @@ L.supermap.CartoCSSToLeaflet = {
             return style;
         }
         if (type === "TEXT") {
-            shader = feature.properties.textStyle || layerStyle;
+            shader = feature.properties.textStyle || layerInfo.layerStyle;
             //设置文本是否使用粗体
             style.fontWeight = shader.bold ? shader.fontWeight : "normal";
             //设置文本的尺寸（对应fontHeight属性）和行高，行高iserver不支持，默认5像素
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -95,7 +95,7 @@ ol.supermap.WebMap.prototype.createMap = function (options) {
 ol.supermap.WebMap.prototype.getResolutionsFromScales = function (scales, dpi, units, datum) {
     var resolutions = [];
     for (var i = 0; i < scales.length; i++) {
-        resolutions.push(L.Util.GetResolutionFromScaleDpi(scales[i], dpi, units, datum))
+        resolutions.push(SuperMap.Util.GetResolutionFromScaleDpi(scales[i], dpi, units, datum))
     }
     return resolutions;
 };
@@ -238,7 +238,7 @@ ol.supermap.WebMap.prototype.createTiandituLayer = function (layerInfo, epsgCode
         if (type == "ter")type = "cta"
     }
     tdtURL = tdtURL.replace("{type}", type).replace("{proj}", proj);
-    layer = new ol.layer.Tile({
+    var layer = new ol.layer.Tile({
         source: new ol.source.Tianditu({
             url: tdtURL,
             matrixSet: proj,
@@ -290,7 +290,7 @@ ol.supermap.WebMap.prototype.createVectorLayer = function (layerInfo) {
         for (var setNameIndex = 0; setNameIndex < datasets.length; setNameIndex++) {
             var dataset = datasets[setNameIndex];
             if (dataset.visible) {
-                var sqlParam = new GetFeaturesBySQLParameters({
+                var sqlParam = new SuperMap.GetFeaturesBySQLParameters({
                     queryParameter: {
                         name: dataset.name + "@" + datasourceName,
                         attributeFilter: "SMID >0"
diff --git a/src/openlayers/services/SetLayerService.js b/src/openlayers/services/SetLayerService.js
@@ -9,7 +9,7 @@ require('../../common/iServer/SetLayerStatusService');
 
 ol.supermap.SetLayerService = function (url, options) {
     ol.supermap.ServiceBase.call(this, url, options);
-    var end = this.options.url.substr(me.options.url.length - 1, 1);
+    var end = this.options.url.substr(this.options.url.length - 1, 1);
     this.options.url += (end === "/") ? '' : '/';
 
 };

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ SuperMap.REST.AreaSolarRadiationService = SuperMap.Class(SuperMap.REST.SpatialAn`
`61`	`61`
`62`	`62`	`var parameterObject = new Object();`
`63`	`63`
`64`		`- if (parameter instanceof AreaSolarRadiationService) {`
	`64`	`+ if (parameter instanceof SuperMap.AreaSolarRadiationParameter) {`
`65`	`65`	`me.url += 'datasets/' + parameter.dataset + '/solarradiation';`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ SuperMap.REST.ChartQueryService = SuperMap.Class(SuperMap.ServiceBase, {`
`96`	`96`	`*`
`97`	`97`	`*/`
`98`	`98`	`destroy: function () {`
	`99`	`+ var me = this;`
`99`	`100`	`SuperMap.ServiceBase.prototype.destroy.apply(this, arguments);`
`100`	`101`	`me.returnContent = null;`
`101`	`102`	`me.format = null;`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ SuperMap.ThemeGraph.fromObj = function (obj) {`
`359`	`359`	`res.graphText = SuperMap.ThemeGraphText.fromObj(obj);`
`360`	`360`	`res.offset = SuperMap.ThemeOffset.fromObj(obj);`
`361`	`361`	`for (var i = 0; i < len; i++) {`
`362`		`- res.items.push(ThemeGraphItem.fromObj(itemsG[i]));`
	`362`	`+ res.items.push(SuperMap.ThemeGraphItem.fromObj(itemsG[i]));`
`363`	`363`	`}`
`364`	`364`	`return res;`
`365`	`365`	`};`