Use the matrixSet value from the WMTS layer config

camptocamp · Feb 23, 2018 · 500237d · 500237d
1 parent 1a44f76
commit 500237d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/contribs/gmf/src/services/syncLayertreeMap.js b/contribs/gmf/src/services/syncLayertreeMap.js
@@ -321,7 +321,7 @@ gmf.SyncLayertreeMap.prototype.createWMTSLayer_ = function(gmfLayerWMTS) {
   goog.asserts.assert(gmfLayerWMTS.url);
   goog.asserts.assert(gmfLayerWMTS.layer);
   this.layerHelper_.createWMTSLayerFromCapabilitites(gmfLayerWMTS.url,
-    gmfLayerWMTS.layer, gmfLayerWMTS.dimensions).then((layer) => {
+    gmfLayerWMTS.layer, gmfLayerWMTS.matrixSet, gmfLayerWMTS.dimensions).then((layer) => {
     newLayer.setSource(layer.getSource());
     newLayer.set('capabilitiesStyles', layer.get('capabilitiesStyles'));
   });

diff --git a/contribs/gmf/src/services/themesservice.js b/contribs/gmf/src/services/themesservice.js
@@ -278,6 +278,7 @@ gmf.Themes.prototype.getBgLayers = function() {
       return layerHelper.createWMTSLayerFromCapabilitites(
         gmfLayerWMTS.url,
         gmfLayerWMTS.layer || '',
+        gmfLayerWMTS.matrixSet,
         gmfLayer.dimensions
       ).then(callback.bind(null, gmfLayer)).then(null, (response) => {
         let message = `Unable to build layer "${gmfLayerWMTS.layer}" from WMTSCapabilities: ${gmfLayerWMTS.url}\n`;

diff --git a/src/services/layerHelper.js b/src/services/layerHelper.js
@@ -106,12 +106,13 @@ ngeo.LayerHelper.prototype.createBasicWMSLayer = function(sourceURL,
  * as key 'capabilitiesStyles' as param of the new layer.
  * @param {string} capabilitiesURL The getCapabilities url.
  * @param {string} layerName The name of the layer.
+ * @param {string|undefined} opt_matrixSet Optional WMTS matrix set.
  * @param {Object.<string, string>=} opt_dimensions WMTS dimensions.
  * @return {angular.$q.Promise.<ol.layer.Tile>} A Promise with a layer (with source) on success,
  *     no layer else.
  * @export
  */
-ngeo.LayerHelper.prototype.createWMTSLayerFromCapabilitites = function(capabilitiesURL, layerName, opt_dimensions) {
+ngeo.LayerHelper.prototype.createWMTSLayerFromCapabilitites = function(capabilitiesURL, layerName, opt_matrixSet, opt_dimensions) {
   const parser = new ol.format.WMTSCapabilities();
   const layer = new ol.layer.Tile({
     preload: Infinity
@@ -125,6 +126,7 @@ ngeo.LayerHelper.prototype.createWMTSLayerFromCapabilitites = function(capabilit
     }
     if (result) {
       const options = ol.source.WMTS.optionsFromCapabilities(result, {
+        matrixSet: opt_matrixSet,
         crossOrigin: 'anonymous',
         layer: layerName
       });