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

Merge Camera into Map

Browse Source
This commit is contained in:
Tom Payne
2012-07-14 18:34:02 +02:00
parent b80ce1fc26
commit fcf552ea40
5 changed files with 93 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/all.js
View File

@@ -2,7 +2,6 @@ goog.provide('ol');
goog.require('ol.Array');
goog.require('ol.Bounds');
goog.require('ol.Camera');
goog.require('ol.Extent');
goog.require('ol.Layer');
goog.require('ol.LayerRenderer');

86
src/ol/camera.js
View File

@@ -1,86 +0,0 @@
goog.provide('ol.Camera');
goog.provide('ol.CameraProperty');
goog.require('goog.math.Coordinate');
goog.require('ol.Object');
/**
* @enum {string}
*/
ol.CameraProperty = {
POSITION: 'center',
RESOLUTION: 'resolution',
ROTATION: 'rotation'
};
/**
* @constructor
* @extends {ol.Object}
*/
ol.Camera = function() {
goog.base(this);
};
goog.inherits(ol.Camera, ol.Object);
/**
* @return {goog.math.Coordinate} Position.
*/
ol.Camera.prototype.getPosition = function() {
return /** @type {goog.math.Coordinate} */ (
this.get(ol.CameraProperty.POSITION));
};
/**
* @return {number} Resolution.
*/
ol.Camera.prototype.getResolution = function() {
return /** @type {number} */ (this.get(ol.CameraProperty.RESOLUTION));
};
/**
* @return {number} Rotation.
*/
ol.Camera.prototype.getRotation = function() {
return /** @type {number} */ (this.get(ol.CameraProperty.ROTATION));
};
/**
* @return {boolean} Is fully defined.
*/
ol.Camera.prototype.isFullyDefined = function() {
return goog.isDef(this.getPosition()) && goog.isDef(this.getResolution()) &&
goog.isDef(this.getRotation());
};
/**
* @param {goog.math.Coordinate} position Position.
*/
ol.Camera.prototype.setPosition = function(position) {
this.set(ol.CameraProperty.POSITION, position.clone());
};
/**
* @param {number} resolution Resolution.
*/
ol.Camera.prototype.setResolution = function(resolution) {
this.set(ol.CameraProperty.RESOLUTION, resolution);
};
/**
* @param {number} rotation Rotation.
*/
ol.Camera.prototype.setRotation = function(rotation) {
this.set(ol.CameraProperty.ROTATION, rotation);
};

5
src/ol/createmap.js
View File

@@ -2,7 +2,6 @@ goog.provide('ol.createMap');
goog.require('goog.object');
goog.require('ol.Array');
goog.require('ol.Camera');
goog.require('ol.Projection');
goog.require('ol.dom');
goog.require('ol.dom.Map');
@@ -40,10 +39,6 @@ ol.createMap = function(target, opt_values) {
goog.object.extend(values, opt_values);
}
if (!goog.object.containsKey(values, ol.MapProperty.CAMERA)) {
values[ol.MapProperty.CAMERA] = new ol.Camera();
}
if (!goog.object.containsKey(values, ol.MapProperty.LAYERS)) {
values[ol.MapProperty.LAYERS] = new ol.Array();
}

185
src/ol/map.js
View File

