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

Rename triangles to triangulation to be more precise

Browse Source
This commit is contained in:
Petr Sloup
2015-06-03 16:09:05 +02:00
parent bf65b8a4fe
commit 6e08fc9e13
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ol/reproj/image.js
View File

@@ -55,9 +55,8 @@ ol.reproj.Image = function(sourceProj, targetProj,
* @private
* @type {!ol.reproj.Triangulation}
*/
this.triangles_ = ol.reproj.triangulation.createForExtent(
targetExtent, sourceProj, targetProj,
maxTargetExtent, maxSourceExtent);
this.triangulation_ = ol.reproj.triangulation.createForExtent(
targetExtent, sourceProj, targetProj, maxTargetExtent, maxSourceExtent);
/**
* @private
@@ -71,7 +70,7 @@ ol.reproj.Image = function(sourceProj, targetProj,
*/
this.targetExtent_ = targetExtent;
var srcExtent = ol.reproj.triangulation.getSourceExtent(this.triangles_);
var srcExtent = ol.reproj.triangulation.getSourceExtent(this.triangulation_);
var targetCenter = ol.extent.getCenter(targetExtent);
var sourceResolution = ol.reproj.calculateSourceResolution(
@@ -133,7 +132,7 @@ ol.reproj.Image.prototype.reproject_ = function() {
// render the reprojected content
ol.reproj.renderTriangles(this.context_, this.srcImage_.getResolution(),
this.targetResolution_, this.targetExtent_,
this.triangles_, [{
this.triangulation_, [{
extent: this.srcImage_.getExtent(),
image: this.srcImage_.getImage()
}]);

26
src/ol/reproj/tile.js
View File

@@ -57,11 +57,18 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid,
*/
this.targetTileGrid_ = targetTileGrid;
var targetExtent = targetTileGrid.getTileCoordExtent(this.getTileCoord());
var maxTargetExtent = this.targetTileGrid_.getExtent();
var maxSourceExtent = this.sourceTileGrid_.getExtent();
/**
* @private
* @type {!ol.reproj.Triangulation}
*/
this.triangles_ = [];
this.triangulation_ = ol.reproj.triangulation.createForExtent(
targetExtent, sourceProj, targetProj,
maxTargetExtent, maxSourceExtent);
/**
* @private
@@ -81,23 +88,14 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid,
*/
this.srcZ_ = 0;
var targetExtent = targetTileGrid.getTileCoordExtent(this.getTileCoord());
var maxTargetExtent = this.targetTileGrid_.getExtent();
var maxSourceExtent = this.sourceTileGrid_.getExtent();
if (!ol.extent.intersects(maxTargetExtent, targetExtent)) {
// Tile is completely outside range -> EMPTY
// TODO: is it actually correct that the source even creates the tile ?
this.state = ol.TileState.EMPTY;
//return;
return;
}
this.triangles_ = ol.reproj.triangulation.createForExtent(
targetExtent, sourceProj, targetProj,
maxTargetExtent, maxSourceExtent);
if (this.triangles_.length === 0) {
if (this.triangulation_.triangles.length === 0) {
// no valid triangles -> EMPTY
this.state = ol.TileState.EMPTY;
return;
@@ -116,7 +114,7 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid,
}
this.srcZ_ = sourceTileGrid.getZForResolution(sourceResolution);
var srcExtent = ol.reproj.triangulation.getSourceExtent(this.triangles_);
var srcExtent = ol.reproj.triangulation.getSourceExtent(this.triangulation_);
var sourceProjExtent = sourceProj.getExtent();
if (!sourceProj.isGlobal() && sourceProjExtent) {
@@ -241,7 +239,7 @@ ol.reproj.Tile.prototype.reproject_ = function() {
if (sources.length > 0) {
var targetExtent = this.targetTileGrid_.getTileCoordExtent(tileCoord);
ol.reproj.renderTriangles(context, srcResolution, targetResolution,
targetExtent, this.triangles_, sources);
targetExtent, this.triangulation_, sources);
}
this.canvas_ = context.canvas;