From da2a291208a558063091fe86ddb20c659507f9d3 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 28 Aug 2014 17:21:41 +0200 Subject: [PATCH 1/2] ol.layer.Vector.getSource return type specialisation. --- src/ol/layer/vectorlayer.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vectorlayer.js index 5eb7aee294..2a8f5ff163 100644 --- a/src/ol/layer/vectorlayer.js +++ b/src/ol/layer/vectorlayer.js @@ -67,6 +67,14 @@ ol.layer.Vector.prototype.getRenderOrder = function() { }; +/** + * @function + * @return {ol.source.Vector} Source. + * @api stable + */ +ol.layer.Vector.prototype.getSource; + + /** * Get the style for features. This returns whatever was passed to the `style` * option at construction or to the `setStyle` method. From 4a21ad566aed6be3a9949dfd25dba43877cdfc9a Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 29 Aug 2014 08:55:47 +0200 Subject: [PATCH 2/2] Remove unnecessary type cast --- examples/gpx.js | 2 +- examples/kml.js | 2 +- src/ol/renderer/canvas/canvasvectorlayerrenderer.js | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/gpx.js b/examples/gpx.js index f1d748dce0..02361d7f3c 100644 --- a/examples/gpx.js +++ b/examples/gpx.js @@ -96,7 +96,7 @@ map.on('click', function(evt) { var exportGPXElement = document.getElementById('export-gpx'); if ('download' in exportGPXElement) { - var vectorSource = /** @type {ol.source.Vector} */ (vector.getSource()); + var vectorSource = vector.getSource(); exportGPXElement.addEventListener('click', function(e) { if (!exportGPXElement.href) { var features = []; diff --git a/examples/kml.js b/examples/kml.js index ca4c23ac96..b4ec38028b 100644 --- a/examples/kml.js +++ b/examples/kml.js @@ -63,7 +63,7 @@ map.on('click', function(evt) { var exportKMLElement = document.getElementById('export-kml'); if ('download' in exportKMLElement) { - var vectorSource = /** @type {ol.source.Vector} */ (vector.getSource()); + var vectorSource = vector.getSource(); exportKMLElement.addEventListener('click', function(e) { if (!exportKMLElement.href) { var features = []; diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index 4e90b9b973..e1a0ad69f2 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -11,7 +11,6 @@ goog.require('ol.render.EventType'); goog.require('ol.render.canvas.ReplayGroup'); goog.require('ol.renderer.canvas.Layer'); goog.require('ol.renderer.vector'); -goog.require('ol.source.Vector'); @@ -168,7 +167,6 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame = var vectorLayer = /** @type {ol.layer.Vector} */ (this.getLayer()); goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector); var vectorSource = vectorLayer.getSource(); - goog.asserts.assertInstanceof(vectorSource, ol.source.Vector); this.updateAttributions( frameState.attributions, vectorSource.getAttributions());