From e4f2a7552e00c0de4a772471fd111f8704cb941e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 19 Dec 2013 11:43:56 +0100 Subject: [PATCH] Add getters to ol.style.Icon --- src/ol/renderer/canvas/canvasvectorlayerrenderer.js | 11 ++++++----- src/ol/style/iconstyle.js | 8 ++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index fbf000ad03..a6001644bd 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -151,7 +151,7 @@ ol.renderer.canvas.VectorLayer.prototype.getVectorLayer = function() { ol.renderer.canvas.VectorLayer.prototype.handleImageStyleChange_ = function(event) { var imageStyle = /** @type {ol.style.Image} */ (event.target); - if (imageStyle.imageState == ol.style.ImageState.LOADED) { + if (imageStyle.getImageState() == ol.style.ImageState.LOADED) { this.renderIfReadyAndVisible(); } }; @@ -246,16 +246,17 @@ ol.renderer.canvas.VectorLayer.prototype.renderFeature = style = styles[i]; imageStyle = style.getImage(); if (!goog.isNull(imageStyle)) { - if (imageStyle.imageState == ol.style.ImageState.IDLE) { + if (imageStyle.getImageState() == ol.style.ImageState.IDLE) { goog.events.listenOnce(imageStyle, goog.events.EventType.CHANGE, this.handleImageStyleChange_, false, this); imageStyle.load(); - } else if (imageStyle.imageState == ol.style.ImageState.LOADED) { + } else if (imageStyle.getImageState() == ol.style.ImageState.LOADED) { ol.renderer.vector.renderFeature( replayGroup, feature, style, squaredTolerance, feature); } - goog.asserts.assert(imageStyle.imageState != ol.style.ImageState.IDLE); - loading = imageStyle.imageState == ol.style.ImageState.LOADING; + goog.asserts.assert( + imageStyle.getImageState() != ol.style.ImageState.IDLE); + loading = imageStyle.getImageState() == ol.style.ImageState.LOADING; } else { ol.renderer.vector.renderFeature( replayGroup, feature, style, squaredTolerance, feature); diff --git a/src/ol/style/iconstyle.js b/src/ol/style/iconstyle.js index 2dfbb40c41..96b312ee92 100644 --- a/src/ol/style/iconstyle.js +++ b/src/ol/style/iconstyle.js @@ -174,6 +174,14 @@ ol.style.Icon.prototype.getHitDetectionImage = function(pixelRatio) { }; +/** + * @return {string|undefined} Image src. + */ +ol.style.Icon.prototype.getSrc = function() { + return this.src_; +}; + + /** * Load not yet loaded URI. */