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

Use ol.inherits instead of goog.inherits

Browse Source
This commit is contained in:
Frederic Junod
2016-04-07 16:26:11 +02:00
parent 072728b083
commit e289bfbb7d
166 changed files with 448 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ol/source/tileimagesource.js
View File

@@ -23,7 +23,7 @@ goog.require('ol.source.UrlTile');
*/
ol.source.TileImage = function(options) {
goog.base(this, {
ol.source.UrlTile.call(this, {
attributions: options.attributions,
cacheSize: options.cacheSize,
extent: options.extent,
@@ -80,7 +80,7 @@ ol.source.TileImage = function(options) {
*/
this.renderReprojectionEdges_ = false;
};
goog.inherits(ol.source.TileImage, ol.source.UrlTile);
ol.inherits(ol.source.TileImage, ol.source.UrlTile);
/**
@@ -88,7 +88,7 @@ goog.inherits(ol.source.TileImage, ol.source.UrlTile);
*/
ol.source.TileImage.prototype.canExpireCache = function() {
if (!ol.ENABLE_RASTER_REPROJECTION) {
return goog.base(this, 'canExpireCache');
return ol.source.UrlTile.prototype.canExpireCache.call(this);
}
if (this.tileCache.canExpireCache()) {
return true;
@@ -108,7 +108,7 @@ ol.source.TileImage.prototype.canExpireCache = function() {
*/
ol.source.TileImage.prototype.expireCache = function(projection, usedTiles) {
if (!ol.ENABLE_RASTER_REPROJECTION) {
goog.base(this, 'expireCache', projection, usedTiles);
ol.source.UrlTile.prototype.expireCache.call(this, projection, usedTiles);
return;
}
var usedTileCache = this.getTileCacheForProjection(projection);
@@ -153,7 +153,7 @@ ol.source.TileImage.prototype.getOpaque = function(projection) {
!ol.proj.equivalent(this.getProjection(), projection)) {
return false;
} else {
return goog.base(this, 'getOpaque', projection);
return ol.source.UrlTile.prototype.getOpaque.call(this, projection);
}
};
@@ -163,7 +163,7 @@ ol.source.TileImage.prototype.getOpaque = function(projection) {
*/
ol.source.TileImage.prototype.getTileGridForProjection = function(projection) {
if (!ol.ENABLE_RASTER_REPROJECTION) {
return goog.base(this, 'getTileGridForProjection', projection);
return ol.source.UrlTile.prototype.getTileGridForProjection.call(this, projection);
}
var thisProj = this.getProjection();
if (this.tileGrid &&
@@ -185,7 +185,7 @@ ol.source.TileImage.prototype.getTileGridForProjection = function(projection) {
*/
ol.source.TileImage.prototype.getTileCacheForProjection = function(projection) {
if (!ol.ENABLE_RASTER_REPROJECTION) {
return goog.base(this, 'getTileCacheForProjection', projection);
return ol.source.UrlTile.prototype.getTileCacheForProjection.call(this, projection);
}
var thisProj = this.getProjection();
if (!thisProj || ol.proj.equivalent(thisProj, projection)) {