Merge pull request #3225 from tschaub/attributions

Respect attributions passed to TileJSON source.
This commit is contained in:
Tim Schaub
2015-02-11 10:36:27 -07:00
2 changed files with 15 additions and 2 deletions

View File

@@ -33,6 +33,7 @@ goog.require('ol.tilegrid.XYZ');
ol.source.TileJSON = function(options) {
goog.base(this, {
attributions: options.attributions,
crossOrigin: options.crossOrigin,
projection: ol.proj.get('EPSG:3857'),
state: ol.source.State.LOADING,
@@ -87,7 +88,8 @@ ol.source.TileJSON.prototype.handleTileJSONResponse = function(tileJSON) {
}),
ol.TileUrlFunction.createFromTemplates(tileJSON.tiles));
if (goog.isDef(tileJSON.attribution)) {
if (goog.isDef(tileJSON.attribution) &&
goog.isNull(this.getAttributions())) {
var attributionExtent = goog.isDef(extent) ?
extent : epsg4326Projection.getExtent();
/** @type {Object.<string, Array.<ol.TileRange>>} */