Merge pull request #432 from fredj/uri-url

Rename TileJSONOptions.uri to TileJSONOptions.url
This commit is contained in:
Frédéric Junod
2013-03-25 03:46:26 -07:00
4 changed files with 4 additions and 4 deletions

View File

@@ -155,7 +155,7 @@
@exportObjectLiteral ol.source.TileJSONOptions
@exportObjectLiteralProperty ol.source.TileJSONOptions.crossOrigin null|string|undefined
@exportObjectLiteralProperty ol.source.TileJSONOptions.uri string
@exportObjectLiteralProperty ol.source.TileJSONOptions.url string
@exportObjectLiteral ol.source.TiledWMSOptions
@exportObjectLiteralProperty ol.source.TiledWMSOptions.attributions Array.<ol.Attribution>|undefined

View File

@@ -61,7 +61,7 @@ ol.source.TileJSON = function(tileJsonOptions) {
* @type {!goog.async.Deferred}
*/
this.deferred_ =
goog.net.jsloader.load(tileJsonOptions.uri, {cleanupWhenDone: true});
goog.net.jsloader.load(tileJsonOptions.url, {cleanupWhenDone: true});
this.deferred_.addCallback(this.handleTileJSONResponse, this);
};