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

Named exports from ol/net

Browse Source
This commit is contained in:
Tim Schaub
2018-02-07 11:35:05 -07:00
parent 3266ffc58f
commit cd9b06135f
6 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/net.js
View File

@@ -2,7 +2,6 @@
* @module ol/net
*/
import {getUid} from './index.js';
const _ol_net_ = {};
/**
@@ -16,7 +15,7 @@ const _ol_net_ = {};
* @param {string=} opt_callbackParam Custom query parameter for the JSONP
* callback. Default is 'callback'.
*/
_ol_net_.jsonp = function(url, callback, opt_errback, opt_callbackParam) {
export function jsonp(url, callback, opt_errback, opt_callbackParam) {
const script = document.createElement('script');
const key = 'olc_' + getUid(callback);
function cleanup() {
@@ -38,5 +37,4 @@ _ol_net_.jsonp = function(url, callback, opt_errback, opt_callbackParam) {
callback(data);
};
document.getElementsByTagName('head')[0].appendChild(script);
};
export default _ol_net_;
}

4
src/ol/source/BingMaps.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../index.js';
import {createFromTileUrlFunctions} from '../tileurlfunction.js';
import {applyTransform, intersects} from '../extent.js';
import _ol_net_ from '../net.js';
import {jsonp as requestJSONP} from '../net.js';
import {get as getProjection, getTransformFromProjections} from '../proj.js';
import SourceState from '../source/State.js';
import TileImage from '../source/TileImage.js';
@@ -70,7 +70,7 @@ const BingMaps = function(options) {
'?uriScheme=https&include=ImageryProviders&key=' + this.apiKey_ +
'&c=' + this.culture_;
_ol_net_.jsonp(url, this.handleImageryMetadataResponse.bind(this), undefined,
requestJSONP(url, this.handleImageryMetadataResponse.bind(this), undefined,
'jsonp');
};

4
src/ol/source/TileJSON.js
View File

@@ -11,7 +11,7 @@ import {inherits} from '../index.js';
import {createFromTemplates} from '../tileurlfunction.js';
import {assert} from '../asserts.js';
import {applyTransform, intersects} from '../extent.js';
import _ol_net_ from '../net.js';
import {jsonp as requestJSONP} from '../net.js';
import {get as getProjection, getTransformFromProjections} from '../proj.js';
import SourceState from '../source/State.js';
import TileImage from '../source/TileImage.js';
@@ -48,7 +48,7 @@ const TileJSON = function(options) {
if (options.url) {
if (options.jsonp) {
_ol_net_.jsonp(options.url, this.handleTileJSONResponse.bind(this),
requestJSONP(options.url, this.handleTileJSONResponse.bind(this),
this.handleTileJSONError.bind(this));
} else {
const client = new XMLHttpRequest();

6
src/ol/source/TileUTFGrid.js
View File

@@ -9,7 +9,7 @@ import {assert} from '../asserts.js';
import {listenOnce} from '../events.js';
import EventType from '../events/EventType.js';
import {applyTransform, intersects} from '../extent.js';
import _ol_net_ from '../net.js';
import {jsonp as requestJSONP} from '../net.js';
import {get as getProjection, getTransformFromProjections} from '../proj.js';
import SourceState from '../source/State.js';
import TileSource from '../source/Tile.js';
@@ -58,7 +58,7 @@ const UTFGrid = function(options) {
if (options.url) {
if (this.jsonp_) {
_ol_net_.jsonp(options.url, this.handleTileJSONResponse.bind(this),
requestJSONP(options.url, this.handleTileJSONResponse.bind(this),
this.handleTileJSONError.bind(this));
} else {
const client = new XMLHttpRequest();
@@ -425,7 +425,7 @@ UTFGrid.Tile_.prototype.loadInternal_ = function() {
if (this.state == TileState.IDLE) {
this.state = TileState.LOADING;
if (this.jsonp_) {
_ol_net_.jsonp(this.src_, this.handleLoad_.bind(this),
requestJSONP(this.src_, this.handleLoad_.bind(this),
this.handleError_.bind(this));
} else {
const client = new XMLHttpRequest();