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

Use ol.source.Tile#getTileGridForProjection

Browse Source
This commit is contained in:
Tom Payne
2014-01-14 17:36:18 +01:00
parent 68b0f42e3c
commit 091888aaca
4 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ol/renderer/canvas/canvastilelayerrenderer.js
View File

@@ -172,10 +172,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile); goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
var tileSource = tileLayer.getSource(); var tileSource = tileLayer.getSource();
goog.asserts.assertInstanceof(tileSource, ol.source.Tile); goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
var tileGrid = tileSource.getTileGrid(); var tileGrid = tileSource.getTileGridForProjection(projection);
if (goog.isNull(tileGrid)) {
tileGrid = ol.tilegrid.getForProjection(projection);
}
var tileGutter = tileSource.getGutter(); var tileGutter = tileSource.getGutter();
var z = tileGrid.getZForResolution(view2DState.resolution); var z = tileGrid.getZForResolution(view2DState.resolution);
var tileSize = tileGrid.getTileSize(z); var tileSize = tileGrid.getTileSize(z);

5
src/ol/renderer/dom/domtilelayerrenderer.js
View File

@@ -89,10 +89,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile); goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
var tileSource = tileLayer.getSource(); var tileSource = tileLayer.getSource();
goog.asserts.assertInstanceof(tileSource, ol.source.Tile); goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
var tileGrid = tileSource.getTileGrid(); var tileGrid = tileSource.getTileGridForProjection(projection);
if (goog.isNull(tileGrid)) {
tileGrid = ol.tilegrid.getForProjection(projection);
}
var tileGutter = tileSource.getGutter(); var tileGutter = tileSource.getGutter();
var z = tileGrid.getZForResolution(view2DState.resolution); var z = tileGrid.getZForResolution(view2DState.resolution);
var tileResolution = tileGrid.getResolution(z); var tileResolution = tileGrid.getResolution(z);

5
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -122,10 +122,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile); goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
var tileSource = tileLayer.getSource(); var tileSource = tileLayer.getSource();
goog.asserts.assertInstanceof(tileSource, ol.source.Tile); goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
var tileGrid = tileSource.getTileGrid(); var tileGrid = tileSource.getTileGridForProjection(projection);
if (goog.isNull(tileGrid)) {
tileGrid = ol.tilegrid.getForProjection(projection);
}
var z = tileGrid.getZForResolution(view2DState.resolution); var z = tileGrid.getZForResolution(view2DState.resolution);
var tileResolution = tileGrid.getResolution(z); var tileResolution = tileGrid.getResolution(z);

2
src/ol/source/tilewmssource.js
View File

@@ -147,7 +147,7 @@ ol.source.TileWMS.prototype.tileUrlFunction_ =
var tileGrid = this.getTileGrid(); var tileGrid = this.getTileGrid();
if (goog.isNull(tileGrid)) { if (goog.isNull(tileGrid)) {
tileGrid = ol.tilegrid.getForProjection(projection); tileGrid = this.getTileGridForProjection(projection);
} }
if (tileGrid.getResolutions().length <= tileCoord.z) { if (tileGrid.getResolutions().length <= tileCoord.z) {