Remove property enum from view constructor

This commit is contained in:
Tim Schaub
2016-12-27 09:34:48 -07:00
parent 7a95947dbb
commit 62a0dd5b5b
3 changed files with 29 additions and 28 deletions
+3 -3
View File
@@ -7,7 +7,7 @@ goog.require('ol.MapEvent');
goog.require('ol.MapProperty'); goog.require('ol.MapProperty');
goog.require('ol.Object'); goog.require('ol.Object');
goog.require('ol.Overlay'); goog.require('ol.Overlay');
goog.require('ol.View'); goog.require('ol.ViewProperty');
goog.require('ol.control.Control'); goog.require('ol.control.Control');
goog.require('ol.coordinate'); goog.require('ol.coordinate');
goog.require('ol.css'); goog.require('ol.css');
@@ -210,7 +210,7 @@ ol.control.OverviewMap.prototype.handleMapPropertyChange_ = function(event) {
*/ */
ol.control.OverviewMap.prototype.bindView_ = function(view) { ol.control.OverviewMap.prototype.bindView_ = function(view) {
ol.events.listen(view, ol.events.listen(view,
ol.Object.getChangeEventType(ol.View.Property.ROTATION), ol.Object.getChangeEventType(ol.ViewProperty.ROTATION),
this.handleRotationChanged_, this); this.handleRotationChanged_, this);
}; };
@@ -222,7 +222,7 @@ ol.control.OverviewMap.prototype.bindView_ = function(view) {
*/ */
ol.control.OverviewMap.prototype.unbindView_ = function(view) { ol.control.OverviewMap.prototype.unbindView_ = function(view) {
ol.events.unlisten(view, ol.events.unlisten(view,
ol.Object.getChangeEventType(ol.View.Property.ROTATION), ol.Object.getChangeEventType(ol.ViewProperty.ROTATION),
this.handleRotationChanged_, this); this.handleRotationChanged_, this);
}; };
+16 -25
View File
@@ -6,6 +6,7 @@ goog.require('ol.Constraints');
goog.require('ol.Object'); goog.require('ol.Object');
goog.require('ol.ResolutionConstraint'); goog.require('ol.ResolutionConstraint');
goog.require('ol.RotationConstraint'); goog.require('ol.RotationConstraint');
goog.require('ol.ViewProperty');
goog.require('ol.array'); goog.require('ol.array');
goog.require('ol.asserts'); goog.require('ol.asserts');
goog.require('ol.coordinate'); goog.require('ol.coordinate');
@@ -102,7 +103,7 @@ ol.View = function(opt_options) {
* @type {Object.<string, *>} * @type {Object.<string, *>}
*/ */
var properties = {}; var properties = {};
properties[ol.View.Property.CENTER] = options.center !== undefined ? properties[ol.ViewProperty.CENTER] = options.center !== undefined ?
options.center : null; options.center : null;
/** /**
@@ -157,12 +158,12 @@ ol.View = function(opt_options) {
centerConstraint, resolutionConstraint, rotationConstraint); centerConstraint, resolutionConstraint, rotationConstraint);
if (options.resolution !== undefined) { if (options.resolution !== undefined) {
properties[ol.View.Property.RESOLUTION] = options.resolution; properties[ol.ViewProperty.RESOLUTION] = options.resolution;
} else if (options.zoom !== undefined) { } else if (options.zoom !== undefined) {
properties[ol.View.Property.RESOLUTION] = this.constrainResolution( properties[ol.ViewProperty.RESOLUTION] = this.constrainResolution(
this.maxResolution_, options.zoom - this.minZoom_); this.maxResolution_, options.zoom - this.minZoom_);
} }
properties[ol.View.Property.ROTATION] = properties[ol.ViewProperty.ROTATION] =
options.rotation !== undefined ? options.rotation : 0; options.rotation !== undefined ? options.rotation : 0;
this.setProperties(properties); this.setProperties(properties);
}; };
@@ -318,25 +319,25 @@ ol.View.prototype.updateAnimations_ = function() {
var y1 = animation.targetCenter[1]; var y1 = animation.targetCenter[1];
var x = x0 + progress * (x1 - x0); var x = x0 + progress * (x1 - x0);
var y = y0 + progress * (y1 - y0); var y = y0 + progress * (y1 - y0);
this.set(ol.View.Property.CENTER, [x, y]); this.set(ol.ViewProperty.CENTER, [x, y]);
} }
if (animation.sourceResolution) { if (animation.sourceResolution) {
var resolution = animation.sourceResolution + var resolution = animation.sourceResolution +
progress * (animation.targetResolution - animation.sourceResolution); progress * (animation.targetResolution - animation.sourceResolution);
if (animation.anchor) { if (animation.anchor) {
this.set(ol.View.Property.CENTER, this.set(ol.ViewProperty.CENTER,
this.calculateCenterZoom(resolution, animation.anchor)); this.calculateCenterZoom(resolution, animation.anchor));
} }
this.set(ol.View.Property.RESOLUTION, resolution); this.set(ol.ViewProperty.RESOLUTION, resolution);
} }
if (animation.sourceRotation !== undefined) { if (animation.sourceRotation !== undefined) {
var rotation = animation.sourceRotation + var rotation = animation.sourceRotation +
progress * (animation.targetRotation - animation.sourceRotation); progress * (animation.targetRotation - animation.sourceRotation);
if (animation.anchor) { if (animation.anchor) {
this.set(ol.View.Property.CENTER, this.set(ol.ViewProperty.CENTER,
this.calculateCenterRotate(rotation, animation.anchor)); this.calculateCenterRotate(rotation, animation.anchor));
} }
this.set(ol.View.Property.ROTATION, rotation); this.set(ol.ViewProperty.ROTATION, rotation);
} }
more = true; more = true;
if (!animation.complete) { if (!animation.complete) {
@@ -444,7 +445,7 @@ ol.View.prototype.constrainRotation = function(rotation, opt_delta) {
*/ */
ol.View.prototype.getCenter = function() { ol.View.prototype.getCenter = function() {
return /** @type {ol.Coordinate|undefined} */ ( return /** @type {ol.Coordinate|undefined} */ (
this.get(ol.View.Property.CENTER)); this.get(ol.ViewProperty.CENTER));
}; };
@@ -522,7 +523,7 @@ ol.View.prototype.getProjection = function() {
*/ */
ol.View.prototype.getResolution = function() { ol.View.prototype.getResolution = function() {
return /** @type {number|undefined} */ ( return /** @type {number|undefined} */ (
this.get(ol.View.Property.RESOLUTION)); this.get(ol.ViewProperty.RESOLUTION));
}; };
@@ -585,7 +586,7 @@ ol.View.prototype.getResolutionForValueFunction = function(opt_power) {
* @api stable * @api stable
*/ */
ol.View.prototype.getRotation = function() { ol.View.prototype.getRotation = function() {
return /** @type {number} */ (this.get(ol.View.Property.ROTATION)); return /** @type {number} */ (this.get(ol.ViewProperty.ROTATION));
}; };
@@ -830,7 +831,7 @@ ol.View.prototype.rotate = function(rotation, opt_anchor) {
* @api stable * @api stable
*/ */
ol.View.prototype.setCenter = function(center) { ol.View.prototype.setCenter = function(center) {
this.set(ol.View.Property.CENTER, center); this.set(ol.ViewProperty.CENTER, center);
if (this.getAnimating()) { if (this.getAnimating()) {
this.cancelAnimations(); this.cancelAnimations();
} }
@@ -860,7 +861,7 @@ ol.View.prototype.setHint = function(hint, delta) {
* @api stable * @api stable
*/ */
ol.View.prototype.setResolution = function(resolution) { ol.View.prototype.setResolution = function(resolution) {
this.set(ol.View.Property.RESOLUTION, resolution); this.set(ol.ViewProperty.RESOLUTION, resolution);
if (this.getAnimating()) { if (this.getAnimating()) {
this.cancelAnimations(); this.cancelAnimations();
} }
@@ -874,7 +875,7 @@ ol.View.prototype.setResolution = function(resolution) {
* @api stable * @api stable
*/ */
ol.View.prototype.setRotation = function(rotation) { ol.View.prototype.setRotation = function(rotation) {
this.set(ol.View.Property.ROTATION, rotation); this.set(ol.ViewProperty.ROTATION, rotation);
if (this.getAnimating()) { if (this.getAnimating()) {
this.cancelAnimations(); this.cancelAnimations();
} }
@@ -1016,16 +1017,6 @@ ol.View.createRotationConstraint_ = function(options) {
}; };
/**
* @enum {string}
*/
ol.View.Property = {
CENTER: 'center',
RESOLUTION: 'resolution',
ROTATION: 'rotation'
};
/** /**
* @enum {number} * @enum {number}
*/ */
+10
View File
@@ -0,0 +1,10 @@
goog.provide('ol.ViewProperty');
/**
* @enum {string}
*/
ol.ViewProperty = {
CENTER: 'center',
RESOLUTION: 'resolution',
ROTATION: 'rotation'
};