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

Merge pull request #1922 from elemoine/modify

Browse Source 
Fixes to modify interaction
This commit is contained in:
Éric Lemoine
2014-03-28 16:43:05 +01:00
parent b2e4c4bc1a c82d5ba88e
commit 2add376113
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/modifyinteraction.js
+6 -11
View File
@@ -80,7 +80,7 @@ ol.interaction.Modify = function(options) {
* @type {Object.<*, ol.structs.RBush>} * @type {Object.<*, ol.structs.RBush>}
* @private * @private
*/ */
this.rBush_ = null; this.rBush_ = new ol.structs.RBush();
/** /**
* @type {number} * @type {number}
@@ -110,6 +110,7 @@ ol.interaction.Modify = function(options) {
*/ */
this.features_ = options.features; this.features_ = options.features;
this.features_.forEach(this.addFeature_, this);
goog.events.listen(this.features_, ol.CollectionEventType.ADD, goog.events.listen(this.features_, ol.CollectionEventType.ADD,
this.addFeature_, false, this); this.addFeature_, false, this);
goog.events.listen(this.features_, ol.CollectionEventType.REMOVE, goog.events.listen(this.features_, ol.CollectionEventType.REMOVE,
@@ -139,15 +140,6 @@ goog.inherits(ol.interaction.Modify, ol.interaction.Pointer);
* @inheritDoc * @inheritDoc
*/ */
ol.interaction.Modify.prototype.setMap = function(map) { ol.interaction.Modify.prototype.setMap = function(map) {
if (!goog.isNull(map)) {
if (goog.isNull(this.rBush_)) {
this.rBush_ = new ol.structs.RBush();
}
} else {
// removing from a map, clean up
this.rBush_ = null;
}
this.overlay_.setMap(map); this.overlay_.setMap(map);
goog.base(this, 'setMap', map); goog.base(this, 'setMap', map);
}; };
@@ -164,7 +156,10 @@ ol.interaction.Modify.prototype.addFeature_ = function(evt) {
if (goog.isDef(this.SEGMENT_WRITERS_[geometry.getType()])) { if (goog.isDef(this.SEGMENT_WRITERS_[geometry.getType()])) {
this.SEGMENT_WRITERS_[geometry.getType()].call(this, feature, geometry); this.SEGMENT_WRITERS_[geometry.getType()].call(this, feature, geometry);
} }
this.handlePointerAtPixel_(this.lastPixel_, this.getMap()); var map = this.getMap();
if (!goog.isNull(map)) {
this.handlePointerAtPixel_(this.lastPixel_, map);
}
}; };