From 475be37ef4c33a732fbe463e1d142b6016b27ec1 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Mon, 28 Apr 2014 13:49:14 +0200 Subject: [PATCH 1/4] Remove unused local variable --- src/ol/featureoverlay.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/featureoverlay.js b/src/ol/featureoverlay.js index ade310c5c9..2279effe19 100644 --- a/src/ol/featureoverlay.js +++ b/src/ol/featureoverlay.js @@ -153,7 +153,7 @@ ol.FeatureOverlay.prototype.handleMapPostCompose_ = function(event) { } var resolution = event.frameState.view2DState.resolution; var vectorContext = event.vectorContext; - var i, ii, feature, styles; + var i, ii, styles; this.features_.forEach(function(feature) { styles = styleFunction(feature, resolution); if (!goog.isDefAndNotNull(styles)) { From a5620fa46a76fb3247611602823e3c948dac1d95 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Mon, 28 Apr 2014 13:50:39 +0200 Subject: [PATCH 2/4] Remove unneeded function binding --- src/ol/featureoverlay.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/featureoverlay.js b/src/ol/featureoverlay.js index 2279effe19..420a7e7430 100644 --- a/src/ol/featureoverlay.js +++ b/src/ol/featureoverlay.js @@ -163,7 +163,7 @@ ol.FeatureOverlay.prototype.handleMapPostCompose_ = function(event) { for (i = 0; i < ii; ++i) { vectorContext.drawFeature(feature, styles[i]); } - }, this); + }); }; From 90c0944617eb53b78ededb6141912531c1fdc6ea Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Mon, 28 Apr 2014 12:45:19 +0200 Subject: [PATCH 3/4] Fix coding style --- src/ol/featureoverlay.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ol/featureoverlay.js b/src/ol/featureoverlay.js index 420a7e7430..255264b2d4 100644 --- a/src/ol/featureoverlay.js +++ b/src/ol/featureoverlay.js @@ -113,8 +113,7 @@ ol.FeatureOverlay.prototype.handleFeatureChange_ = function() { * @private * @param {ol.CollectionEvent} collectionEvent Collection event. */ -ol.FeatureOverlay.prototype.handleFeaturesAdd_ = - function(collectionEvent) { +ol.FeatureOverlay.prototype.handleFeaturesAdd_ = function(collectionEvent) { goog.asserts.assert(!goog.isNull(this.featureChangeListenerKeys_)); var feature = /** @type {ol.Feature} */ (collectionEvent.element); this.featureChangeListenerKeys_[goog.getUid(feature).toString()] = @@ -128,8 +127,7 @@ ol.FeatureOverlay.prototype.handleFeaturesAdd_ = * @private * @param {ol.CollectionEvent} collectionEvent Collection event. */ -ol.FeatureOverlay.prototype.handleFeaturesRemove_ = - function(collectionEvent) { +ol.FeatureOverlay.prototype.handleFeaturesRemove_ = function(collectionEvent) { goog.asserts.assert(!goog.isNull(this.featureChangeListenerKeys_)); var feature = /** @type {ol.Feature} */ (collectionEvent.element); var key = goog.getUid(feature).toString(); From b41ee35422b1015c4b321bff3c0371515d65a77b Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Mon, 28 Apr 2014 12:51:24 +0200 Subject: [PATCH 4/4] Use features.forEach instead of for loop --- src/ol/featureoverlay.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/ol/featureoverlay.js b/src/ol/featureoverlay.js index 255264b2d4..08fbcacf52 100644 --- a/src/ol/featureoverlay.js +++ b/src/ol/featureoverlay.js @@ -208,15 +208,11 @@ ol.FeatureOverlay.prototype.setFeatures = function(features) { this.handleFeaturesRemove_, false, this) ]; this.featureChangeListenerKeys_ = {}; - var featuresArray = features.getArray(); - var i, ii = featuresArray.length; - var feature; - for (i = 0; i < ii; ++i) { - feature = featuresArray[i]; + features.forEach(function(feature) { this.featureChangeListenerKeys_[goog.getUid(feature).toString()] = goog.events.listen(feature, goog.events.EventType.CHANGE, this.handleFeatureChange_, false, this); - } + }, this); } this.render_(); };