Rename _ol_source_WMTSRequestEncoding_ to WMTSRequestEncoding

And add named export for `createFromCapabilitiesMatrixSet` function.

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.<string>} */
   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'];

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.<string>}
@@ -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.<string>} 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.<number>} */
   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_;
+}