ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1638 from elemoine/featureoverlay

Browse Source 
Rename ol.render.FeaturesOverlay to ol.FeatureOverlay
This commit is contained in:
Éric Lemoine
2014-02-06 18:00:09 +01:00
parent c6cc15fdc8 ceec3c985d
commit 57f77bb444
11 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/interaction/drawinteraction.js
View File

@@ -6,6 +6,7 @@ goog.require('goog.events.Event');
goog.require('ol.Collection');
goog.require('ol.Coordinate');
goog.require('ol.Feature');
goog.require('ol.FeatureOverlay');
goog.require('ol.Map');
goog.require('ol.MapBrowserEvent');
goog.require('ol.MapBrowserEvent.EventType');
@@ -17,7 +18,6 @@ goog.require('ol.geom.MultiPolygon');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.interaction.Interaction');
goog.require('ol.render.FeaturesOverlay');
goog.require('ol.source.Vector');
goog.require('ol.style.Circle');
goog.require('ol.style.Fill');
@@ -143,10 +143,10 @@ ol.interaction.Draw = function(opt_options) {
/**
* Draw overlay where are sketch features are drawn.
* @type {ol.render.FeaturesOverlay}
* @type {ol.FeatureOverlay}
* @private
*/
this.overlay_ = new ol.render.FeaturesOverlay();
this.overlay_ = new ol.FeatureOverlay();
this.overlay_.setStyleFunction(goog.isDef(opt_options.styleFunction) ?
opt_options.styleFunction : ol.interaction.Draw.defaultStyleFunction
);

2
src/ol/interaction/selectinteraction.exports
View File

@@ -1,3 +1,3 @@
@exportSymbol ol.interaction.Select
@exportProperty ol.interaction.Select.prototype.getFeaturesOverlay
@exportProperty ol.interaction.Select.prototype.getFeatureOverlay
@exportProperty ol.interaction.Select.prototype.setMap

16
src/ol/interaction/selectinteraction.js
View File

@@ -2,9 +2,9 @@ goog.provide('ol.interaction.Select');
goog.require('goog.array');
goog.require('goog.functions');
goog.require('ol.FeatureOverlay');
goog.require('ol.events.condition');
goog.require('ol.interaction.Interaction');
goog.require('ol.render.FeaturesOverlay');
@@ -67,20 +67,20 @@ ol.interaction.Select = function(options) {
/**
* @private
* @type {ol.render.FeaturesOverlay}
* @type {ol.FeatureOverlay}
*/
this.featuresOverlay_ = options.featuresOverlay;
this.featureOverlay_ = options.featureOverlay;
};
goog.inherits(ol.interaction.Select, ol.interaction.Interaction);
/**
* @return {ol.render.FeaturesOverlay} Features overlay.
* @return {ol.FeatureOverlay} Feature overlay.
* @todo stability experimental
*/
ol.interaction.Select.prototype.getFeaturesOverlay = function() {
return this.featuresOverlay_;
ol.interaction.Select.prototype.getFeatureOverlay = function() {
return this.featureOverlay_;
};
@@ -94,7 +94,7 @@ ol.interaction.Select.prototype.handleMapBrowserEvent =
}
var add = this.addCondition_(mapBrowserEvent);
var map = mapBrowserEvent.map;
var features = this.featuresOverlay_.getFeatures();
var features = this.featureOverlay_.getFeatures();
map.withFrozenRendering(
/**
* @this {ol.interaction.Select}
@@ -148,5 +148,5 @@ ol.interaction.Select.prototype.handleMapBrowserEvent =
*/
ol.interaction.Select.prototype.setMap = function(map) {
goog.base(this, 'setMap', map);
this.featuresOverlay_.setMap(map);
this.featureOverlay_.setMap(map);
};