@@ -5,10 +5,9 @@ goog.require('goog.array');
goog.require('goog.events');
goog.require('goog.events.Event');
goog.require('goog.events.EventType');
goog.require('goog.math.Coordinate');
goog.require('goog.object');
goog.require('ol.Array');
goog.require('ol.Camera');
goog.require('ol.CameraProperty');
goog.require('ol.Extent');
goog.require('ol.LayerRenderer');
goog.require('ol.Object');
@@ -19,9 +18,11 @@ goog.require('ol.Projection');
* @enum {string}
*/
ol.MapProperty = {
CAMERA: 'camera',
CENTER: 'center',
EXTENT: 'extent',
LAYERS: 'layers',
PROJECTION: 'projection'
PROJECTION: 'projection',
RESOLUTION: 'resolution'
};
@@ -48,18 +49,6 @@ ol.Map = function(target, opt_values) {
*/
this.size_ = new goog.math.Size(target.clientWidth, target.clientHeight);
/**
* @private
* @type {ol.Extent}
*/
this.extent_ = null;
/**
* @private
* @type {Array.<number>}
*/
this.cameraListenerKeys_ = null;
/**
* @private
* @type {Array.<number>}
@@ -76,13 +65,17 @@ ol.Map = function(target, opt_values) {
this.handleTargetResize, false, this);
goog.events.listen(
this, ol.Object.getChangedEventType(ol.MapProperty.CAMERA),
this.handleCameraChanged, false, this);
this, ol.Object.getChangedEventType(ol.MapProperty.CENTER),
this.handleCenterChanged, false, this);
goog.events.listen(
this, ol.Object.getChangedEventType(ol.MapProperty.LAYERS),
this.handleLayersChanged, false, this);
goog.events.listen(
this, ol.Object.getChangedEventType(ol.MapProperty.RESOLUTION),
this.handleResolutionChanged, false, this);
if (goog.isDef(opt_values)) {
this.setValues(opt_values);
}
@@ -118,18 +111,21 @@ ol.Map.prototype.forEachLayerRenderer = function(f, opt_obj) {
/**
* @return {ol.Camera} Camera.
* @return {goog.math.Coordinate|undefined} Center.
*/
ol.Map.prototype.getCamera = function() {
return /** @type {ol.Camera} */ (this.get(ol.MapProperty.CAMERA));
ol.Map.prototype.getCenter = function() {
var center = /** @type {goog.math.Coordinate} */ (
this.get(ol.MapProperty.CENTER));
return goog.isDef(center) ? center.clone() : undefined;
};
/**
* @return {ol.Extent} Extent.
* @return {ol.Extent|undefined} Extent.
*/
ol.Map.prototype.getExtent = function() {
return this.extent_.clone();
var extent = /** @type {ol.Extent} */ (this.get(ol.MapProperty.EXTENT));
return goog.isDef(extent) ? extent.clone() : undefined;
};
@@ -149,6 +145,14 @@ ol.Map.prototype.getProjection = function() {
};
/**
* @return {number|undefined} Resolution.
*/
ol.Map.prototype.getResolution = function() {
return /** @type {number} */ (this.get(ol.MapProperty.RESOLUTION));
};
/**
* @param {ol.Extent} extent Extent.
* @return {number} Resolution.
@@ -157,7 +161,6 @@ ol.Map.prototype.getResolutionForExtent = function(extent) {
var size = this.size_;
var xResolution = (extent.right - extent.left) / size.width;
var yResolution = (extent.top - extent.bottom) / size.height;
// FIXME support discrete resolutions
return Math.max(xResolution, yResolution);
};
@@ -167,7 +170,7 @@ ol.Map.prototype.getResolutionForExtent = function(extent) {
* @return {goog.math.Size} Size.
*/
ol.Map.prototype.getSize = function() {
return this.size_.clone();
return this.size_;
};
@@ -182,52 +185,8 @@ ol.Map.prototype.getTarget = function() {
/**
* @protected
*/
ol.Map.prototype.handleCameraChanged = function() {
if (!goog.isNull(this.cameraListenerKeys_)) {
goog.array.forEach(this.cameraListenerKeys_, goog.events.unlistenByKey);
this.cameraListenerKeys_ = null;
}
var camera = this.getCamera();
if (goog.isDefAndNotNull(camera)) {
this.cameraListenerKeys_ = goog.array.map(
goog.object.getValues(ol.CameraProperty),
function(cameraProperty) {
return goog.events.listen(camera,
ol.Object.getChangedEventType(cameraProperty),
this.handleCameraPropertyChanged, false, this);
},
this);
this.handleCameraPropertyChanged();
}
};
/**
* @protected
*/
ol.Map.prototype.handleCameraPropertyChanged = function() {
var camera = this.getCamera();
var position = camera.getPosition();
if (!goog.isDef(position)) {
return;
}
var resolution = camera.getResolution();
if (!goog.isDef(resolution)) {
return;
}
var size = this.size_;
var left = position.x - resolution * size.width / 2;
var right = position.x + resolution * size.width / 2;
var bottom = position.y - resolution * size.height / 2;
var top = position.y + resolution * size.height / 2;
if (goog.isNull(this.extent_)) {
this.extent_ = new ol.Extent(top, right, bottom, left);
} else {
this.extent_.top = top;
this.extent_.right = right;
this.extent_.bottom = bottom;
this.extent_.left = left;
}
ol.Map.prototype.handleCenterChanged = function() {
this.recalculateExtent_();
};
@@ -263,7 +222,7 @@ ol.Map.prototype.handleLayersInsertAt = function(event) {
var layers = /** @type {ol.Array} */ (event.target);
var layer = /** @type {ol.Layer} */ layers.getAt(event.index);
this.handleLayerAdd(layer);
this.setCameraDefaults_();
this.setDefaultCenterAndResolution_();
};
@@ -307,11 +266,19 @@ ol.Map.prototype.handleLayersChanged = function() {
goog.events.listen(layers, ol.ArrayEventType.SET_AT,
this.handleLayersSetAt, false, this)
];
this.setCameraDefaults_();
this.setDefaultCenterAndResolution_();
}
};
/**
* @protected
*/
ol.Map.prototype.handleResolutionChanged = function() {
this.recalculateExtent_();
};
/**
* @param {goog.events.Event} event Event.
* @protected
@@ -320,45 +287,51 @@ ol.Map.prototype.handleTargetResize = function(event) {
goog.asserts.assert(event.target == this.target_);
this.size_.width = this.target_.clientWidth;
this.size_.height = this.target_.clientHeight;
};
/**
* @param {ol.Camera} camera Camera.
*/
ol.Map.prototype.setCamera = function(camera) {
this.set(ol.MapProperty.CAMERA, camera);
this.recalculateExtent_();
};
/**
* @private
*/
ol.Map.prototype.setCameraDefaults_ = function() {
var camera = this.getCamera();
if (camera.isFullyDefined()) {
ol.Map.prototype.recalculateExtent_ = function() {
var center = this.getCenter();
var resolution = this.getResolution();
if (!goog.isDef(center) || !goog.isDef(resolution)) {
return;
}
var size = this.size_;
var left = center.x - resolution * size.width / 2;
var right = center.x + resolution * size.width / 2;
var bottom = center.y - resolution * size.height / 2;
var top = center.y + resolution * size.height / 2;
var extent = new ol.Extent(top, right, bottom, left);
this.set(ol.MapProperty.EXTENT, extent);
};
/**
* @param {goog.math.Coordinate} center Center.
*/
ol.Map.prototype.setCenter = function(center) {
this.set(ol.MapProperty.CENTER, center);
};
/**
* @private
*/
ol.Map.prototype.setDefaultCenterAndResolution_ = function() {
if (goog.isDef(this.getCenter()) && goog.isDef(this.getResolution())) {
return;
}
var layers = this.getLayers();
if (!goog.isDefAndNotNull(layers)) {
return;
}
if (layers.getLength() < 1) {
return;
}
var layer = /** @type {ol.Layer} */ (layers.getAt(0));
var storeExtent = layer.getStore().getExtent();
if (!goog.isDef(camera.getPosition())) {
var position = storeExtent.getCenter();
camera.setPosition(position);
}
if (!goog.isDef(camera.getResolution())) {
var resolution = this.getResolutionForExtent(storeExtent);
camera.setResolution(resolution);
}
if (!goog.isDef(camera.getRotation())) {
camera.setRotation(0);
}
this.setExtent(storeExtent);
};
@@ -366,11 +339,8 @@ ol.Map.prototype.setCameraDefaults_ = function() {
* @param {ol.Extent} extent Extent.
*/
ol.Map.prototype.setExtent = function(extent) {
var camera = this.getCamera();
var position = extent.getCenter();
camera.setPosition(position);
var resolution = this.getResolutionForExtent(extent);
camera.setResolution(resolution);
this.setCenter(extent.getCenter());
this.setResolution(this.getResolutionForExtent(extent));
};
@@ -382,6 +352,15 @@ ol.Map.prototype.setLayers = function(layers) {
};
/**
* @param {number} resolution Resolution.
*/
ol.Map.prototype.setResolution = function(resolution) {
// FIXME support discrete resolutions
this.set(ol.MapProperty.RESOLUTION, resolution);
};
/**
* @param {ol.Projection} projection Projection.
*/

13
src/ol/webgl/map.js
View File

@@ -94,8 +94,8 @@ ol.webgl.Map.prototype.getGL = function() {
/**
* @inheritDoc
*/
ol.webgl.Map.prototype.handleCameraPropertyChanged = function() {
goog.base(this, 'handleCameraPropertyChanged');
ol.webgl.Map.prototype.handleCenterChanged = function() {
goog.base(this, 'handleCenterChanged');
this.redraw_();
};
@@ -118,6 +118,15 @@ ol.webgl.Map.prototype.handleLayerRemove = function(layer) {
};
/**
* @inheritDoc
*/
ol.webgl.Map.prototype.handleResolutionChanged = function() {
goog.base(this, 'handleResolutionChanged');
this.redraw_();
};
/**
* @inheritDoc
*/