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

Port ol.View2D to new extents

Browse Source
This commit is contained in:
Tom Payne
2013-04-16 16:13:49 +02:00
parent 7d21bd8133
commit 9773314803
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/view2d.js
+10 -10
View File
@@ -6,7 +6,6 @@ goog.provide('ol.View2DProperty');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('ol.Constraints'); goog.require('ol.Constraints');
goog.require('ol.Extent');
goog.require('ol.IView2D'); goog.require('ol.IView2D');
goog.require('ol.IView3D'); goog.require('ol.IView3D');
goog.require('ol.Projection'); goog.require('ol.Projection');
@@ -16,6 +15,7 @@ goog.require('ol.RotationConstraintType');
goog.require('ol.Size'); goog.require('ol.Size');
goog.require('ol.View'); goog.require('ol.View');
goog.require('ol.coordinate'); goog.require('ol.coordinate');
goog.require('ol.extent');
goog.require('ol.projection'); goog.require('ol.projection');
@@ -55,8 +55,8 @@ ol.View2D = function(opt_options) {
} else if (goog.isDef(options.zoom)) { } else if (goog.isDef(options.zoom)) {
var projectionExtent = values[ol.View2DProperty.PROJECTION].getExtent(); var projectionExtent = values[ol.View2DProperty.PROJECTION].getExtent();
var size = Math.max( var size = Math.max(
projectionExtent.maxX - projectionExtent.minX, projectionExtent[1] - projectionExtent[0],
projectionExtent.maxY - projectionExtent.minY); projectionExtent[3] - projectionExtent[2]);
values[ol.View2DProperty.RESOLUTION] = values[ol.View2DProperty.RESOLUTION] =
size / (ol.DEFAULT_TILE_SIZE * Math.pow(2, options.zoom)); size / (ol.DEFAULT_TILE_SIZE * Math.pow(2, options.zoom));
} }
@@ -175,10 +175,10 @@ ol.View2D.prototype.getExtent = function(size) {
var center = this.getCenter(); var center = this.getCenter();
var resolution = this.getResolution(); var resolution = this.getResolution();
var minX = center[0] - resolution * size.width / 2; var minX = center[0] - resolution * size.width / 2;
var minY = center[1] - resolution * size.height / 2;
var maxX = center[0] + resolution * size.width / 2; var maxX = center[0] + resolution * size.width / 2;
var minY = center[1] - resolution * size.height / 2;
var maxY = center[1] + resolution * size.height / 2; var maxY = center[1] + resolution * size.height / 2;
return new ol.Extent(minX, minY, maxX, maxY); return [minX, maxX, minY, maxX];
}; };
@@ -214,8 +214,8 @@ goog.exportProperty(
* @return {number} Resolution. * @return {number} Resolution.
*/ */
ol.View2D.prototype.getResolutionForExtent = function(extent, size) { ol.View2D.prototype.getResolutionForExtent = function(extent, size) {
var xResolution = (extent.maxX - extent.minX) / size.width; var xResolution = (extent[1] - extent[0]) / size.width;
var yResolution = (extent.maxY - extent.minY) / size.height; var yResolution = (extent[3] - extent[2]) / size.height;
return Math.max(xResolution, yResolution); return Math.max(xResolution, yResolution);
}; };
@@ -310,7 +310,7 @@ ol.View2D.prototype.getView3D = function() {
* @param {ol.Size} size Box pixel size. * @param {ol.Size} size Box pixel size.
*/ */
ol.View2D.prototype.fitExtent = function(extent, size) { ol.View2D.prototype.fitExtent = function(extent, size) {
this.setCenter(extent.getCenter()); this.setCenter(ol.extent.getCenter(extent));
var resolution = this.getResolutionForExtent(extent, size); var resolution = this.getResolutionForExtent(extent, size);
resolution = this.constrainResolution(resolution, 0, 0); resolution = this.constrainResolution(resolution, 0, 0);
this.setResolution(resolution); this.setResolution(resolution);
@@ -396,8 +396,8 @@ ol.View2D.createResolutionConstraint_ = function(options) {
var projectionExtent = ol.projection.createProjection( var projectionExtent = ol.projection.createProjection(
options.projection, 'EPSG:3857').getExtent(); options.projection, 'EPSG:3857').getExtent();
maxResolution = Math.max( maxResolution = Math.max(
projectionExtent.maxX - projectionExtent.minX, projectionExtent[1] - projectionExtent[0],
projectionExtent.maxY - projectionExtent.minY) / ol.DEFAULT_TILE_SIZE; projectionExtent[3] - projectionExtent[2]) / ol.DEFAULT_TILE_SIZE;
} }
var maxZoom = options.maxZoom; var maxZoom = options.maxZoom;
if (!goog.isDef(maxZoom)) { if (!goog.isDef(maxZoom)) {