Refactor to support stricter new compiler

This commit is contained in:
Tom Payne
2012-09-24 22:42:41 +02:00
parent 2d7a21eaa0
commit c43e04ea77
3 changed files with 11 additions and 12 deletions

View File

@@ -217,15 +217,8 @@ ol.control.Attribution.prototype.getLayerAttributionVisiblities_ =
if (store instanceof ol.TileStore) {
attributionVisible = goog.array.some(
coverageAreas,
/**
* @param {ol.TileCoverageArea} tileCoverageArea
* Tile coverage area.
* @param {number} index Index.
*/
function(tileCoverageArea, index) {
goog.asserts.assert(
tileCoverageArea instanceof ol.TileCoverageArea);
return tileCoverageArea.intersectsExtentAndZ(mapExtent, mapZ);
function(coverageArea, index) {
return coverageArea.intersectsExtentAndZ(mapExtent, mapZ);
});
} else {
attributionVisible = goog.array.some(

View File

@@ -35,6 +35,14 @@ ol.CoverageArea.prototype.intersectsExtent = function(extent) {
ol.CoverageArea.prototype.intersectsExtentAndResolution = goog.abstractMethod;
/**
* @param {ol.Extent} extent Extent.
* @param {number} z Z.
* @return {boolean} Intersects.
*/
ol.CoverageArea.prototype.intersectsExtentAndZ = goog.abstractMethod;
/**
* @param {ol.TransformFunction} transformFn Transform.
* @return {ol.CoverageArea} Transformed coverage area.

View File

@@ -51,9 +51,7 @@ ol.TileCoverageArea.prototype.intersectsExtentAndResolution =
/**
* @param {ol.Extent} extent Extent.
* @param {number} z Z.
* @return {boolean} Intersects.
* @inheritDoc
*/
ol.TileCoverageArea.prototype.intersectsExtentAndZ = function(extent, z) {
return this.minZ_ <= z && z <= this.maxZ_ && this.intersectsExtent(extent);