Commit 5bfdca6
committed
升级openlayers到 4.6.4,增加MVT示例避让参数。review by zhurongchang.
1 parent 6141457 commit 5bfdca6
4 files changed
Lines changed: 23 additions & 16 deletions
File tree
- examples/openlayers
- libs/openlayers
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,6 +27,8 @@ | |||
| 27 | 27 | var vectorTileOptions = ol.source.VectorTileSuperMapRest.optionsFromMapJSON(url, serviceResult.result); | |
| 28 | 28 | vectorTileOptions.format = new ol.format.MVT({featureClass: ol.Feature}); | |
| 29 | 29 | var vectorLayer = new ol.layer.VectorTile({ | |
| 30 | + //设置避让参数 | ||
| 31 | + declutter: true, | ||
| 30 | 32 | source: new ol.source.VectorTileSuperMapRest(vectorTileOptions), | |
| 31 | 33 | style: vectorTileStyles.getFeatureStyle | |
| 32 | 34 | }); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,9 +3,7 @@ | |||
| 3 | 3 | <head> | |
| 4 | 4 | <meta charset="UTF-8"> | |
| 5 | 5 | <title>iServer MVT矢量瓦片(4326坐标系)</title> | |
| 6 | - <script type="text/javascript" src="http://openlayers.org/en/latest/css/ol.css"></script> | ||
| 7 | - <script type="text/javascript" src="http://openlayers.org/en/latest/build/ol-debug.js"></script> | ||
| 8 | - <script type="text/javascript" src="../../dist/iclient9-openlayers.js"></script> | ||
| 6 | + <script type="text/javascript" src="../../dist/include-openlayers.js"></script> | ||
| 9 | 7 | </head> | |
| 10 | 8 | <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%"> | |
| 11 | 9 | <div id="map" style="margin:0 auto;width: 100%;height: 100%;border: 1px solid #dddddd"></div> | |
@@ -28,12 +26,9 @@ | |||
| 28 | 26 | } | |
| 29 | 27 | var vectorTileStyles = new ol.supermap.VectorTileStyles(stylesOptions); | |
| 30 | 28 | var vectorTileOptions = ol.source.VectorTileSuperMapRest.optionsFromMapJSON(url, serviceResult.result); | |
| 31 | - vectorTileOptions.format = new ol.format.MVT({featureClass: ol.Feature}); | ||
| 32 | - vectorTileOptions.format.defaultDataProjection = new ol.proj.Projection({ | ||
| 33 | - code: '', | ||
| 34 | - units: ol.proj.Units.TILE_PIXELS | ||
| 35 | - }); | ||
| 36 | 29 | var vectorLayer = new ol.layer.VectorTile({ | |
| 30 | + //设置避让参数 | ||
| 31 | + declutter: true, | ||
| 37 | 32 | source: new ol.source.VectorTileSuperMapRest(vectorTileOptions), | |
| 38 | 33 | style: vectorTileStyles.getFeatureStyle | |
| 39 | 34 | }); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,6 @@ | |||
| 1 | 1 | // OpenLayers. See https://openlayers.org/ | |
| 2 | 2 | // License: https://raw.githubusercontent.com/openlayers/openlayers/master/LICENSE.md | |
| 3 | - // Version: v4.6.3 | ||
| 3 | + // Version: v4.6.4 | ||
| 4 | 4 | ;(function (root, factory) { | |
| 5 | 5 | if (typeof exports === "object") { | |
| 6 | 6 | module.exports = factory(); | |
@@ -25609,6 +25609,7 @@ goog.require('ol'); | |||
| 25609 | 25609 | goog.require('ol.ImageCanvas'); | |
| 25610 | 25610 | goog.require('ol.LayerType'); | |
| 25611 | 25611 | goog.require('ol.ViewHint'); | |
| 25612 | + goog.require('ol.array'); | ||
| 25612 | 25613 | goog.require('ol.extent'); | |
| 25613 | 25614 | goog.require('ol.layer.VectorRenderType'); | |
| 25614 | 25615 | goog.require('ol.obj'); | |
@@ -25640,6 +25641,11 @@ ol.renderer.canvas.ImageLayer = function(imageLayer) { | |||
| 25640 | 25641 | */ | |
| 25641 | 25642 | this.imageTransform_ = ol.transform.create(); | |
| 25642 | 25643 | ||
| 25644 | + /** | ||
| 25645 | + * @type {!Array.<string>} | ||
| 25646 | + */ | ||
| 25647 | + this.skippedFeatures_ = []; | ||
| 25648 | + | ||
| 25643 | 25649 | /** | |
| 25644 | 25650 | * @private | |
| 25645 | 25651 | * @type {ol.renderer.canvas.VectorLayer} | |
@@ -25744,11 +25750,15 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame = function(frameState, laye | |||
| 25744 | 25750 | rotation: 0 | |
| 25745 | 25751 | })) | |
| 25746 | 25752 | })); | |
| 25747 | - if (vectorRenderer.prepareFrame(imageFrameState, layerState) && vectorRenderer.replayGroupChanged) { | ||
| 25753 | + var skippedFeatures = Object.keys(imageFrameState.skippedFeatureUids).sort(); | ||
| 25754 | + if (vectorRenderer.prepareFrame(imageFrameState, layerState) && | ||
| 25755 | + (vectorRenderer.replayGroupChanged || | ||
| 25756 | + !ol.array.equals(skippedFeatures, this.skippedFeatures_))) { | ||
| 25748 | 25757 | context.canvas.width = imageFrameState.size[0] * pixelRatio; | |
| 25749 | 25758 | context.canvas.height = imageFrameState.size[1] * pixelRatio; | |
| 25750 | 25759 | vectorRenderer.composeFrame(imageFrameState, layerState, context); | |
| 25751 | 25760 | this.image_ = new ol.ImageCanvas(renderedExtent, viewResolution, pixelRatio, context.canvas); | |
| 25761 | + this.skippedFeatures_ = skippedFeatures; | ||
| 25752 | 25762 | } | |
| 25753 | 25763 | } else { | |
| 25754 | 25764 | image = imageSource.getImage( | |
@@ -96439,7 +96449,7 @@ goog.exportProperty( | |||
| 96439 | 96449 | ol.control.ZoomToExtent.prototype, | |
| 96440 | 96450 | 'un', | |
| 96441 | 96451 | ol.control.ZoomToExtent.prototype.un); | |
| 96442 | - ol.VERSION = 'v4.6.3'; | ||
| 96452 | + ol.VERSION = 'v4.6.4'; | ||
| 96443 | 96453 | OPENLAYERS.ol = ol; | |
| 96444 | 96454 | ||
| 96445 | 96455 | return OPENLAYERS.ol; | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments