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

Port ol.renderer.dom to new extents

Browse Source
This commit is contained in:
Tom Payne
2013-04-16 16:25:34 +02:00
parent 465e24cf4e
commit 10d1be695d
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/dom/domimagelayerrenderer.js
+2 -2
View File
@@ -100,8 +100,8 @@ ol.renderer.dom.ImageLayer.prototype.renderFrame =
1); 1);
goog.vec.Mat4.translate( goog.vec.Mat4.translate(
transform, transform,
(imageExtent.minX - viewCenter[0]) / imageResolution, (imageExtent[0] - viewCenter[0]) / imageResolution,
(viewCenter[1] - imageExtent.maxY) / imageResolution, (viewCenter[1] - imageExtent[3]) / imageResolution,
0); 0);
if (image != this.image_) { if (image != this.image_) {
var imageElement = image.getImageElement(this); var imageElement = image.getImageElement(this);
src/ol/renderer/dom/domtilelayerrenderer.js
+5 -4
View File
@@ -11,13 +11,13 @@ goog.require('goog.object');
goog.require('goog.style'); goog.require('goog.style');
goog.require('goog.vec.Mat4'); goog.require('goog.vec.Mat4');
goog.require('ol.Coordinate'); goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.Tile'); goog.require('ol.Tile');
goog.require('ol.TileCoord'); goog.require('ol.TileCoord');
goog.require('ol.TileRange'); goog.require('ol.TileRange');
goog.require('ol.TileState'); goog.require('ol.TileState');
goog.require('ol.ViewHint'); goog.require('ol.ViewHint');
goog.require('ol.dom'); goog.require('ol.dom');
goog.require('ol.extent');
goog.require('ol.layer.TileLayer'); goog.require('ol.layer.TileLayer');
goog.require('ol.renderer.dom.Layer'); goog.require('ol.renderer.dom.Layer');
goog.require('ol.tilegrid.TileGrid'); goog.require('ol.tilegrid.TileGrid');
@@ -98,7 +98,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
var extent; var extent;
if (tileResolution == view2DState.resolution) { if (tileResolution == view2DState.resolution) {
center = this.snapCenterToPixel(center, tileResolution, frameState.size); center = this.snapCenterToPixel(center, tileResolution, frameState.size);
extent = ol.Extent.getForView2DAndSize( extent = ol.extent.getForView2DAndSize(
center, tileResolution, view2DState.rotation, frameState.size); center, tileResolution, view2DState.rotation, frameState.size);
} else { } else {
extent = frameState.extent; extent = frameState.extent;
@@ -117,7 +117,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
tilesToDrawByZ, getTileIfLoaded); tilesToDrawByZ, getTileIfLoaded);
var allTilesLoaded = true; var allTilesLoaded = true;
var tmpExtent = new ol.Extent(0, 0, 0, 0); var tmpExtent = ol.extent.createEmptyExtent();
var tmpTileRange = new ol.TileRange(0, 0, 0, 0); var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
var childTileRange, fullyLoaded, tile, tileState, x, y; var childTileRange, fullyLoaded, tile, tileState, x, y;
for (x = tileRange.minX; x <= tileRange.maxX; ++x) { for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
@@ -272,7 +272,8 @@ ol.renderer.dom.TileLayerZ_ = function(tileGrid, tileCoordOrigin) {
* @private * @private
* @type {ol.Coordinate} * @type {ol.Coordinate}
*/ */
this.origin_ = tileGrid.getTileCoordExtent(tileCoordOrigin).getTopLeft(); this.origin_ =
ol.extent.getTopLeft(tileGrid.getTileCoordExtent(tileCoordOrigin));
/** /**
* @private * @private