From f9b6eabfef0d683b988e5fbae52e22887fa77143 Mon Sep 17 00:00:00 2001 From: Antoine Abt Date: Fri, 7 Feb 2014 15:09:36 +0100 Subject: [PATCH] %s/render.FeaturesOverlay/FeatureOverlay/ --- examples/modify-features.js | 8 ++++---- src/objectliterals.jsdoc | 2 +- src/ol/featureoverlay.js | 2 +- src/ol/interaction/modifyinteraction.js | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/modify-features.js b/examples/modify-features.js index 21b4727c0c..f29c5a82a8 100644 --- a/examples/modify-features.js +++ b/examples/modify-features.js @@ -1,3 +1,4 @@ +goog.require('ol.FeatureOverlay'); goog.require('ol.Map'); goog.require('ol.RendererHint'); goog.require('ol.View2D'); @@ -7,7 +8,6 @@ goog.require('ol.interaction.Modify'); goog.require('ol.interaction.Select'); goog.require('ol.layer.Tile'); goog.require('ol.layer.Vector'); -goog.require('ol.render.FeaturesOverlay'); goog.require('ol.source.GeoJSON'); goog.require('ol.source.MapQuest'); goog.require('ol.style.Circle'); @@ -234,12 +234,12 @@ var overlayStyle = (function() { }; })(); -var overlay = new ol.render.FeaturesOverlay({ +var overlay = new ol.FeatureOverlay({ styleFunction: overlayStyle }); -var modify = new ol.interaction.Modify({ featuresOverlay: overlay }); -var select = new ol.interaction.Select({ featuresOverlay: overlay }); +var modify = new ol.interaction.Modify({ featureOverlay: overlay }); +var select = new ol.interaction.Select({ featureOverlay: overlay }); var map = new ol.Map({ interactions: ol.interaction.defaults().extend([select, modify]), diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index 1bd4f39684..fac35947f4 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -438,7 +438,7 @@ * @typedef {Object} olx.interaction.ModifyOptions * @property {number|undefined} pixelTolerance Pixel tolerance for considering * the pointer close enough to a vertex for editing. Default is 20 pixels. - * @property {ol.render.FeaturesOverlay} featuresOverlay Features overlay. + * @property {ol.FeatureOverlay} featureOverlay Features overlay. */ /** diff --git a/src/ol/featureoverlay.js b/src/ol/featureoverlay.js index bd776851ff..ccc5f68b45 100644 --- a/src/ol/featureoverlay.js +++ b/src/ol/featureoverlay.js @@ -250,6 +250,6 @@ ol.FeatureOverlay.prototype.setStyleFunction = function(styleFunction) { /** * @return {ol.feature.StyleFunction|undefined} Style function. */ -ol.render.FeaturesOverlay.prototype.getStyleFunction = function() { +ol.FeatureOverlay.prototype.getStyleFunction = function() { return this.styleFunction_; }; diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modifyinteraction.js index f550c54e42..cee3d5bf42 100644 --- a/src/ol/interaction/modifyinteraction.js +++ b/src/ol/interaction/modifyinteraction.js @@ -5,6 +5,7 @@ goog.require('goog.asserts'); goog.require('ol.Collection'); goog.require('ol.CollectionEventType'); goog.require('ol.Feature'); +goog.require('ol.FeatureOverlay'); goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.ViewHint'); goog.require('ol.coordinate'); @@ -16,7 +17,6 @@ goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); goog.require('ol.interaction.Drag'); -goog.require('ol.render.FeaturesOverlay'); goog.require('ol.structs.RBush'); goog.require('ol.style.Style'); @@ -83,10 +83,10 @@ ol.interaction.Modify = function(options) { /** * Draw overlay where are sketch features are drawn. - * @type {ol.render.FeaturesOverlay} + * @type {ol.FeatureOverlay} * @private */ - this.overlay_ = options.featuresOverlay; + this.overlay_ = options.featureOverlay; this.overlay_.getFeatures().listen(ol.CollectionEventType.ADD, this.addFeature_, false, this);