Do not query non-querable layers

camptocamp · May 26, 2016 · 5a48161 · 5a48161
1 parent c600a57
commit 5a48161
Show file tree

Hide file tree

Showing 4 changed files with 908 additions and 3 deletions.
diff --git a/contribs/gmf/externs/gmf-themes.js b/contribs/gmf/externs/gmf-themes.js
@@ -25,7 +25,7 @@ GmfThemesNode.prototype.children;
 
 
 /**
- * @type {Object.<string, string>}
+ * @type {Array.<GmfChildLayerNode>}
  */
 GmfThemesNode.prototype.childLayers;
 
@@ -82,3 +82,22 @@ GmfThemesNode.prototype.url;
  * @type {string|undefined}
  */
 GmfThemesNode.prototype.wmsUrl;
+
+
+
+/**
+ * @constructor
+ */
+var GmfChildLayerNode = function() {};
+
+
+/**
+ * @type {string}
+ */
+GmfChildLayerNode.prototype.name;
+
+
+/**
+ * @type {number|boolean|undefined}
+ */
+GmfChildLayerNode.prototype.queryable;
diff --git a/contribs/gmf/src/services/querymanager.js b/contribs/gmf/src/services/querymanager.js
@@ -118,7 +118,9 @@ gmf.QueryManager.prototype.createSources_ = function(node) {
       if (node.childLayers && node.childLayers.length) {
         var childLayerNames = [];
         node.childLayers.forEach(function(childLayer) {
-          childLayerNames.push(childLayer.name);
+          if (childLayer.queryable) {
+            childLayerNames.push(childLayer.name);
+          }
         }, this);
         layers = childLayerNames.join(',');
       } else if (node.type === 'WMS') {