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

Merge pull request #5120 from ahocevar/utfgrid-config

Browse Source 
Add tileJSON option to ol.source.TileUTFGrid
This commit is contained in:
Andreas Hocevar
2016-03-24 23:13:19 +01:00
parent 2159a35bb8 c0de5a6835
commit f835364822
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
externs/olx.js
View File

@@ -4123,7 +4123,8 @@ olx.source.ClusterOptions.prototype.wrapX;
/**
* @typedef {{preemptive: (boolean|undefined),
* url: string}}
* tileJSON: (TileJSON|undefined),
* url: (string|undefined)}}
* @api
*/
olx.source.TileUTFGridOptions;
@@ -4143,7 +4144,18 @@ olx.source.TileUTFGridOptions.prototype.preemptive;
/**
* @type {string}
* TileJSON configuration for this source. If not provided, `url` must be
* configured.
* @type {TileJSON|undefined}
* @api
*/
olx.source.TileUTFGridOptions.prototype.tileJSON;
/**
* TileJSON endpoint that provides the configuration for this source. Request
* will be made through JSONP. If not provided, `tileJSON` must be configured.
* @type {string|undefined}
* @api
*/
olx.source.TileUTFGridOptions.prototype.url;

8
src/ol/source/tileutfgridsource.js
View File

@@ -49,7 +49,13 @@ ol.source.TileUTFGrid = function(options) {
*/
this.template_ = undefined;
ol.net.jsonp(options.url, this.handleTileJSONResponse.bind(this));
if (options.url) {
ol.net.jsonp(options.url, this.handleTileJSONResponse.bind(this));
} else if (options.tileJSON) {
this.handleTileJSONResponse(options.tileJSON);
} else {
goog.asserts.fail('Either url or tileJSON options must be provided');
}
};
goog.inherits(ol.source.TileUTFGrid, ol.source.Tile);