From 9af01c515f916615b6822b0aeb88fdcf349213c6 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Tue, 16 May 2017 22:57:03 +0200 Subject: [PATCH] Make ol.VectorTile#getFeatures and #getProjection exportable --- src/ol/renderer/canvas/vectortilelayer.js | 3 ++- src/ol/typedefs.js | 6 ++++-- src/ol/vectortile.js | 7 ++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/ol/renderer/canvas/vectortilelayer.js b/src/ol/renderer/canvas/vectortilelayer.js index 2f4a026b09..65afef3403 100644 --- a/src/ol/renderer/canvas/vectortilelayer.js +++ b/src/ol/renderer/canvas/vectortilelayer.js @@ -108,7 +108,8 @@ ol.renderer.canvas.VectorTileLayer.prototype.createReplayGroup_ = function( var pixelRatio = frameState.pixelRatio; var projection = frameState.viewState.projection; var revision = layer.getRevision(); - var renderOrder = layer.getRenderOrder() || null; + var renderOrder = /** @type {ol.RenderOrderFunction} */ + (layer.getRenderOrder()) || null; var replayState = tile.getReplayState(); if (!replayState.dirty && replayState.renderedRevision == revision && diff --git a/src/ol/typedefs.js b/src/ol/typedefs.js index 9d2be5fe1e..c6bb11c223 100644 --- a/src/ol/typedefs.js +++ b/src/ol/typedefs.js @@ -453,9 +453,11 @@ ol.RegularShapeRenderOptions; /** * A function to be used when sorting features before rendering. - * It takes two instances of {@link ol.Feature} and returns a `{number}`. + * It takes two instances of {@link ol.Feature} or {@link ol.render.Feature} and + * returns a `{number}`. * - * @typedef {function(ol.Feature, ol.Feature):number} + * @typedef {function((ol.Feature|ol.render.Feature), (ol.Feature|ol.render.Feature)): + * number} */ ol.RenderOrderFunction; diff --git a/src/ol/vectortile.js b/src/ol/vectortile.js index 11fa1f8f05..be1ece56c9 100644 --- a/src/ol/vectortile.js +++ b/src/ol/vectortile.js @@ -77,7 +77,10 @@ ol.VectorTile.prototype.getFormat = function() { /** - * @return {Array.} Features. + * Get the features for this tile. Geometries will be in the projection returned + * by {@link #getProjection}. + * @return {Array.} Features. + * @api */ ol.VectorTile.prototype.getFeatures = function() { return this.features_; @@ -93,7 +96,9 @@ ol.VectorTile.prototype.getKey = function() { /** + * Get the feature projection of features returned by {@link #getFeatures}. * @return {ol.proj.Projection} Feature projection. + * @api */ ol.VectorTile.prototype.getProjection = function() { return this.projection_;