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

[ol.layer.TileLayer] use ol.error

Browse Source
This commit is contained in:
Éric Lemoine
2012-06-22 18:46:52 +02:00
parent a26913f26e
commit 5dc156995a
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ol/layer/TileLayer.js
View File

@@ -1,5 +1,6 @@
goog.provide('ol.layer.TileLayer');
goog.require('ol.error');
goog.require('ol.layer.Layer');
goog.require('ol.Tile');
goog.require('ol.TileCache');
@@ -182,7 +183,7 @@ ol.layer.TileLayer.prototype.getTileOrigin = function() {
goog.isDef(this.tileOriginY_)) {
return [this.tileOriginX_, this.tileOriginY_];
}
var errmsg;
var errmsg = 'Cannot calculate tile origin; ';
if (goog.isDef(this.tileOriginCorner_)) {
var extent = this.getExtent();
if (!goog.isNull(extent)) {
@@ -205,16 +206,16 @@ ol.layer.TileLayer.prototype.getTileOrigin = function() {
tileOriginY = extent.getMinY();
break;
default:
// FIXME user error
goog.asserts.assert(false);
errmsg += 'tileOriginCorner value is incorrect.';
ol.error(errmsg);
}
return [tileOriginX, tileOriginY];
}
// FIXME user error
goog.asserts.assert(false);
errmsg += 'layer has no extent.';
ol.error(errmsg);
}
// FIXME user error
goog.asserts.assert(false);
errmsg += 'layer has no tileOriginCorner.';
ol.error(errmsg);
return null;
};

4
test/spec/ol/layer/TileLayer.test.js
View File

@@ -97,7 +97,7 @@ describe('ol.layer.TileLayer', function() {
it('throws an error or return null', function() {
var origin;
if (goog.DEBUG) {
if (ol.error.VERBOSE_ERRORS) {
expect(function() {
origin = layer.getTileOrigin();
}).toThrow();
@@ -118,7 +118,7 @@ describe('ol.layer.TileLayer', function() {
});
it('returns the expected origin', function() {
if (goog.DEBUG) {
if (ol.error.VERBOSE_ERRORS) {
expect(function() {
var origin = layer.getTileOrigin();
}).toThrow();