diff --git a/examples/wmts-dimensions.js b/examples/wmts-dimensions.js index 3a9a4c12b1..6004e66d8f 100644 --- a/examples/wmts-dimensions.js +++ b/examples/wmts-dimensions.js @@ -5,7 +5,7 @@ import TileLayer from '../src/ol/layer/Tile.js'; import {get as getProjection} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_WMTS_ from '../src/ol/source/WMTS.js'; -import _ol_tilegrid_WMTS_ from '../src/ol/tilegrid/WMTS.js'; +import WMTSTileGrid from '../src/ol/tilegrid/WMTS.js'; // create the WMTS tile grid in the google projection @@ -18,7 +18,7 @@ for (var i = 0; i <= 14; i++) { matrixIds[i] = i; resolutions[i] = tileSizeMtrs / Math.pow(2, i); } -var tileGrid = new _ol_tilegrid_WMTS_({ +var tileGrid = new WMTSTileGrid({ origin: _ol_extent_.getTopLeft(projection.getExtent()), resolutions: resolutions, matrixIds: matrixIds diff --git a/examples/wmts-ign.js b/examples/wmts-ign.js index a9a1ca5fe5..3ce1ab5ef6 100644 --- a/examples/wmts-ign.js +++ b/examples/wmts-ign.js @@ -5,7 +5,7 @@ import * as _ol_extent_ from '../src/ol/extent.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat, get as getProjection} from '../src/ol/proj.js'; import _ol_source_WMTS_ from '../src/ol/source/WMTS.js'; -import _ol_tilegrid_WMTS_ from '../src/ol/tilegrid/WMTS.js'; +import WMTSTileGrid from '../src/ol/tilegrid/WMTS.js'; var map = new Map({ @@ -31,7 +31,7 @@ for (var i = 0; i < 18; i++) { resolutions[i] = maxResolution / Math.pow(2, i); } -var tileGrid = new _ol_tilegrid_WMTS_({ +var tileGrid = new WMTSTileGrid({ origin: [-20037508, 20037508], resolutions: resolutions, matrixIds: matrixIds diff --git a/examples/wmts.js b/examples/wmts.js index 7ca572e21e..4a6adfe0a9 100644 --- a/examples/wmts.js +++ b/examples/wmts.js @@ -6,7 +6,7 @@ import TileLayer from '../src/ol/layer/Tile.js'; import {get as getProjection} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_WMTS_ from '../src/ol/source/WMTS.js'; -import _ol_tilegrid_WMTS_ from '../src/ol/tilegrid/WMTS.js'; +import WMTSTileGrid from '../src/ol/tilegrid/WMTS.js'; var projection = getProjection('EPSG:3857'); @@ -37,7 +37,7 @@ var map = new Map({ matrixSet: 'EPSG:3857', format: 'image/png', projection: projection, - tileGrid: new _ol_tilegrid_WMTS_({ + tileGrid: new WMTSTileGrid({ origin: _ol_extent_.getTopLeft(projectionExtent), resolutions: resolutions, matrixIds: matrixIds diff --git a/src/ol/source/WMTS.js b/src/ol/source/WMTS.js index 21a7aae4da..a716513d6f 100644 --- a/src/ol/source/WMTS.js +++ b/src/ol/source/WMTS.js @@ -8,8 +8,8 @@ import {containsExtent} from '../extent.js'; import _ol_obj_ from '../obj.js'; import {get as getProjection, equivalent, transformExtent} from '../proj.js'; import _ol_source_TileImage_ from '../source/TileImage.js'; -import _ol_source_WMTSRequestEncoding_ from '../source/WMTSRequestEncoding.js'; -import _ol_tilegrid_WMTS_ from '../tilegrid/WMTS.js'; +import WMTSRequestEncoding from '../source/WMTSRequestEncoding.js'; +import {createFromCapabilitiesMatrixSet} from '../tilegrid/WMTS.js'; import _ol_uri_ from '../uri.js'; /** @@ -75,7 +75,7 @@ var _ol_source_WMTS_ = function(options) { */ this.requestEncoding_ = options.requestEncoding !== undefined ? /** @type {ol.source.WMTSRequestEncoding} */ (options.requestEncoding) : - _ol_source_WMTSRequestEncoding_.KVP; + WMTSRequestEncoding.KVP; var requestEncoding = this.requestEncoding_; @@ -91,7 +91,7 @@ var _ol_source_WMTS_ = function(options) { 'tilematrixset': this.matrixSet_ }; - if (requestEncoding == _ol_source_WMTSRequestEncoding_.KVP) { + if (requestEncoding == WMTSRequestEncoding.KVP) { _ol_obj_.assign(context, { 'Service': 'WMTS', 'Request': 'GetTile', @@ -113,7 +113,7 @@ var _ol_source_WMTS_ = function(options) { // order conforms to wmts spec guidance, and so that we can avoid to escape // special template params - template = (requestEncoding == _ol_source_WMTSRequestEncoding_.KVP) ? + template = (requestEncoding == WMTSRequestEncoding.KVP) ? _ol_uri_.appendParams(template, context) : template.replace(/\{(\w+?)\}/g, function(m, p) { return (p.toLowerCase() in context) ? context[p.toLowerCase()] : m; @@ -137,7 +137,7 @@ var _ol_source_WMTS_ = function(options) { }; _ol_obj_.assign(localContext, dimensions); var url = template; - if (requestEncoding == _ol_source_WMTSRequestEncoding_.KVP) { + if (requestEncoding == WMTSRequestEncoding.KVP) { url = _ol_uri_.appendParams(url, localContext); } else { url = url.replace(/\{(\w+?)\}/g, function(m, p) { @@ -419,8 +419,7 @@ _ol_source_WMTS_.optionsFromCapabilities = function(wmtsCap, config) { } } - var tileGrid = _ol_tilegrid_WMTS_.createFromCapabilitiesMatrixSet( - matrixSetObj, extent, matrixLimits); + var tileGrid = createFromCapabilitiesMatrixSet(matrixSetObj, extent, matrixLimits); /** @type {!Array.} */ var urls = []; @@ -441,21 +440,21 @@ _ol_source_WMTS_.optionsFromCapabilities = function(wmtsCap, config) { // requestEncoding not provided, use the first encoding from the list requestEncoding = encodings[0]; } - if (requestEncoding === _ol_source_WMTSRequestEncoding_.KVP) { - if (includes(encodings, _ol_source_WMTSRequestEncoding_.KVP)) { + if (requestEncoding === WMTSRequestEncoding.KVP) { + if (includes(encodings, WMTSRequestEncoding.KVP)) { urls.push(/** @type {string} */ (gets[i]['href'])); } } else { break; } } else if (gets[i]['href']) { - requestEncoding = _ol_source_WMTSRequestEncoding_.KVP; + requestEncoding = WMTSRequestEncoding.KVP; urls.push(/** @type {string} */ (gets[i]['href'])); } } } if (urls.length === 0) { - requestEncoding = _ol_source_WMTSRequestEncoding_.REST; + requestEncoding = WMTSRequestEncoding.REST; l['ResourceURL'].forEach(function(element) { if (element['resourceType'] === 'tile') { format = element['format']; diff --git a/src/ol/tilegrid/WMTS.js b/src/ol/tilegrid/WMTS.js index 5f6dd9f8b2..f8b9415bc9 100644 --- a/src/ol/tilegrid/WMTS.js +++ b/src/ol/tilegrid/WMTS.js @@ -16,7 +16,7 @@ import _ol_tilegrid_TileGrid_ from '../tilegrid/TileGrid.js'; * @struct * @api */ -var _ol_tilegrid_WMTS_ = function(options) { +var WMTSTileGrid = function(options) { /** * @private * @type {!Array.} @@ -35,14 +35,14 @@ var _ol_tilegrid_WMTS_ = function(options) { }); }; -inherits(_ol_tilegrid_WMTS_, _ol_tilegrid_TileGrid_); +inherits(WMTSTileGrid, _ol_tilegrid_TileGrid_); /** * @param {number} z Z. * @return {string} MatrixId.. */ -_ol_tilegrid_WMTS_.prototype.getMatrixId = function(z) { +WMTSTileGrid.prototype.getMatrixId = function(z) { return this.matrixIds_[z]; }; @@ -52,10 +52,11 @@ _ol_tilegrid_WMTS_.prototype.getMatrixId = function(z) { * @return {Array.} MatrixIds. * @api */ -_ol_tilegrid_WMTS_.prototype.getMatrixIds = function() { +WMTSTileGrid.prototype.getMatrixIds = function() { return this.matrixIds_; }; +export default WMTSTileGrid; /** * Create a tile grid from a WMTS capabilities matrix set and an @@ -69,8 +70,7 @@ _ol_tilegrid_WMTS_.prototype.getMatrixIds = function() { * @return {ol.tilegrid.WMTS} WMTS tileGrid instance. * @api */ -_ol_tilegrid_WMTS_.createFromCapabilitiesMatrixSet = function(matrixSet, opt_extent, - opt_matrixLimits) { +export function createFromCapabilitiesMatrixSet(matrixSet, opt_extent, opt_matrixLimits) { /** @type {!Array.} */ var resolutions = []; @@ -137,7 +137,7 @@ _ol_tilegrid_WMTS_.createFromCapabilitiesMatrixSet = function(matrixSet, opt_ext } }); - return new _ol_tilegrid_WMTS_({ + return new WMTSTileGrid({ extent: opt_extent, origins: origins, resolutions: resolutions, @@ -145,5 +145,4 @@ _ol_tilegrid_WMTS_.createFromCapabilitiesMatrixSet = function(matrixSet, opt_ext tileSizes: tileSizes, sizes: sizes }); -}; -export default _ol_tilegrid_WMTS_; +} diff --git a/test/spec/ol/source/wmts.test.js b/test/spec/ol/source/wmts.test.js index bb1e44b901..64dcc61cf1 100644 --- a/test/spec/ol/source/wmts.test.js +++ b/test/spec/ol/source/wmts.test.js @@ -1,7 +1,7 @@ import _ol_format_WMTSCapabilities_ from '../../../../src/ol/format/WMTSCapabilities.js'; import {get as getProjection} from '../../../../src/ol/proj.js'; import _ol_proj_Projection_ from '../../../../src/ol/proj/Projection.js'; -import _ol_tilegrid_WMTS_ from '../../../../src/ol/tilegrid/WMTS.js'; +import WMTSTileGrid from '../../../../src/ol/tilegrid/WMTS.js'; import _ol_source_WMTS_ from '../../../../src/ol/source/WMTS.js'; @@ -62,7 +62,7 @@ describe('ol.source.WMTS', function() { expect(options.requestEncoding).to.be.eql('KVP'); - expect(options.tileGrid).to.be.a(_ol_tilegrid_WMTS_); + expect(options.tileGrid).to.be.a(WMTSTileGrid); expect(options.style).to.be.eql('DarkBlue'); @@ -96,7 +96,7 @@ describe('ol.source.WMTS', function() { expect(options.requestEncoding).to.be.eql('REST'); - expect(options.tileGrid).to.be.a(_ol_tilegrid_WMTS_); + expect(options.tileGrid).to.be.a(WMTSTileGrid); expect(options.style).to.be.eql('DarkBlue'); @@ -187,7 +187,7 @@ describe('ol.source.WMTS', function() { '{tilematrixset}/{TileMatrix}/{TileCol}/{TileRow}.jpg'], matrixSet: 'EPSG:3857', requestEncoding: 'REST', - tileGrid: new _ol_tilegrid_WMTS_({ + tileGrid: new WMTSTileGrid({ origin: [-20037508.342789244, 20037508.342789244], resolutions: [559082264.029 * 0.28E-3, 279541132.015 * 0.28E-3, @@ -213,7 +213,7 @@ describe('ol.source.WMTS', function() { '{tilematrixset}/{TileMatrix}/{TileCol}/{TileRow}.jpg'], matrixSet: 'EPSG:3857', requestEncoding: 'REST', - tileGrid: new _ol_tilegrid_WMTS_({ + tileGrid: new WMTSTileGrid({ origin: [-20037508.342789244, 20037508.342789244], resolutions: [559082264.029 * 0.28E-3, 279541132.015 * 0.28E-3, @@ -315,7 +315,7 @@ describe('ol.source.WMTS', function() { 'http://1.example.com/{TileMatrix}/{TileRow}/{TileCol}.jpeg', 'http://2.example.com/{TileMatrix}/{TileRow}/{TileCol}.jpeg' ], - tileGrid: new _ol_tilegrid_WMTS_({ + tileGrid: new WMTSTileGrid({ matrixIds: [0, 1, 2, 3, 4, 5, 6, 7], origin: [2690000, 1285000], resolutions: [4000, 3750, 3500, 3250, 3000, 2750, 2500, 2250] @@ -354,7 +354,7 @@ describe('ol.source.WMTS', function() { style: 'default', matrixSet: 'foo', requestEncoding: 'REST', - tileGrid: new _ol_tilegrid_WMTS_({ + tileGrid: new WMTSTileGrid({ origin: [0, 0], resolutions: [], matrixIds: [] @@ -400,7 +400,7 @@ describe('ol.source.WMTS', function() { style: 'default', matrixSet: 'foo', requestEncoding: 'REST', - tileGrid: new _ol_tilegrid_WMTS_({ + tileGrid: new WMTSTileGrid({ origin: [0, 0], resolutions: [], matrixIds: [] diff --git a/test/spec/ol/tilegrid/wmts.test.js b/test/spec/ol/tilegrid/wmts.test.js index 188bb75d7f..ec3523be87 100644 --- a/test/spec/ol/tilegrid/wmts.test.js +++ b/test/spec/ol/tilegrid/wmts.test.js @@ -1,5 +1,5 @@ import _ol_format_WMTSCapabilities_ from '../../../../src/ol/format/WMTSCapabilities.js'; -import _ol_tilegrid_WMTS_ from '../../../../src/ol/tilegrid/WMTS.js'; +import {createFromCapabilitiesMatrixSet} from '../../../../src/ol/tilegrid/WMTS.js'; describe('ol.tilegrid.WMTS', function() { @@ -21,9 +21,7 @@ describe('ol.tilegrid.WMTS', function() { it('can create tileGrid for EPSG:3857', function() { var matrixSetObj = capabilities.Contents.TileMatrixSet[0]; - var tileGrid; - tileGrid = _ol_tilegrid_WMTS_.createFromCapabilitiesMatrixSet( - matrixSetObj); + var tileGrid = createFromCapabilitiesMatrixSet(matrixSetObj); expect(tileGrid.matrixIds_).to.be.an('array'); expect(tileGrid.matrixIds_).to.have.length(20); expect(tileGrid.matrixIds_).to.eql([ @@ -76,9 +74,7 @@ describe('ol.tilegrid.WMTS', function() { it('can create tileGrid for EPSG:3857 without matrixLimits', function() { var matrixSetObj = capabilities.Contents.TileMatrixSet[0]; - var tileGrid; - tileGrid = _ol_tilegrid_WMTS_.createFromCapabilitiesMatrixSet( - matrixSetObj); + var tileGrid = createFromCapabilitiesMatrixSet(matrixSetObj); expect(tileGrid.matrixIds_).to.be.an('array'); expect(tileGrid.matrixIds_).to.have.length(22); expect(tileGrid.matrixIds_).to.eql([ @@ -117,9 +113,7 @@ describe('ol.tilegrid.WMTS', function() { var matrixSetObj = capabilities.Contents.TileMatrixSet[0]; var matrixLimitArray = capabilities.Contents.Layer[0] .TileMatrixSetLink[0].TileMatrixSetLimits; - var tileGrid; - tileGrid = _ol_tilegrid_WMTS_.createFromCapabilitiesMatrixSet( - matrixSetObj, undefined, matrixLimitArray); + var tileGrid = createFromCapabilitiesMatrixSet(matrixSetObj, undefined, matrixLimitArray); expect(tileGrid.matrixIds_).to.be.an('array'); expect(tileGrid.matrixIds_).to.have.length(20); expect(tileGrid.matrixIds_).to.eql([