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

Merge remote-tracking branch 'upstream/master' into vector-api

Browse Source 
Conflicts:
	src/objectliterals.jsdoc
	src/ol/attribution.js
	src/ol/geom/geometry.js
	src/ol/geom/geometrycollection.js
	src/ol/geom/linestring.js
	src/ol/layer/vectorlayer.exports
	src/ol/layer/vectorlayer.js
	src/ol/map.js
	src/ol/proj/proj.js
	src/ol/renderer/canvas/canvasvectorlayerrenderer.js
	src/ol/source/imagewmssource.js
	src/ol/source/tilewmssource.js
	src/ol/source/vectorsource.exports
	src/ol/source/vectorsource.js
	src/ol/source/wmssource.js
	src/ol/style/style.js
	src/ol/tilegrid/tilegrid.js
	src/ol/tilegrid/wmtstilegrid.js
	src/ol/tilegrid/xyztilegrid.js
This commit is contained in:
Éric Lemoine
2013-12-13 12:46:55 +01:00
parent cbc71686df 93e605b119
commit 35d5158454
167 changed files with 678 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,6 +181,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
if (goog.isNull(tileGrid)) {
tileGrid = ol.tilegrid.getForProjection(projection);
}
var tileGutter = tileSource.getGutter();
var z = tileGrid.getZForResolution(view2DState.resolution);
var tileSize = tileGrid.getTileSize(z);
var tileResolution = tileGrid.getResolution(z);
@@ -339,7 +340,9 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
context.clearRect(x, y, tileSize[0], tileSize[1]);
}
if (tileState == ol.TileState.LOADED) {
context.drawImage(tile.getImage(), x, y);
context.drawImage(tile.getImage(),
tileGutter, tileGutter, tileSize[0], tileSize[1],
x, y, tileSize[0], tileSize[1]);
}
this.renderedTiles_[index] = tile;
}
@@ -358,7 +361,9 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
context.clearRect(x, y, width, height);
}
if (tileState == ol.TileState.LOADED) {
context.drawImage(tile.getImage(), x, y, width, height);
context.drawImage(tile.getImage(),
tileGutter, tileGutter, tileSize[0], tileSize[1],
x, y, width, height);
}
interimTileRange =
tileGrid.getTileRangeForExtentAndZ(tileExtent, z, tmpTileRange);