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

Fix not-up-to-date transform bug in mouse position control

Browse Source
This commit is contained in:
Tom Payne
2012-09-28 13:47:55 +02:00
parent 0bf17f64f7
commit a341df3b41
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/ol/control/mouseposition.js
View File

@@ -84,19 +84,8 @@ goog.inherits(ol.control.MousePosition, ol.control.Control);
* @protected * @protected
*/ */
ol.control.MousePosition.prototype.handleMapProjectionChanged = function() { ol.control.MousePosition.prototype.handleMapProjectionChanged = function() {
var map = this.getMap(); this.updateTransform_();
if (goog.isNull(map)) { // FIXME should we instead re-calculate using the last known mouse position?
this.transform_ = ol.Projection.identityTransform;
} else {
var mapProjection = map.getProjection();
if (!goog.isDef(mapProjection) || !goog.isDef(this.projection_)) {
this.transform_ = ol.Projection.identityTransform;
} else {
this.transform_ =
ol.Projection.getTransform(mapProjection, this.projection_);
}
// FIXME should we instead re-calculate using the last known mouse position?
}
this.element.innerHTML = this.undefinedHtml_; this.element.innerHTML = this.undefinedHtml_;
}; };
@@ -139,10 +128,10 @@ ol.control.MousePosition.prototype.handleMouseOut = function(browserEvent) {
* @inheritDoc * @inheritDoc
*/ */
ol.control.MousePosition.prototype.setMap = function(map) { ol.control.MousePosition.prototype.setMap = function(map) {
if (goog.isNull(this.listenerKeys_)) { if (!goog.isNull(this.listenerKeys_)) {
goog.array.forEach(this.listenerKeys_, goog.events.unlistenByKey); goog.array.forEach(this.listenerKeys_, goog.events.unlistenByKey);
this.listenerKeys_ = null;
} }
this.listenerKeys_ = null;
goog.base(this, 'setMap', map); goog.base(this, 'setMap', map);
if (!goog.isNull(map)) { if (!goog.isNull(map)) {
var viewport = map.getViewport(); var viewport = map.getViewport();
@@ -155,5 +144,25 @@ ol.control.MousePosition.prototype.setMap = function(map) {
goog.events.listen(viewport, goog.events.EventType.MOUSEOUT, goog.events.listen(viewport, goog.events.EventType.MOUSEOUT,
this.handleMouseOut, false, this) this.handleMouseOut, false, this)
]; ];
this.updateTransform_();
}
};
/**
* @private
*/
ol.control.MousePosition.prototype.updateTransform_ = function() {
var map = this.getMap();
if (goog.isNull(map)) {
this.transform_ = ol.Projection.identityTransform;
} else {
var mapProjection = map.getProjection();
if (!goog.isDef(mapProjection) || !goog.isDef(this.projection_)) {
this.transform_ = ol.Projection.identityTransform;
} else {
this.transform_ =
ol.Projection.getTransform(mapProjection, this.projection_);
}
} }
}; };