Rename ol.RASTER_REPROJ_* constants to full ol.RASTER_REPROJECTION_*
This commit is contained in:
10
src/ol/ol.js
10
src/ol/ol.js
@@ -32,7 +32,7 @@ ol.DEFAULT_MIN_ZOOM = 0;
|
||||
* @define {number} Default maximum allowed threshold (in pixels) for
|
||||
* reprojection triangulation. Default is `0.5`.
|
||||
*/
|
||||
ol.DEFAULT_RASTER_REPROJ_ERROR_THRESHOLD = 0.5;
|
||||
ol.DEFAULT_RASTER_REPROJECTION_ERROR_THRESHOLD = 0.5;
|
||||
|
||||
|
||||
/**
|
||||
@@ -183,7 +183,7 @@ ol.OVERVIEWMAP_MIN_RATIO = 0.1;
|
||||
* If too many tiles are required, no tiles are loaded and
|
||||
* `ol.TileState.ERROR` state is set. Default is `100`.
|
||||
*/
|
||||
ol.RASTER_REPROJ_MAX_SOURCE_TILES = 100;
|
||||
ol.RASTER_REPROJECTION_MAX_SOURCE_TILES = 100;
|
||||
|
||||
|
||||
/**
|
||||
@@ -192,7 +192,7 @@ ol.RASTER_REPROJ_MAX_SOURCE_TILES = 100;
|
||||
* number of proj4 calls (for certain transformations and areas).
|
||||
* At most `2*(2^this)` triangles are created. Default is `10`.
|
||||
*/
|
||||
ol.RASTER_REPROJ_MAX_SUBDIVISION = 10;
|
||||
ol.RASTER_REPROJECTION_MAX_SUBDIVISION = 10;
|
||||
|
||||
|
||||
/**
|
||||
@@ -201,10 +201,10 @@ ol.RASTER_REPROJ_MAX_SUBDIVISION = 10;
|
||||
* the resulting triangulation seems to have zero error and no subdivision
|
||||
* is performed.
|
||||
* If the triangle width is more than this (relative to world width; 0-1),
|
||||
* subdivison is forced (respecting `ol.RASTER_REPROJ_MAX_SUBDIVISION`).
|
||||
* subdivison is forced (up to `ol.RASTER_REPROJECTION_MAX_SUBDIVISION`).
|
||||
* Default is `0.25`.
|
||||
*/
|
||||
ol.RASTER_REPROJ_MAX_TRIANGLE_WIDTH = 0.25;
|
||||
ol.RASTER_REPROJECTION_MAX_TRIANGLE_WIDTH = 0.25;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -50,7 +50,7 @@ ol.reproj.Image = function(sourceProj, targetProj,
|
||||
var sourceResolution = ol.reproj.calculateSourceResolution(
|
||||
sourceProj, targetProj, targetCenter, targetResolution);
|
||||
|
||||
var errorThresholdInPixels = ol.DEFAULT_RASTER_REPROJ_ERROR_THRESHOLD;
|
||||
var errorThresholdInPixels = ol.DEFAULT_RASTER_REPROJECTION_ERROR_THRESHOLD;
|
||||
|
||||
/**
|
||||
* @private
|
||||
|
||||
@@ -132,7 +132,7 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid,
|
||||
}
|
||||
|
||||
var errorThresholdInPixels = opt_errorThreshold !== undefined ?
|
||||
opt_errorThreshold : ol.DEFAULT_RASTER_REPROJ_ERROR_THRESHOLD;
|
||||
opt_errorThreshold : ol.DEFAULT_RASTER_REPROJECTION_ERROR_THRESHOLD;
|
||||
|
||||
/**
|
||||
* @private
|
||||
@@ -187,7 +187,8 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid,
|
||||
}
|
||||
|
||||
var tilesRequired = xRange.length * srcRange.getHeight();
|
||||
if (!goog.asserts.assert(tilesRequired < ol.RASTER_REPROJ_MAX_SOURCE_TILES,
|
||||
if (!goog.asserts.assert(
|
||||
tilesRequired < ol.RASTER_REPROJECTION_MAX_SOURCE_TILES,
|
||||
'reasonable number of tiles is required')) {
|
||||
this.state = ol.TileState.ERROR;
|
||||
return;
|
||||
|
||||
@@ -125,7 +125,7 @@ ol.reproj.Triangulation = function(sourceProj, targetProj, targetExtent,
|
||||
|
||||
this.addQuad_(tlDst, trDst, brDst, blDst,
|
||||
tlDstSrc, trDstSrc, brDstSrc, blDstSrc,
|
||||
ol.RASTER_REPROJ_MAX_SUBDIVISION);
|
||||
ol.RASTER_REPROJECTION_MAX_SUBDIVISION);
|
||||
|
||||
transformInvCache = {};
|
||||
};
|
||||
@@ -185,10 +185,12 @@ ol.reproj.Triangulation.prototype.addQuad_ = function(a, b, c, d,
|
||||
var tgtQuadExtent = ol.extent.boundingExtent([a, b, c, d]);
|
||||
var tgtCoverageX =
|
||||
ol.extent.getWidth(tgtQuadExtent) / this.targetWorldWidth_;
|
||||
needsSubdivision |= tgtCoverageX > ol.RASTER_REPROJ_MAX_TRIANGLE_WIDTH;
|
||||
needsSubdivision |=
|
||||
tgtCoverageX > ol.RASTER_REPROJECTION_MAX_TRIANGLE_WIDTH;
|
||||
}
|
||||
if (!wrapsX && this.sourceProj_.isGlobal() && srcCoverageX) {
|
||||
needsSubdivision |= srcCoverageX > ol.RASTER_REPROJ_MAX_TRIANGLE_WIDTH;
|
||||
needsSubdivision |=
|
||||
srcCoverageX > ol.RASTER_REPROJECTION_MAX_TRIANGLE_WIDTH;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user