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

Changing extent structure back to single array: [minX, minY, maxX, maxY]

Browse Source 
This means we'll have to have a new structure and new methods for 3D envelopes.
This commit is contained in:
Tim Schaub
2013-09-15 00:15:24 -06:00
parent de0e8aeced
commit e806f51b3d
63 changed files with 379 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/source/imagestaticsource.js
+1 -1
View File
@@ -20,7 +20,7 @@ ol.source.ImageStatic = function(options) {
var imageExtent = options.imageExtent;
var imageSize = options.imageSize;
var imageResolution = (imageExtent[1][1] - imageExtent[0][1]) / imageSize[1];
var imageResolution = (imageExtent[3] - imageExtent[1]) / imageSize[1];
var projection = ol.proj.get(options.projection);
goog.base(this, {
src/ol/source/imagewmssource.js
+2 -2
View File
@@ -89,8 +89,8 @@ ol.source.ImageWMS.prototype.getImage =
extent = extent.slice();
ol.extent.scaleFromCenter(extent, this.ratio_);
var width = (extent[1][0] - extent[0][0]) / resolution;
var height = (extent[1][1] - extent[0][1]) / resolution;
var width = (extent[2] - extent[0]) / resolution;
var height = (extent[3] - extent[1]) / resolution;
var size = [width, height];
this.image_ = this.createImage(extent, resolution, size, projection);
src/ol/source/tilewmssource.js
+4 -4
View File
@@ -75,11 +75,11 @@ ol.source.TileWMS = function(options) {
extent = goog.isDef(extent) ? extent : projectionExtent;
if (!goog.isNull(extent) && projection.isGlobal() &&
extent[0][0] === projectionExtent[0][0] &&
extent[1][0] === projectionExtent[1][0]) {
extent[0] === projectionExtent[0] &&
extent[2] === projectionExtent[2]) {
var numCols = Math.ceil(
(extent[1][0] - extent[0][0]) /
(tileExtent[1][0] - tileExtent[0][0]));
(extent[2] - extent[0]) /
(tileExtent[2] - tileExtent[0]));
x = goog.math.modulo(x, numCols);
tileExtent = tileGrid.getTileCoordExtent(
new ol.TileCoord(tileCoord.z, x, tileCoord.y));
src/ol/source/wmssource.js
+2 -2
View File
@@ -54,8 +54,8 @@ ol.source.wms.getUrl =
var axisOrientation = projection.getAxisOrientation();
var bboxValues = (wms13 && axisOrientation.substr(0, 2) == 'ne') ?
[extent[0][1], extent[0][0], extent[1][1], extent[1][0]] :
[extent[0][0], extent[0][1], extent[1][0], extent[1][1]];
[extent[1], extent[0], extent[3], extent[2]] :
[extent[0], extent[1], extent[2], extent[3]];
baseParams['BBOX'] = bboxValues.join(',');
return goog.uri.utils.appendParamsFromMap(baseUrl, baseParams);
src/ol/source/wmtssource.js
+4 -4
View File
@@ -154,11 +154,11 @@ ol.source.WMTS = function(options) {
options.extent : projectionExtent;
if (!goog.isNull(extent) && projection.isGlobal() &&
extent[0][0] === projectionExtent[0][0] &&
extent[1][0] === projectionExtent[1][0]) {
extent[0] === projectionExtent[0] &&
extent[2] === projectionExtent[2]) {
var numCols = Math.ceil(
(extent[1][0] - extent[0][0]) /
(tileExtent[1][0] - tileExtent[0][0]));
(extent[2] - extent[0]) /
(tileExtent[2] - tileExtent[0]));
x = goog.math.modulo(x, numCols);
tmpTileCoord.z = tileCoord.z;
tmpTileCoord.x = x;