Merge pull request #3096 from camptocamp/use_metadata_resolution

Allow to zoom with resolutions in metadata

contribs/gmf/src/directives/layertree.js

@@ -354,24 +354,6 @@ gmf.LayertreeController.prototype.listeners = function(scope, treeCtrl) {
 };
 
 
-/**
- * Return 'out-of-resolution' if the current resolution of the map is out of
- * the min/max resolution in the node.
- * @param {gmfThemes.GmfLayerWMS} gmfLayerWMS the GeoMapFish Layer WMS.
- * @return {string|undefined} 'out-of-resolution' or undefined.
- * @export
- */
-gmf.LayertreeController.prototype.getResolutionStyle = function(gmfLayerWMS) {
-  var style;
-  var resolution = this.map.getView().getResolution();
-  if (gmfLayerWMS.minResolutionHint !== undefined && resolution < gmfLayerWMS.minResolutionHint ||
-      gmfLayerWMS.maxResolutionHint !== undefined && resolution > gmfLayerWMS.maxResolutionHint) {
-    style = 'out-of-resolution';
-  }
-  return style;
-};
-
-
 /**
  * Toggle the state of treeCtrl's node.
  * @param {ngeo.LayertreeController} treeCtrl ngeo layertree controller, from
@@ -585,6 +567,30 @@ gmf.LayertreeController.prototype.removeNode = function(node) {
 };
 
 
+/**
+ * Return 'out-of-resolution' if the current resolution of the map is out of
+ * the min/max resolution in the node.
+ * @param {gmfThemes.GmfLayerWMS} gmfLayer the GeoMapFish Layer. WMTS layer is
+ *     also allowed (the type is defined as GmfLayerWMS only to avoid some
+ *     useless tests to know if a minResolutionHint property can exist
+ *     on the node).
+ * @return {string|undefined} 'out-of-resolution' or undefined.
+ * @export
+ */
+gmf.LayertreeController.prototype.getResolutionStyle = function(gmfLayer) {
+  var resolution = this.map.getView().getResolution();
+  var minResolution = gmf.Themes.getNodeMinResolution(gmfLayer);
+  if (minResolution !== undefined && resolution < minResolution) {
+    return 'out-of-resolution';
+  }
+  var maxResolution = gmf.Themes.getNodeMaxResolution(gmfLayer);
+  if (maxResolution !== undefined && resolution > maxResolution) {
+    return 'out-of-resolution';
+  }
+  return undefined;
+};
+
+
 /**
  * Set the resolution of the map with the max or min resolution of the node.
  * @param {ngeo.LayertreeController} treeCtrl ngeo layertree controller, from
@@ -595,11 +601,14 @@ gmf.LayertreeController.prototype.zoomToResolution = function(treeCtrl) {
   var gmfLayer = /** @type {gmfThemes.GmfLayerWMS} */ (treeCtrl.node);
   var view = this.map.getView();
   var resolution = view.getResolution();
-  if (gmfLayer.minResolutionHint !== undefined && resolution < gmfLayer.minResolutionHint) {
-    view.setResolution(view.constrainResolution(gmfLayer.minResolutionHint, 0, 1));
-  }
-  if (gmfLayer.maxResolutionHint !== undefined && resolution > gmfLayer.maxResolutionHint) {
-    view.setResolution(view.constrainResolution(gmfLayer.maxResolutionHint, 0, -1));
+  var minResolution = gmf.Themes.getNodeMinResolution(gmfLayer);
+  if (minResolution !== undefined && resolution < minResolution) {
+    view.setResolution(view.constrainResolution(minResolution, 0, 1));
+  } else {
+    var maxResolution = gmf.Themes.getNodeMaxResolution(gmfLayer);
+    if (maxResolution !== undefined && resolution > maxResolution) {
+      view.setResolution(view.constrainResolution(maxResolution, 0, -1));
+    }
   }
 };
 

contribs/gmf/src/services/themesservice.js

@@ -489,6 +489,44 @@ gmf.Themes.prototype.hasNodeEditableLayers_ = function(node) {
 };
 
 
+/**
+ * Get the maximal resolution defined for this layer. Looks in the
+ *     layer itself before to look into its metadata.
+ * @param {gmfThemes.GmfLayerWMS} gmfLayer the GeoMapFish Layer. WMTS layer is
+ *     also allowed (the type is defined as GmfLayerWMS only to avoid some
+ *     useless tests to know if a maxResolutionHint property can exist
+ *     on the node).
+ * @return {number|undefined} the max resolution or undefined if any.
+ */
+gmf.Themes.getNodeMaxResolution = function(gmfLayer) {
+  var metadata = gmfLayer.metadata;
+  var maxResolution = gmfLayer.maxResolutionHint;
+  if (maxResolution === undefined && metadata !== undefined) {
+    maxResolution = metadata.maxResolution;
+  }
+  return maxResolution;
+};
+
+
+/**
+ * Get the minimal resolution defined for this layer. Looks in the
+ *     layer itself before to look into its metadata.
+ * @param {gmfThemes.GmfLayerWMS} gmfLayer the GeoMapFish Layer. WMTS layer is
+ *     also allowed (the type is defined as GmfLayerWMS only to avoid some
+ *     useless tests to know if a minResolutionHint property can exist
+ *     on the node).
+ * @return {number|undefined} the min resolution or undefined if any.
+ */
+gmf.Themes.getNodeMinResolution = function(gmfLayer) {
+  var metadata = gmfLayer.metadata;
+  var minResolution = gmfLayer.minResolutionHint;
+  if (minResolution === undefined && metadata !== undefined) {
+    minResolution = metadata.minResolution;
+  }
+  return minResolution;
+};
+
+
 /**
  * @param {number=} opt_roleId The role id to send in the request.
  * Load themes from the "themes" service.