升级openlayers到 4.6.4,增加MVT示例避让参数。review by zhurongchang.

tangqinGiser · tangqinGiser · commit 5bfdca65c714 · 2017-12-19T09:48:25.000+08:00
diff --git a/examples/openlayers/mvtVectorLayer.html b/examples/openlayers/mvtVectorLayer.html
@@ -27,6 +27,8 @@
         var vectorTileOptions = ol.source.VectorTileSuperMapRest.optionsFromMapJSON(url, serviceResult.result);
         vectorTileOptions.format = new ol.format.MVT({featureClass: ol.Feature});
         var vectorLayer = new ol.layer.VectorTile({
+            //设置避让参数
+            declutter: true,
             source: new ol.source.VectorTileSuperMapRest(vectorTileOptions),
             style: vectorTileStyles.getFeatureStyle
         });
diff --git a/examples/openlayers/mvtVectorLayer4326.html b/examples/openlayers/mvtVectorLayer4326.html
@@ -3,9 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>iServer MVT矢量瓦片(4326坐标系)</title>
-    <script type="text/javascript" src="http://openlayers.org/en/latest/css/ol.css"></script>
-    <script type="text/javascript" src="http://openlayers.org/en/latest/build/ol-debug.js"></script>
-    <script type="text/javascript" src="../../dist/iclient9-openlayers.js"></script>
+    <script type="text/javascript" src="../../dist/include-openlayers.js"></script>
 </head>
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%">
 <div id="map" style="margin:0 auto;width: 100%;height: 100%;border: 1px solid #dddddd"></div>
@@ -28,12 +26,9 @@
         }
         var vectorTileStyles = new ol.supermap.VectorTileStyles(stylesOptions);
         var vectorTileOptions = ol.source.VectorTileSuperMapRest.optionsFromMapJSON(url, serviceResult.result);
-        vectorTileOptions.format = new ol.format.MVT({featureClass: ol.Feature});
-        vectorTileOptions.format.defaultDataProjection = new ol.proj.Projection({
-            code: '',
-            units: ol.proj.Units.TILE_PIXELS
-        });
         var vectorLayer = new ol.layer.VectorTile({
+            //设置避让参数
+            declutter: true,
             source: new ol.source.VectorTileSuperMapRest(vectorTileOptions),
             style: vectorTileStyles.getFeatureStyle
         });
diff --git a/libs/openlayers/ol-debug.js b/libs/openlayers/ol-debug.js
@@ -1,6 +1,6 @@
 // OpenLayers. See https://openlayers.org/
 // License: https://raw.githubusercontent.com/openlayers/openlayers/master/LICENSE.md
-// Version: v4.6.3
+// Version: v4.6.4
 ;(function (root, factory) {
   if (typeof exports === "object") {
     module.exports = factory();
@@ -25609,6 +25609,7 @@ goog.require('ol');
 goog.require('ol.ImageCanvas');
 goog.require('ol.LayerType');
 goog.require('ol.ViewHint');
+goog.require('ol.array');
 goog.require('ol.extent');
 goog.require('ol.layer.VectorRenderType');
 goog.require('ol.obj');
@@ -25640,6 +25641,11 @@ ol.renderer.canvas.ImageLayer = function(imageLayer) {
    */
   this.imageTransform_ = ol.transform.create();
 
+  /**
+   * @type {!Array.<string>}
+   */
+  this.skippedFeatures_ = [];
+
   /**
    * @private
    * @type {ol.renderer.canvas.VectorLayer}
@@ -25744,11 +25750,15 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame = function(frameState, laye
           rotation: 0
         }))
       }));
-      if (vectorRenderer.prepareFrame(imageFrameState, layerState) && vectorRenderer.replayGroupChanged) {
+      var skippedFeatures = Object.keys(imageFrameState.skippedFeatureUids).sort();
+      if (vectorRenderer.prepareFrame(imageFrameState, layerState) &&
+          (vectorRenderer.replayGroupChanged ||
+          !ol.array.equals(skippedFeatures, this.skippedFeatures_))) {
         context.canvas.width = imageFrameState.size[0] * pixelRatio;
         context.canvas.height = imageFrameState.size[1] * pixelRatio;
         vectorRenderer.composeFrame(imageFrameState, layerState, context);
         this.image_ = new ol.ImageCanvas(renderedExtent, viewResolution, pixelRatio, context.canvas);
+        this.skippedFeatures_ = skippedFeatures;
       }
     } else {
       image = imageSource.getImage(
@@ -96439,7 +96449,7 @@ goog.exportProperty(
     ol.control.ZoomToExtent.prototype,
     'un',
     ol.control.ZoomToExtent.prototype.un);
-ol.VERSION = 'v4.6.3';
+ol.VERSION = 'v4.6.4';
 OPENLAYERS.ol = ol;
 
   return OPENLAYERS.ol;
diff --git a/libs/openlayers/ol.js b/libs/openlayers/ol.js
