Rename _ol_source_BingMaps_ to BingMaps

This commit is contained in:
Tim Schaub
2018-01-08 13:52:28 -07:00
parent ceca0803e4
commit f184f6685d
23 changed files with 54 additions and 54 deletions

View File

@@ -1,7 +1,7 @@
import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js';
import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
var styles = [
@@ -18,7 +18,7 @@ for (i = 0, ii = styles.length; i < ii; ++i) {
layers.push(new TileLayer({
visible: false,
preload: Infinity,
source: new _ol_source_BingMaps_({
source: new BingMaps({
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
imagerySet: styles[i]
// use maxZoom 19 to see stretched tiles instead of the BingMaps

View File

@@ -9,7 +9,7 @@ import {defaults as defaultInteractions} from '../src/ol/interaction.js';
import DragAndDrop from '../src/ol/interaction/DragAndDrop.js';
import VectorLayer from '../src/ol/layer/Vector.js';
import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -97,7 +97,7 @@ var map = new Map({
interactions: defaultInteractions().extend([dragAndDropInteraction]),
layers: [
new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
imagerySet: 'Aerial',
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
})

View File

@@ -9,7 +9,7 @@ import {defaults as defaultInteractions} from '../src/ol/interaction.js';
import DragAndDrop from '../src/ol/interaction/DragAndDrop.js';
import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -97,7 +97,7 @@ var map = new Map({
interactions: defaultInteractions().extend([dragAndDropInteraction]),
layers: [
new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
imagerySet: 'Aerial',
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
})

View File

@@ -5,7 +5,7 @@ import Polyline from '../src/ol/format/Polyline.js';
import Point from '../src/ol/geom/Point.js';
import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -138,7 +138,7 @@ var map = new Map({
}),
layers: [
new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
imagerySet: 'AerialWithLabels',
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
})

View File

@@ -5,7 +5,7 @@ import FullScreen from '../src/ol/control/FullScreen.js';
import {defaults as defaultInteractions} from '../src/ol/interaction.js';
import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js';
import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
var map = new Map({
@@ -17,7 +17,7 @@ var map = new Map({
]),
layers: [
new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
imagerySet: 'Aerial'
})

View File

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
import {defaults as defaultControls} from '../src/ol/control.js';
import FullScreen from '../src/ol/control/FullScreen.js';
import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
var view = new View({
@@ -17,7 +17,7 @@ var map = new Map({
]),
layers: [
new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
imagerySet: 'Aerial'
})

View File

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
import GPX from '../src/ol/format/GPX.js';
import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -11,7 +11,7 @@ import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js';
var raster = new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
imagerySet: 'Aerial',
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
})

View File

@@ -2,12 +2,12 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js';
import TileLayer from '../src/ol/layer/Tile.js';
import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5';
var imagery = new TileLayer({
source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'})
source: new BingMaps({key: key, imagerySet: 'Aerial'})
});
var map = new Map({

View File

@@ -3,11 +3,11 @@ import View from '../src/ol/View.js';
import KML from '../src/ol/format/KML.js';
import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import VectorSource from '../src/ol/source/Vector.js';
var raster = new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
imagerySet: 'Aerial',
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
})

View File

@@ -2,16 +2,16 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js';
import TileLayer from '../src/ol/layer/Tile.js';
import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5';
var roads = new TileLayer({
source: new _ol_source_BingMaps_({key: key, imagerySet: 'Road'})
source: new BingMaps({key: key, imagerySet: 'Road'})
});
var imagery = new TileLayer({
source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'})
source: new BingMaps({key: key, imagerySet: 'Aerial'})
});
var container = document.getElementById('map');

View File

@@ -2,14 +2,14 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js';
import {defaults as defaultControls} from '../src/ol/control.js';
import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
var osm = new TileLayer({
source: new _ol_source_OSM_()
});
var bing = new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
imagerySet: 'Aerial'
})

View File

@@ -2,12 +2,12 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js';
import TileLayer from '../src/ol/layer/Tile.js';
import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5';
var imagery = new TileLayer({
source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'})
source: new BingMaps({key: key, imagerySet: 'Aerial'})
});
var container = document.getElementById('map');

View File

@@ -2,7 +2,7 @@ import Geolocation from '../src/ol/Geolocation.js';
import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js';
import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
var view = new View({
@@ -13,7 +13,7 @@ var view = new View({
var map = new Map({
layers: [
new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
imagerySet: 'Road'
})

View File

@@ -1,7 +1,7 @@
import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js';
import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
var view = new View({
@@ -13,7 +13,7 @@ var map1 = new Map({
layers: [
new TileLayer({
preload: Infinity,
source: new _ol_source_BingMaps_({
source: new BingMaps({
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
imagerySet: 'Aerial'
})
@@ -27,7 +27,7 @@ var map2 = new Map({
layers: [
new TileLayer({
preload: 0, // default value
source: new _ol_source_BingMaps_({
source: new BingMaps({
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
imagerySet: 'AerialWithLabels'
})

View File

@@ -4,7 +4,7 @@ import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js';
import ImageLayer from '../src/ol/layer/Image.js';
import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import RasterSource from '../src/ol/source/Raster.js';
var minVgi = 0;
@@ -49,7 +49,7 @@ function summarize(value, counts) {
/**
* Use aerial imagery as the input data for the raster source.
*/
var bing = new _ol_source_BingMaps_({
var bing = new BingMaps({
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
imagerySet: 'Aerial'
});

View File

@@ -4,7 +4,7 @@ import View from '../src/ol/View.js';
import ImageLayer from '../src/ol/layer/Image.js';
import TileLayer from '../src/ol/layer/Tile.js';
import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import RasterSource from '../src/ol/source/Raster.js';
function growRegion(inputs, data) {
@@ -75,7 +75,7 @@ function next4Edges(edge) {
var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5';
var imagery = new TileLayer({
source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'})
source: new BingMaps({key: key, imagerySet: 'Aerial'})
});
var raster = new RasterSource({

View File

@@ -4,7 +4,7 @@ import * as _ol_extent_ from '../src/ol/extent.js';
import GeoJSON from '../src/ol/format/GeoJSON.js';
import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -23,7 +23,7 @@ var style = new _ol_style_Style_({
var viewExtent = [1817379, 6139595, 1827851, 6143616];
var map = new Map({
layers: [new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
imagerySet: 'Aerial'
})

View File

@@ -6,7 +6,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
import {transformExtent} from '../src/ol/proj.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -116,7 +116,7 @@ var vector = new VectorLayer({
});
var raster = new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
imagerySet: 'Aerial',
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
})

View File

@@ -5,7 +5,7 @@ import WFS from '../src/ol/format/WFS.js';
import GeoJSON from '../src/ol/format/GeoJSON.js';
import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -23,7 +23,7 @@ var vector = new VectorLayer({
});
var raster = new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
imagerySet: 'Aerial',
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
})

View File

@@ -4,7 +4,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -33,7 +33,7 @@ var vector = new VectorLayer({
});
var raster = new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
imagerySet: 'Aerial',
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'
})

View File

@@ -1,14 +1,14 @@
import Map from '../src/ol/Map.js';
import View from '../src/ol/View.js';
import TileLayer from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import BingMaps from '../src/ol/source/BingMaps.js';
var map = new Map({
target: 'map',
layers: [
new TileLayer({
source: new _ol_source_BingMaps_({
source: new BingMaps({
key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
imagerySet: 'Aerial'
})

View File

@@ -20,7 +20,7 @@ import _ol_tilegrid_ from '../tilegrid.js';
* @param {olx.source.BingMapsOptions} options Bing Maps options.
* @api
*/
var _ol_source_BingMaps_ = function(options) {
var BingMaps = function(options) {
/**
* @private
@@ -75,7 +75,7 @@ var _ol_source_BingMaps_ = function(options) {
};
inherits(_ol_source_BingMaps_, _ol_source_TileImage_);
inherits(BingMaps, _ol_source_TileImage_);
/**
@@ -85,7 +85,7 @@ inherits(_ol_source_BingMaps_, _ol_source_TileImage_);
* @type {string}
* @api
*/
_ol_source_BingMaps_.TOS_ATTRIBUTION = '<a class="ol-attribution-bing-tos" ' +
BingMaps.TOS_ATTRIBUTION = '<a class="ol-attribution-bing-tos" ' +
'href="https://www.microsoft.com/maps/product/terms.html">' +
'Terms of Use</a>';
@@ -96,7 +96,7 @@ _ol_source_BingMaps_.TOS_ATTRIBUTION = '<a class="ol-attribution-bing-tos" ' +
* @return {string} The api key.
* @api
*/
_ol_source_BingMaps_.prototype.getApiKey = function() {
BingMaps.prototype.getApiKey = function() {
return this.apiKey_;
};
@@ -107,7 +107,7 @@ _ol_source_BingMaps_.prototype.getApiKey = function() {
* @return {string} The imagery set.
* @api
*/
_ol_source_BingMaps_.prototype.getImagerySet = function() {
BingMaps.prototype.getImagerySet = function() {
return this.imagerySet_;
};
@@ -115,7 +115,7 @@ _ol_source_BingMaps_.prototype.getImagerySet = function() {
/**
* @param {BingMapsImageryMetadataResponse} response Response.
*/
_ol_source_BingMaps_.prototype.handleImageryMetadataResponse = function(response) {
BingMaps.prototype.handleImageryMetadataResponse = function(response) {
if (response.statusCode != 200 ||
response.statusDescription != 'OK' ||
response.authenticationResultCode != 'ValidCredentials' ||
@@ -199,11 +199,11 @@ _ol_source_BingMaps_.prototype.handleImageryMetadataResponse = function(response
}
});
attributions.push(_ol_source_BingMaps_.TOS_ATTRIBUTION);
attributions.push(BingMaps.TOS_ATTRIBUTION);
return attributions;
});
}
this.setState(SourceState.READY);
};
export default _ol_source_BingMaps_;
export default BingMaps;

View File

@@ -1,5 +1,5 @@
import _ol_net_ from '../../../../src/ol/net.js';
import _ol_source_BingMaps_ from '../../../../src/ol/source/BingMaps.js';
import BingMaps from '../../../../src/ol/source/BingMaps.js';
import _ol_tilecoord_ from '../../../../src/ol/tilecoord.js';
import Observable from '../../../../src/ol/Observable.js';
@@ -21,7 +21,7 @@ describe('ol.source.BingMaps', function() {
};
client.send();
};
source = new _ol_source_BingMaps_({
source = new BingMaps({
imagerySet: 'AerialWithLabels',
key: ''
});