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

Remove view.getView2D() method

Browse Source
This commit is contained in:
Tim Schaub
2014-06-26 16:29:21 -04:00
parent 956e1bf8b4
commit b88d2aebc9
23 changed files with 42 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ol/control/mousepositioncontrol.js
View File

@@ -1,5 +1,4 @@
// FIXME should listen on appropriate pane, once it is defined
// FIXME works for View2D only
goog.provide('ol.control.MousePosition');

10
src/ol/control/rotatecontrol.js
View File

@@ -1,5 +1,3 @@
// FIXME works for View2D only
goog.provide('ol.control.Rotate');
goog.require('goog.asserts');
@@ -7,7 +5,6 @@ goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('ol.View2D');
goog.require('ol.animation');
goog.require('ol.control.Control');
goog.require('ol.css');
@@ -118,12 +115,9 @@ ol.control.Rotate.prototype.handlePointerUp_ = function(pointerEvent) {
*/
ol.control.Rotate.prototype.resetNorth_ = function() {
var map = this.getMap();
// FIXME works for View2D only
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
var view2D = view.getView2D();
goog.asserts.assertInstanceof(view2D, ol.View2D);
var currentRotation = view2D.getRotation();
var currentRotation = view.getRotation();
while (currentRotation < -Math.PI) {
currentRotation += 2 * Math.PI;
}
@@ -138,7 +132,7 @@ ol.control.Rotate.prototype.resetNorth_ = function() {
easing: ol.easing.easeOut
}));
}
view2D.setRotation(0);
view.setRotation(0);
}
};

13
src/ol/control/zoomcontrol.js
View File

@@ -1,5 +1,3 @@
// FIXME works for View2D only
goog.provide('ol.control.Zoom');
goog.require('goog.asserts');
@@ -7,7 +5,6 @@ goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('ol.View2D');
goog.require('ol.animation');
goog.require('ol.control.Control');
goog.require('ol.css');
@@ -143,12 +140,8 @@ ol.control.Zoom.prototype.handlePointerUp_ = function(delta, pointerEvent) {
*/
ol.control.Zoom.prototype.zoomByDelta_ = function(delta) {
var map = this.getMap();
// FIXME works for View2D only
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
var view2D = view.getView2D();
goog.asserts.assertInstanceof(view2D, ol.View2D);
var currentResolution = view2D.getResolution();
var currentResolution = view.getResolution();
if (goog.isDef(currentResolution)) {
if (this.duration_ > 0) {
map.beforeRender(ol.animation.zoom({
@@ -157,7 +150,7 @@ ol.control.Zoom.prototype.zoomByDelta_ = function(delta) {
easing: ol.easing.easeOut
}));
}
var newResolution = view2D.constrainResolution(currentResolution, delta);
view2D.setResolution(newResolution);
var newResolution = view.constrainResolution(currentResolution, delta);
view.setResolution(newResolution);
}
};

9
src/ol/control/zoomslidercontrol.js
View File

@@ -1,4 +1,3 @@
// FIXME works for View2D only
// FIXME should possibly show tooltip when dragging?
goog.provide('ol.control.ZoomSlider');
@@ -177,7 +176,7 @@ ol.control.ZoomSlider.prototype.handleMapPostrender = function(mapEvent) {
*/
ol.control.ZoomSlider.prototype.handleContainerClick_ = function(browserEvent) {
var map = this.getMap();
var view = map.getView().getView2D();
var view = map.getView();
var resolution;
var amountDragged = this.amountDragged_(browserEvent.offsetX,
browserEvent.offsetY);
@@ -246,7 +245,7 @@ ol.control.ZoomSlider.prototype.amountDragged_ = function(x, y) {
ol.control.ZoomSlider.prototype.resolutionForAmount_ = function(amount) {
// FIXME do we really need this affine transform?
amount = (goog.math.clamp(amount, 0, 1) - 1) * -1;
var fn = this.getMap().getView().getView2D().getResolutionForValueFunction();
var fn = this.getMap().getView().getResolutionForValueFunction();
return fn(amount);
};
@@ -260,7 +259,7 @@ ol.control.ZoomSlider.prototype.resolutionForAmount_ = function(amount) {
* @private
*/
ol.control.ZoomSlider.prototype.amountForResolution_ = function(res) {
var fn = this.getMap().getView().getView2D().getValueForResolutionFunction();
var fn = this.getMap().getView().getValueForResolutionFunction();
var value = fn(res);
// FIXME do we really need this affine transform?
return (value - 1) * -1;
@@ -277,7 +276,7 @@ ol.control.ZoomSlider.prototype.amountForResolution_ = function(res) {
*/
ol.control.ZoomSlider.prototype.handleSliderChange_ = function(e) {
var map = this.getMap();
var view = map.getView().getView2D();
var view = map.getView();
var resolution;
if (e.type === goog.fx.Dragger.EventType.DRAG) {
var amountDragged = this.amountDragged_(e.left, e.top);

8
src/ol/control/zoomtoextentcontrol.js
View File

@@ -1,5 +1,3 @@
// FIXME works for View2D only
goog.provide('ol.control.ZoomToExtent');
goog.require('goog.asserts');
@@ -99,11 +97,9 @@ ol.control.ZoomToExtent.prototype.handlePointerUp_ = function(pointerEvent) {
ol.control.ZoomToExtent.prototype.handleZoomToExtent_ = function() {
var map = this.getMap();
var view = map.getView();
goog.asserts.assert(goog.isDef(view));
var view2D = view.getView2D();
var extent = goog.isNull(this.extent_) ?
view2D.getProjection().getExtent() : this.extent_;
view.getProjection().getExtent() : this.extent_;
var size = map.getSize();
goog.asserts.assert(goog.isDef(size));
view2D.fitExtent(extent, size);
view.fitExtent(extent, size);
};