From 406207213fdd5eacfcad7f124df3c3b0f281a2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Sat, 12 Oct 2013 17:03:58 +0200 Subject: [PATCH 1/7] Add ol.Map#getEventPixel --- src/ol/map.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/ol/map.js b/src/ol/map.js index 81601ffb9b..e60484eba5 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -430,6 +430,17 @@ ol.Map.prototype.freezeRendering = function() { }; +/** + * Returns the map pixel position for a a browser event. + * @param {Event} event Event. + * @return {ol.Pixel} Pixel. + */ +ol.Map.prototype.getEventPixel = function(event) { + var eventPosition = goog.style.getRelativePosition(event, this.viewport_); + return [eventPosition.x, eventPosition.y]; +}; + + /** * Get the map's renderer. * @return {ol.renderer.Map} Renderer. From c9b1ba51fa0c68328beb53ddbccd0a5e5fbe51a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Sat, 12 Oct 2013 17:04:08 +0200 Subject: [PATCH 2/7] Add ol.Map#getEventCoordinate --- src/ol/map.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/ol/map.js b/src/ol/map.js index e60484eba5..90a4bf488b 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -433,6 +433,16 @@ ol.Map.prototype.freezeRendering = function() { /** * Returns the map pixel position for a a browser event. * @param {Event} event Event. + * @return {ol.Coordinate} Coordinate. + */ +ol.Map.prototype.getEventCoordinate = function(event) { + return this.getCoordinateFromPixel(this.getEventPixel(event)); +}; + + +/** + * Returns the geographical coordinate for a browser event. + * @param {Event} event Event. * @return {ol.Pixel} Pixel. */ ol.Map.prototype.getEventPixel = function(event) { From dbdacec6df24673d46cab41d6bda5911a3671785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Sat, 12 Oct 2013 17:06:08 +0200 Subject: [PATCH 3/7] Export ol.Map#getEventPixel --- src/ol/map.exports | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ol/map.exports b/src/ol/map.exports index 276f9a040d..be093c80b9 100644 --- a/src/ol/map.exports +++ b/src/ol/map.exports @@ -4,6 +4,7 @@ @exportProperty ol.Map.prototype.addOverlay @exportProperty ol.Map.prototype.beforeRender @exportProperty ol.Map.prototype.getControls +@exportProperty ol.Map.prototype.getEventPixel @exportProperty ol.Map.prototype.getFeatureInfo @exportProperty ol.Map.prototype.getFeatures @exportProperty ol.Map.prototype.getInteractions From 3aeb4d1584f88b297b79a5f321c68636b9cdaa97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Sat, 12 Oct 2013 17:06:16 +0200 Subject: [PATCH 4/7] Export ol.Map#getEventCoordinate --- src/ol/map.exports | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ol/map.exports b/src/ol/map.exports index be093c80b9..6ba7f6bad0 100644 --- a/src/ol/map.exports +++ b/src/ol/map.exports @@ -4,6 +4,7 @@ @exportProperty ol.Map.prototype.addOverlay @exportProperty ol.Map.prototype.beforeRender @exportProperty ol.Map.prototype.getControls +@exportProperty ol.Map.prototype.getEventCoordinate @exportProperty ol.Map.prototype.getEventPixel @exportProperty ol.Map.prototype.getFeatureInfo @exportProperty ol.Map.prototype.getFeatures From 49e0af5abb7d399720f75708433dffe3b2784ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Mon, 14 Oct 2013 15:36:37 +0200 Subject: [PATCH 5/7] Use getEventPixel in ol.MapBrowserEvent --- src/ol/mapbrowserevent.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js index 566169d561..26dcce04cd 100644 --- a/src/ol/mapbrowserevent.js +++ b/src/ol/mapbrowserevent.js @@ -7,7 +7,6 @@ goog.require('goog.events'); goog.require('goog.events.BrowserEvent'); goog.require('goog.events.EventTarget'); goog.require('goog.events.EventType'); -goog.require('goog.style'); goog.require('ol.BrowserFeature'); goog.require('ol.Coordinate'); goog.require('ol.FrameState'); @@ -66,9 +65,7 @@ ol.MapBrowserEvent.prototype.getCoordinate = function() { */ ol.MapBrowserEvent.prototype.getPixel = function() { if (goog.isNull(this.pixel_)) { - var eventPosition = goog.style.getRelativePosition( - this.browserEvent, this.map.getViewport()); - this.pixel_ = [eventPosition.x, eventPosition.y]; + this.pixel_ = this.map.getEventPixel(this.browserEvent.getBrowserEvent()); } return this.pixel_; }; From 4c04c9fa5ce1ab82d2a135918b9f3988461f4718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Mon, 14 Oct 2013 15:36:46 +0200 Subject: [PATCH 6/7] Use getCoordinatePixel in ol.MapBrowserEvent --- src/ol/mapbrowserevent.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js index 26dcce04cd..382954e5a7 100644 --- a/src/ol/mapbrowserevent.js +++ b/src/ol/mapbrowserevent.js @@ -53,7 +53,8 @@ goog.inherits(ol.MapBrowserEvent, ol.MapEvent); */ ol.MapBrowserEvent.prototype.getCoordinate = function() { if (goog.isNull(this.coordinate_)) { - this.coordinate_ = this.map.getCoordinateFromPixel(this.getPixel()); + this.coordinate_ = this.map.getEventCoordinate( + this.browserEvent.getBrowserEvent()); } return this.coordinate_; }; From 69642f9a6da7b4e547f119a6611fd00506d38a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Tue, 15 Oct 2013 11:33:32 +0200 Subject: [PATCH 7/7] Export ol.Map#getViewport --- src/ol/map.exports | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ol/map.exports b/src/ol/map.exports index 6ba7f6bad0..d6dd963a75 100644 --- a/src/ol/map.exports +++ b/src/ol/map.exports @@ -12,6 +12,7 @@ @exportProperty ol.Map.prototype.getLayers @exportProperty ol.Map.prototype.getOverlays @exportProperty ol.Map.prototype.getRenderer +@exportProperty ol.Map.prototype.getViewport @exportProperty ol.Map.prototype.removeControl @exportProperty ol.Map.prototype.removeLayer @exportProperty ol.Map.prototype.removeOverlay