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

Remove goog.net.* and goog.async.AnimationDelay

Browse Source
This commit is contained in:
Andreas Hocevar
2016-01-27 23:15:17 +01:00
parent 2b451e7893
commit f35d0106b8
10 changed files with 123 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ol/source/bingmapssource.js
View File

@@ -1,12 +1,11 @@
goog.provide('ol.source.BingMaps');
goog.require('goog.Uri');
goog.require('goog.asserts');
goog.require('goog.net.Jsonp');
goog.require('ol.Attribution');
goog.require('ol.TileRange');
goog.require('ol.TileUrlFunction');
goog.require('ol.extent');
goog.require('ol.net.Jsonp');
goog.require('ol.proj');
goog.require('ol.source.State');
goog.require('ol.source.TileImage');
@@ -46,16 +45,12 @@ ol.source.BingMaps = function(options) {
*/
this.maxZoom_ = options.maxZoom !== undefined ? options.maxZoom : -1;
var uri = new goog.Uri(
'https://dev.virtualearth.net/REST/v1/Imagery/Metadata/' +
options.imagerySet);
var url = 'https://dev.virtualearth.net/REST/v1/Imagery/Metadata/' +
options.imagerySet +
'?uriScheme=https&include=ImageryProviders&key=' + options.key;
var jsonp = new goog.net.Jsonp(uri, 'jsonp');
jsonp.send({
'include': 'ImageryProviders',
'uriScheme': 'https',
'key': options.key
}, this.handleImageryMetadataResponse.bind(this));
ol.net.Jsonp(url, this.handleImageryMetadataResponse.bind(this), undefined,
'jsonp');
};
goog.inherits(ol.source.BingMaps, ol.source.TileImage);

23
src/ol/source/tilejsonsource.js
View File

@@ -8,15 +8,11 @@ goog.provide('ol.source.TileJSON');
goog.provide('ol.tilejson');
goog.require('goog.asserts');
goog.require('ol.events');
goog.require('goog.net.CorsXmlHttpFactory');
goog.require('goog.net.EventType');
goog.require('goog.net.Jsonp');
goog.require('goog.net.XhrIo');
goog.require('ol.Attribution');
goog.require('ol.TileRange');
goog.require('ol.TileUrlFunction');
goog.require('ol.extent');
goog.require('ol.net.Jsonp');
goog.require('ol.proj');
goog.require('ol.source.State');
goog.require('ol.source.TileImage');
@@ -44,21 +40,20 @@ ol.source.TileJSON = function(options) {
});
if (options.jsonp) {
var request = new goog.net.Jsonp(options.url);
request.send(undefined, this.handleTileJSONResponse.bind(this),
ol.net.Jsonp(options.url, this.handleTileJSONResponse.bind(this),
this.handleTileJSONError.bind(this));
} else {
var xhr = new goog.net.XhrIo(new goog.net.CorsXmlHttpFactory());
ol.events.listen(xhr, goog.net.EventType.COMPLETE, function(e) {
if (xhr.isSuccess()) {
var response = /** @type {TileJSON} */(xhr.getResponseJson());
var xhr = new XMLHttpRequest();
xhr.open('GET', options.url);
xhr.onload = function(e) {
if (xhr.status < 400) {
var response = /** @type {TileJSON} */(JSON.parse(xhr.responseText));
this.handleTileJSONResponse(response);
} else {
this.handleTileJSONError();
}
xhr.dispose();
}, false, this);
xhr.send(options.url);
}.bind(this);
xhr.send();
}
};

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

@@ -2,9 +2,6 @@ goog.provide('ol.source.TileUTFGrid');
goog.require('goog.asserts');
goog.require('goog.async.nextTick');
goog.require('ol.events');
goog.require('ol.events.EventType');
goog.require('goog.net.Jsonp');
goog.require('ol.Attribution');
goog.require('ol.Tile');
goog.require('ol.TileState');
@@ -12,6 +9,7 @@ goog.require('ol.TileUrlFunction');
goog.require('ol.events');
goog.require('ol.events.EventType');
goog.require('ol.extent');
goog.require('ol.net.Jsonp');
goog.require('ol.proj');
goog.require('ol.source.State');
goog.require('ol.source.Tile');
@@ -51,8 +49,7 @@ ol.source.TileUTFGrid = function(options) {
*/
this.template_ = undefined;
var request = new goog.net.Jsonp(options.url);
request.send(undefined, this.handleTileJSONResponse.bind(this));
ol.net.Jsonp(options.url, this.handleTileJSONResponse.bind(this));
};
goog.inherits(ol.source.TileUTFGrid, ol.source.Tile);
@@ -362,9 +359,8 @@ ol.source.TileUTFGridTile_.prototype.handleLoad_ = function(json) {
ol.source.TileUTFGridTile_.prototype.loadInternal_ = function() {
if (this.state == ol.TileState.IDLE) {
this.state = ol.TileState.LOADING;
var request = new goog.net.Jsonp(this.src_);
request.send(undefined, this.handleLoad_.bind(this),
this.handleError_.bind(this));
ol.net.Jsonp(this.src_, this.handleLoad_.bind(this),
this.handleError_.bind(this));
}
};