优化例子 fix sonar

songyumeng · songyumeng · commit d1fcb1664725 · 2018-06-29T15:35:28.000+08:00
diff --git a/examples/openlayers/07_graphiclayer_clover.html b/examples/openlayers/07_graphiclayer_clover.html
@@ -140,21 +140,24 @@
             }
 
             map.once('postrender', function () {
+                var source = new ol.source.Graphic({
+                    graphics: graphics,
+                    render: "canvas",
+                    map: map,
+                    isHighLight: true
+                });
+                source.on('graphichighlighted', function (e) {
+                    if (e.value.graphic) {
+                        var coords = e.value.graphic.getGeometry().getCoordinates();
+                        content.innerHTML = resources.text_coordinate + ":[" + coords[0] + "," +
+                            coords[1] + "]";
+                        overlay.setPosition(coords);
+                        return;
+                    }
+                    overlay.setPosition(undefined);
+                });
                 var graphicLayer = new ol.layer.Image({
-                    source: new ol.source.Graphic({
-                        graphics: graphics,
-                        render:"canvas",
-                        map: map,
-                        onClick: function (graphic) {
-                            if (graphic) {
-                                var coords = graphic.getGeometry().getCoordinates();
-                                content.innerHTML = resources.text_coordinate + ":[" + coords[0] + "," + coords[1] + "]";
-                                overlay.setPosition(graphic.getGeometry().getCoordinates());
-                                return;
-                            }
-                            overlay.setPosition(undefined);
-                        }
-                    })
+                    source: source
                 });
                 map.addLayer(graphicLayer);
             })
diff --git a/examples/openlayers/07_graphiclayer_image.html b/examples/openlayers/07_graphiclayer_image.html
@@ -94,8 +94,8 @@
                 img.onload = function () {
                     var imageStyle = new ol.style.Icon(({
                         img: this,
-                        size: [20, 20],
-                        imgSize: [20, 20]
+                        size: [32, 32],
+                        imgSize: [32, 32]
                     }));
                     var features = Papa.parse(nycData, {skipEmptyLines: true, header: true}).data;
                     var counts = features.length;    //矢量点的个数
diff --git a/src/common/util/FetchRequest.js b/src/common/util/FetchRequest.js
@@ -301,9 +301,6 @@ SuperMap.Util.RequestJSONPPromise = {
                 if (keysCount == 0) {
                     return false;
                 }
-                if (splitQuestUrl == null) {
-                    splitQuestUrl = new Array();
-                }
                 splitQuestUrl.push(sectionURL);
                 sectionURL = url;
                 keysCount = 0;
@@ -331,9 +328,6 @@ SuperMap.Util.RequestJSONPPromise = {
                         sectionURL += me.queryKeys[i] + "=" + tempLeftValue;
                         leftValue = leftValue.substring(leftLength);
                         if (tempLeftValue.length > 0) {
-                            if (splitQuestUrl == null) {
-                                splitQuestUrl = new Array();
-                            }
                             splitQuestUrl.push(sectionURL);
                             sectionURL = url;
                             keysCount = 0;
@@ -350,9 +344,6 @@ SuperMap.Util.RequestJSONPPromise = {
                 }
             }
         }
-        if (splitQuestUrl == null) {
-            splitQuestUrl = new Array();
-        }
         splitQuestUrl.push(sectionURL);
         me.send(splitQuestUrl, "SuperMap.Util.RequestJSONPPromise.supermap_callbacks[" + uid + "]", config && config.proxy);
         return p;
diff --git a/src/leaflet/overlay/dataflow/MapvRenderer.js b/src/leaflet/overlay/dataflow/MapvRenderer.js
@@ -114,11 +114,10 @@ export var MapvRenderer = MapVLayer.extend({
         };
         mapvOps.strokeStyle = options.color;
         mapvOps.lineWidth = options.width;
-        mapvOps.globalAlpha = options.opacity;
+        mapvOps.globalAlpha = options.fillOpacity || options.opacity;
         mapvOps.lineCap = options.lineCap;
         mapvOps.lineJoin = options.lineJoin;
         mapvOps.fillStyle = options.fillColor;
-        mapvOps.globalAlpha = options.fillOpacity;
         mapvOps.size = options.radius;
         return mapvOps;
     }
diff --git a/src/openlayers/overlay/vectortile/olExtends.js b/src/openlayers/overlay/vectortile/olExtends.js
@@ -75,15 +75,17 @@ export var olExtends = function (targetMap) {
                     geometryType === ol.geom.GeometryType.MULTI_LINE_STRING ? new ol.geom.MultiLineString(null) :
                     null;
             }
-            geom.setFlatCoordinates(ol.geom.GeometryLayout.XY, flatCoordinates, ends);
-            feature = new this.featureClass_();
-            if (this.geometryName_) {
-                feature.setGeometryName(this.geometryName_);
+            if (geom) {
+                geom.setFlatCoordinates(ol.geom.GeometryLayout.XY, flatCoordinates, ends);
+                feature = new this.featureClass_();
+                if (this.geometryName_) {
+                    feature.setGeometryName(this.geometryName_);
+                }
+                var geometry = ol.format.Feature.transformWithOptions(geom, false, this.adaptOptions(opt_options));
+                feature.setGeometry(geometry);
+                feature.setId(id);
+                feature.setProperties(values);
             }
-            var geometry = ol.format.Feature.transformWithOptions(geom, false, this.adaptOptions(opt_options));
-            feature.setGeometry(geometry);
-            feature.setId(id);
-            feature.setProperties(values);
         }
 
         return feature;
