Add and use ol.Constraints

2012-08-04 15:27:23 +02:00
parent eaca7d0a8c
commit 0fd122a1ed
13 changed files with 163 additions and 147 deletions
@@ -3,13 +3,22 @@
 goog.provide('ol.Control');

 goog.require('ol.MapBrowserEvent');
+goog.require('ol.control.Constraints');



 /**
 * @constructor
+ * @param {ol.control.Constraints} constraints Constraints.
 */
-ol.Control = function() {
+ol.Control = function(constraints) {
+
+  /**
+   * @protected
+   * @type {ol.control.Constraints}
+   */
+  this.constraints = constraints;
+
 };


@@ -17,3 +26,68 @@ ol.Control = function() {
 * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
 */
 ol.Control.prototype.handleMapBrowserEvent = goog.abstractMethod;
+
+
+/**
+ * @param {ol.Map} map Map.
+ * @param {ol.Extent} extent Extent.
+ */
+ol.Control.prototype.fitExtent = function(map, extent) {
+  var resolution = map.getResolutionForExtent(extent);
+  resolution = this.constraints.resolution(resolution, 0);
+  var center = extent.getCenter();
+  center = this.constraints.center(center, resolution, ol.Coordinate.ZERO);
+  map.withFrozenRendering(function() {
+    map.setCenter(center);
+    map.setResolution(resolution);
+  });
+};
+
+
+/**
+ * @param {ol.Map} map Map.
+ * @param {ol.Coordinate} delta Delta.
+ * @param {ol.Coordinate=} opt_anchor Anchor.
+ */
+ol.Control.prototype.pan = function(map, delta, opt_anchor) {
+  var center = opt_anchor ? opt_anchor : map.getCenter();
+  var resolution = map.getResolution();
+  center = this.constraints.center(center, resolution, delta);
+  map.setCenter(center);
+};
+
+
+/**
+ * @param {ol.Map} map Map.
+ * @param {number|undefined} resolution Resolution.
+ */
+ol.Control.prototype.setResolution = function(map, resolution) {
+  resolution = this.constraints.resolution(resolution, 0);
+  map.setResolution(resolution);
+};
+
+
+/**
+ * @param {ol.Map} map Map.
+ * @param {number} rotation Rotation.
+ */
+ol.Control.prototype.setRotation = function(map, rotation) {
+  // FIXME use a constraint
+  map.setRotation(rotation);
+};
+
+
+/**
+ * @param {ol.Map} map Map.
+ * @param {number} delta Delta.
+ * @param {ol.Coordinate=} opt_anchor Anchor.
+ */
+ol.Control.prototype.zoom = function(map, delta, opt_anchor) {
+  //if (false && goog.isDef(opt_anchor)) {
+    // FIXME
+  //} else {
+    var resolution = map.getResolution();
+    resolution = this.constraints.resolution(resolution, delta);
+    map.setResolution(resolution);
+  //}
+};