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

s/store/source/

Browse Source
This commit is contained in:
Tom Payne
2012-09-26 18:48:19 +02:00
parent 228e5a8dbf
commit 290d03e76f
15 changed files with 128 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ol/renderer/dom/tilelayer.js
View File

@@ -74,8 +74,8 @@ ol.renderer.dom.TileLayer.prototype.getLayer = function() {
*/
ol.renderer.dom.TileLayer.prototype.getTileOffset_ = function(z, resolution) {
var tileLayer = this.getLayer();
var tileStore = tileLayer.getStore();
var tileGrid = tileStore.getTileGrid();
var tileSource = tileLayer.getSource();
var tileGrid = tileSource.getTileGrid();
var tileOrigin = tileGrid.getOrigin(z);
var offset = new ol.Coordinate(
Math.round((this.origin.x - tileOrigin.x) / resolution),
@@ -167,8 +167,8 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
var resolutionChanged = (mapResolution !== this.renderedMapResolution_);
var tileLayer = this.getLayer();
var tileStore = tileLayer.getStore();
var tileGrid = tileStore.getTileGrid();
var tileSource = tileLayer.getSource();
var tileGrid = tileSource.getTileGrid();
// z represents the "best" resolution
var z = tileGrid.getZForResolution(mapResolution);
@@ -191,9 +191,9 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
// first pass through the tile range to determine all the tiles needed
var allTilesLoaded = true;
tileRange.forEachTileCoord(z, function(tileCoord) {
var tile = tileStore.getTile(tileCoord);
var tile = tileSource.getTile(tileCoord);
if (goog.isNull(tile)) {
// we're outside the store's extent, continue
// we're outside the source's extent, continue
return;
}
@@ -228,7 +228,7 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
if (tilesToDrawByZ[altZ] && tilesToDrawByZ[altZ][tileKey]) {
return;
}
var altTile = tileStore.getTile(altTileCoord);
var altTile = tileSource.getTile(altTileCoord);
if (!goog.isNull(altTile) &&
altTile.getState() == ol.TileState.LOADED) {
if (!(altZ in tilesToDrawByZ)) {

6
src/ol/renderer/webgl/map.js
View File

@@ -169,7 +169,7 @@ ol.renderer.webgl.Map = function(container, map) {
goog.events.listen(this.canvas_, ol.webgl.WebGLContextEventType.LOST,
this.handleWebGLContextLost, false, this);
goog.events.listen(this.canvas_, ol.webgl.WebGLContextEventType.RESTORED,
this.handleWebGLContextRestored, false, this);
this.handleWebGLContextResourced, false, this);
/**
* @private
@@ -493,9 +493,9 @@ ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
/**
* @protected
*/
ol.renderer.webgl.Map.prototype.handleWebGLContextRestored = function() {
ol.renderer.webgl.Map.prototype.handleWebGLContextResourced = function() {
if (goog.DEBUG) {
this.logger.info('WebGLContextRestored');
this.logger.info('WebGLContextResourced');
}
this.initializeGL_();
this.getMap().render();

10
src/ol/renderer/webgl/tilelayer.js
View File

@@ -316,8 +316,8 @@ ol.renderer.webgl.TileLayer.prototype.render = function() {
var mapRotation = map.getRotation();
var tileLayer = this.getLayer();
var tileStore = tileLayer.getStore();
var tileGrid = tileStore.getTileGrid();
var tileSource = tileLayer.getSource();
var tileGrid = tileSource.getTileGrid();
var z = tileGrid.getZForResolution(mapResolution);
var tileResolution = tileGrid.getResolution(z);
var tileRange = tileGrid.getTileRangeForExtentAndResolution(
@@ -406,10 +406,10 @@ ol.renderer.webgl.TileLayer.prototype.render = function() {
tilesToDrawByZ[z] = {};
tileRange.forEachTileCoord(z, function(tileCoord) {
var tile = tileStore.getTile(tileCoord);
var tile = tileSource.getTile(tileCoord);
if (goog.isNull(tile)) {
// FIXME - consider returning here as this is outside the store's extent
// FIXME consider returning here as this is outside the source's extent
} else if (tile.getState() == ol.TileState.LOADED) {
if (mapRenderer.isImageTextureLoaded(tile.getImage())) {
tilesToDrawByZ[z][tileCoord.toString()] = tile;
@@ -439,7 +439,7 @@ ol.renderer.webgl.TileLayer.prototype.render = function() {
if (tilesToDrawByZ[z] && tilesToDrawByZ[z][tileCoordKey]) {
return;
}
var tile = tileStore.getTile(tileCoord);
var tile = tileSource.getTile(tileCoord);
if (!goog.isNull(tile) &&
tile.getState() == ol.TileState.LOADED) {
if (!tilesToDrawByZ[z]) {