From a652fe5e4568f39467abcee0a0e01a0a78d77a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Wed, 18 Jul 2018 12:40:58 +0200
Subject: [PATCH 01/23] Removes unwanted hardcoded mobile interface

---
 contribs/gmf/src/search/component.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/contribs/gmf/src/search/component.js b/contribs/gmf/src/search/component.js
index c5e52e71f569..b86246ea150c 100644
--- a/contribs/gmf/src/search/component.js
+++ b/contribs/gmf/src/search/component.js
@@ -732,14 +732,12 @@ exports.SearchController_ = class {
       prepare: (query, settings) => {
         const url = settings.url;
         const lang = gettextCatalog.currentLanguage;
-        const interfaceName = 'mobile'; // FIXME dynamic interfaces
         settings.xhrFields = {
           withCredentials: true
         };
         settings.url = olUri.appendParams(url, {
           'query': query,
           'lang': lang,
-          'interface': interfaceName
         });
         return settings;
       }

From 90c73e9aa0e9834ed1398bd1b728b9e488dce9df Mon Sep 17 00:00:00 2001
From: Laurent Lienher <laurent.lienher@camptocamp.com>
Date: Wed, 18 Jul 2018 16:46:14 +0200
Subject: [PATCH 02/23] Fix print layers when opacity background layer is a
 layer group

---
 src/map/LayerHelper.js | 36 +++++++++++++++++++++++++++---------
 src/print/Service.js   | 24 ++++++++++++++++++------
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/map/LayerHelper.js b/src/map/LayerHelper.js
index dce1bed41f41..dd52eb5728bf 100644
--- a/src/map/LayerHelper.js
+++ b/src/map/LayerHelper.js
@@ -4,7 +4,7 @@
 import googAsserts from 'goog/asserts.js';
 import * as olArray from 'ol/array.js';
 import olFormatWMTSCapabilities from 'ol/format/WMTSCapabilities.js';
-import olLayerGroup from 'ol/layer/Group.js';
+import OlLayerGroup from 'ol/layer/Group.js';
 import olLayerImage from 'ol/layer/Image.js';
 import olLayerTile from 'ol/layer/Tile.js';
 import * as olObj from 'ol/obj.js';
@@ -241,7 +241,7 @@ exports.prototype.createWMTSLayerFromCapabilititesObj = function(
  * @export
  */
 exports.prototype.createBasicGroup = function(opt_layers) {
-  const group = new olLayerGroup();
+  const group = new OlLayerGroup();
   if (opt_layers) {
     group.setLayers(opt_layers);
   }
@@ -287,26 +287,44 @@ exports.prototype.getGroupFromMap = function(map, groupName) {
  * @export
  */
 exports.prototype.getFlatLayers = function(layer) {
-  return this.getFlatLayers_(layer, []);
+  if (layer instanceof OlLayerGroup) {
+    const sublayers = layer.getLayers().getArray();
+    const hasGroupLayer = sublayers.some(sublayer => sublayer instanceof OlLayerGroup);
+    if (!hasGroupLayer) {
+      return sublayers.slice();
+    }
+  }
+  return this.getFlatLayers_(layer, [], undefined);
 };
 
 
 /**
  * Get an array of all layers in a group. The group can contain multiple levels
- * of others groups.
+ * of others groups. When we flatten a group, we get the child layers.
+ * If opacity is defined on the group, this value is lost.
+ * Computed opacity is a custom 'back-up' value that contains
+ * the calculated value of all ancestors and the given layer.
  * @param {ol.layer.Base} layer The base layer, mostly a group of layers.
  * @param {Array.<ol.layer.Base>} array An array to add layers.
+ * @param {number|undefined} computedOpacity Opacity inherited from ancestor layer groups.
  * @return {Array.<ol.layer.Layer>} Layers.
  * @private
  */
-exports.prototype.getFlatLayers_ = function(layer, array) {
-  if (layer instanceof olLayerGroup) {
+exports.prototype.getFlatLayers_ = function(layer, array, computedOpacity) {
+  const opacity = layer.getOpacity();
+  if (computedOpacity !== undefined) {
+    computedOpacity *= opacity;
+  } else {
+    computedOpacity = opacity;
+  }
+  if (layer instanceof OlLayerGroup) {
     const sublayers = layer.getLayers();
     sublayers.forEach((l) => {
-      this.getFlatLayers_(l, array);
+      this.getFlatLayers_(l, array, computedOpacity);
     });
   } else {
     if (array.indexOf(layer) < 0) {
+      layer.set('inheritedOpacity', computedOpacity, true);
       array.push(layer);
     }
   }
@@ -326,7 +344,7 @@ exports.prototype.getFlatLayers_ = function(layer, array) {
 exports.prototype.getLayerByName = function(layerName, layers) {
   let found = null;
   layers.some((layer) => {
-    if (layer instanceof olLayerGroup) {
+    if (layer instanceof OlLayerGroup) {
       const sublayers = layer.getLayers().getArray();
       found = this.getLayerByName(layerName, sublayers);
     } else if (layer.get('layerNodeName') === layerName) {
@@ -440,7 +458,7 @@ exports.prototype.refreshWMSLayer = function(layer) {
  * @param {number} ZIndex The ZIndex for children element.
  */
 exports.prototype.setZIndexToFirstLevelChildren = function(element, ZIndex) {
-  if (!(element instanceof olLayerGroup)) {
+  if (!(element instanceof OlLayerGroup)) {
     return;
   }
   const innerGroupLayers = element.getLayers();
diff --git a/src/print/Service.js b/src/print/Service.js
index 822306645729..bd2043549c1d 100644
--- a/src/print/Service.js
+++ b/src/print/Service.js
@@ -238,19 +238,19 @@ exports.prototype.encodeImageWmsLayer_ = function(arr, layer) {
   const url = source.getUrl();
   if (url !== undefined) {
     this.encodeWmsLayer_(
-      arr, layer.getOpacity(), url, source.getParams());
+      arr, layer, url, source.getParams());
   }
 };
 
 
 /**
  * @param {Array.<MapFishPrintLayer>} arr Array.
- * @param {number} opacity Opacity of the layer.
+ * @param {ol.layer.Image} layer The layer.
  * @param {string} url Url of the WMS server.
  * @param {Object} params Url parameters
  * @private
  */
-exports.prototype.encodeWmsLayer_ = function(arr, opacity, url, params) {
+exports.prototype.encodeWmsLayer_ = function(arr, layer, url, params) {
   if (url.startsWith('//')) {
     url = window.location.protocol  + url;
   }
@@ -280,7 +280,7 @@ exports.prototype.encodeWmsLayer_ = function(arr, opacity, url, params) {
     customParams: customParams,
     serverType: params['SERVERTYPE'],
     type: 'wms',
-    opacity: opacity,
+    opacity: this.getOpacityOrInherited_(layer),
     version: params['VERSION'],
     useNativeAngle: this.printNativeAngle_,
   });
@@ -360,7 +360,7 @@ exports.prototype.encodeTileWmtsLayer_ = function(arr, layer) {
     layer: source.getLayer(),
     matrices: matrices,
     matrixSet: source.getMatrixSet(),
-    opacity: layer.getOpacity(),
+    opacity: this.getOpacityOrInherited_(layer),
     requestEncoding: source.getRequestEncoding(),
     style: source.getStyle(),
     type: 'WMTS',
@@ -383,7 +383,7 @@ exports.prototype.encodeTileWmsLayer_ = function(arr, layer) {
   googAsserts.assertInstanceof(source, olSourceTileWMS);
 
   this.encodeWmsLayer_(
-    arr, layer.getOpacity(), source.getUrls()[0], source.getParams());
+    arr, layer, source.getUrls()[0], source.getParams());
 };
 
 
@@ -399,6 +399,18 @@ exports.prototype.getWmtsUrl_ = function(source) {
   return exports.getAbsoluteUrl_(urls[0]);
 };
 
+/**
+ * Return an opacity value for the specified layer.
+ * @param {ol.layer.Base} layer Layer.
+ * @returns {number} opacity Opacity value.
+ * @private
+ */
+exports.prototype.getOpacityOrInherited_ = function(layer) {
+  if (layer.get('inheritedOpacity') !== undefined) {
+    return layer.get('inheritedOpacity');
+  }
+  return layer.getOpacity();
+};
 
 /**
  * Send a create report request to the MapFish Print service.

From 8e74705f61d140e80bff1061146fa20fd1344480 Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Wed, 25 Jul 2018 13:06:09 +0200
Subject: [PATCH 03/23] Fix position of the query grid (app)

GSGMF-565
---
 contribs/gmf/src/query/grid.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contribs/gmf/src/query/grid.less b/contribs/gmf/src/query/grid.less
index 11688d3c856a..b30a9ab4e4be 100644
--- a/contribs/gmf/src/query/grid.less
+++ b/contribs/gmf/src/query/grid.less
@@ -9,6 +9,7 @@
   border-top: solid 1px black;
   background-color: white;
   height: @grid-height;
+  position: fixed;
 
   .ngeo-grid-table-container {
     height: @table-height;

From b36783615ecb081d7558ba02b84684602a22dd0b Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Wed, 25 Jul 2018 14:42:01 +0200
Subject: [PATCH 04/23] Update legend on (map resolution) change

GSGMF-517
---
 contribs/gmf/src/layertree/component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contribs/gmf/src/layertree/component.html b/contribs/gmf/src/layertree/component.html
index 0db3412a7705..3cf9d8b74da2 100644
--- a/contribs/gmf/src/layertree/component.html
+++ b/contribs/gmf/src/layertree/component.html
@@ -228,8 +228,8 @@
     {{'Hide legend'|translate}}
   </a>
   <div ng-if="gmfLayertreeCtrl.isNodeLegendVisible('#gmf-layertree-node-' + layertreeCtrl.uid + '-legend')">
-    <div ng-repeat="(title, url) in ::gmfLayertreeCtrl.getLegendsObject(layertreeCtrl)">
-      <p ng-if="::gmfLayertreeCtrl.getNumberOfLegendsObject(layertreeCtrl) > 1">{{title|translate}}</p>
+    <div ng-repeat="(title, url) in gmfLayertreeCtrl.getLegendsObject(layertreeCtrl)">
+      <p ng-if="gmfLayertreeCtrl.getNumberOfLegendsObject(layertreeCtrl) > 1">{{title|translate}}</p>
       <img ng-src="{{url}}"></img>
     </div>
   </div>

From f1cf7a8d5ef5958e0417aa084e7b5ea10734b4d4 Mon Sep 17 00:00:00 2001
From: Laurent Lienher <laurent.lienher@camptocamp.com>
Date: Wed, 25 Jul 2018 15:14:42 +0200
Subject: [PATCH 05/23] Fix group translation in notifications

---
 contribs/gmf/src/services/treemanager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contribs/gmf/src/services/treemanager.js b/contribs/gmf/src/services/treemanager.js
index 4d2e80e6dee0..4a4baea54a11 100644
--- a/contribs/gmf/src/services/treemanager.js
+++ b/contribs/gmf/src/services/treemanager.js
@@ -407,7 +407,7 @@ gmf.TreeManager.prototype.notifyCantAddGroups_ = function(groups) {
   const names = [];
   const gettextCatalog = this.gettextCatalog_;
   groups.forEach((group) => {
-    names.push(group.name);
+    names.push(gettextCatalog.getString(group.name));
   });
   const msg = (names.length < 2) ?
     gettextCatalog.getString('group is already loaded.') :

From a1666cd62059f953ed126b7020c4a71581823965 Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Wed, 25 Jul 2018 15:47:27 +0200
Subject: [PATCH 06/23] Inform user if the imported file is not valid

GSGMF-467
---
 .../src/datasource/ExternalDataSourcesManager.js   | 14 ++++++++++++--
 .../gmf/src/import/importdatasourceComponent.html  |  8 +++++---
 .../gmf/src/import/importdatasourceComponent.js    |  7 ++++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/contribs/gmf/src/datasource/ExternalDataSourcesManager.js b/contribs/gmf/src/datasource/ExternalDataSourcesManager.js
index 09d4cf96957d..7d6a01b3b14b 100644
--- a/contribs/gmf/src/datasource/ExternalDataSourcesManager.js
+++ b/contribs/gmf/src/datasource/ExternalDataSourcesManager.js
@@ -464,9 +464,11 @@ const exports = class {
 
   /**
    * @param {!File} file File.
+   * @param {function(boolean):*?} opt_callback Callback called with true if the file is loaded and added.
+   *     Otherwise with false.
    * @export
    */
-  createAndAddDataSourceFromFile(file) {
+  createAndAddDataSourceFromFile(file, opt_callback) {
     this.getFileDataSource_(file).then(
       (dataSource) => {
         const fileGroup = this.fileGroup_;
@@ -488,9 +490,17 @@ const exports = class {
 
         // (5) Finally, add it to the ngeo collection
         this.dataSources_.push(dataSource);
+
+        // call the callback.
+        if (opt_callback) {
+          opt_callback(true);
+        }
       },
       (rejections) => {
-        googAsserts.fail(`Failed to load file: ${file.name}`);
+        console.error(`Failed to load file: ${file.name}`);
+        if (opt_callback) {
+          opt_callback(false);
+        }
       }
     );
   }
diff --git a/contribs/gmf/src/import/importdatasourceComponent.html b/contribs/gmf/src/import/importdatasourceComponent.html
index 7f19b382ad7b..2ae8e776d4de 100644
--- a/contribs/gmf/src/import/importdatasourceComponent.html
+++ b/contribs/gmf/src/import/importdatasourceComponent.html
@@ -2,7 +2,8 @@
   <select
     class="form-control"
     ng-model="$ctrl.mode"
-    ng-options="mode | translate for mode in $ctrl.modes">
+    ng-options="mode | translate for mode in $ctrl.modes"
+    ng-click="$ctrl.hasError = false">
   </select>
 </div>
 
@@ -42,9 +43,10 @@
         title="{{'Load a file from local' | translate}}"
         type="submit"
         ng-click="idsl_form.$valid && $ctrl.load()"
-        ng-disabled="$ctrl.file === undefined"
+        ng-disabled="$ctrl.file === undefined || $ctrl.hasError"
       >
-        <span>{{'Load local file' | translate}}</span>
+        <span ng-if="!$ctrl.hasError">{{'Load local file' | translate}}</span>
+        <span ng-if="$ctrl.hasError">{{'Unable to load the file' | translate}}</span>
       </button>
     </div>
   </form>
diff --git a/contribs/gmf/src/import/importdatasourceComponent.js b/contribs/gmf/src/import/importdatasourceComponent.js
index 902bdf4f8e5c..ea84b24c2454 100644
--- a/contribs/gmf/src/import/importdatasourceComponent.js
+++ b/contribs/gmf/src/import/importdatasourceComponent.js
@@ -290,6 +290,7 @@ exports.Controller_ = class {
    * @export
    */
   browse() {
+    this.hasError = false;
     this.element_.find('input[type=file][name=file]').click();
   }
 
@@ -338,7 +339,11 @@ exports.Controller_ = class {
    */
   load() {
     const file = googAsserts.assert(this.file);
-    this.gmfExternalDataSourcesManager_.createAndAddDataSourceFromFile(file);
+    this.gmfExternalDataSourcesManager_.createAndAddDataSourceFromFile(file, (success) => {
+      if (!success) {
+        this.hasError = true;
+      }
+    });
   }
 
   /**

From 6bb6609a5c48d9dc41f1e3db18d50c42619767a8 Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Wed, 25 Jul 2018 16:20:30 +0200
Subject: [PATCH 07/23] More visible error for import

GSGMF-467
---
 contribs/gmf/src/import/import.less                    | 4 ++++
 contribs/gmf/src/import/importdatasourceComponent.html | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/contribs/gmf/src/import/import.less b/contribs/gmf/src/import/import.less
index 0f3f9d7eb922..6a1ae6cd4d0c 100644
--- a/contribs/gmf/src/import/import.less
+++ b/contribs/gmf/src/import/import.less
@@ -1,6 +1,7 @@
 @import "~font-awesome/less/variables.less";
 @import "~gmf/less/typeahead.less";
 @import "~gmf/less/vars.less";
+@import "~bootstrap/less/variables.less";
 
 gmf-importdatasource {
   input[type=file] {
@@ -10,6 +11,9 @@ gmf-importdatasource {
   .gmf-importdatasource-url-form-group {
     background-color: #fff;
   }
+  .btn.has-error {
+    color: @brand-danger;
+  }
 }
 
 gmf-wmscapabilitylayertreenode,
diff --git a/contribs/gmf/src/import/importdatasourceComponent.html b/contribs/gmf/src/import/importdatasourceComponent.html
index 2ae8e776d4de..09bdf142e15f 100644
--- a/contribs/gmf/src/import/importdatasourceComponent.html
+++ b/contribs/gmf/src/import/importdatasourceComponent.html
@@ -40,6 +40,7 @@
     <div class="form-group">
       <button
         class="btn btn-sm btn-default form-control"
+        ng-class="{'has-error': $ctrl.hasError}"
         title="{{'Load a file from local' | translate}}"
         type="submit"
         ng-click="idsl_form.$valid && $ctrl.load()"
@@ -70,6 +71,7 @@
     <div class="form-group">
       <button
         class="btn btn-sm btn-default form-control gmf-importdatasource-connect-btn"
+        ng-class="{'has-error': $ctrl.hasError}"
         title="{{'Connect to online resource' | translate}}"
         type="submit"
         ng-click="idsc_form.$valid && $ctrl.connect()"

From 8e6c3cf4c28ce58b017ea16a127a4bce860e6a89 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Thu, 26 Jul 2018 11:26:00 +0200
Subject: [PATCH 08/23] Only change the colors when updating an image style

---
 contribs/gmf/src/directives/search.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/contribs/gmf/src/directives/search.js b/contribs/gmf/src/directives/search.js
index f76ac79503bb..9a35a6113c31 100644
--- a/contribs/gmf/src/directives/search.js
+++ b/contribs/gmf/src/directives/search.js
@@ -771,13 +771,19 @@ gmf.SearchController.prototype.getSearchStyle_ = function(feature, resolution) {
     if (fillStyle) {
       fillStyle.setColor(fillColor);
     }
-    const image = style.getImage();
-    if (image) {
-      style.setImage(new ol.style.Circle({
-        fill: new ol.style.Fill({color: fillColor}),
-        radius: 5,
-        stroke: new ol.style.Stroke({color: strokeColor})
-      }));
+    // the image style can't be changed in place, the colors are updated on a clone.
+    let imageStyle = style.getImage();
+    if (imageStyle) {
+      imageStyle = imageStyle.clone();
+      const imageStrokeStyle = imageStyle.getStroke();
+      if (imageStrokeStyle) {
+        imageStrokeStyle.setColor(strokeColor);
+      }
+      const imageFillStyle = imageStyle.getFill();
+      if (imageFillStyle) {
+        imageFillStyle.setColor(fillColor);
+      }
+      style.setImage(imageStyle);
     }
   }
   return style;

From 77aa1a24def4f1ad12ae9724944005e78f7581ea Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Fri, 27 Jul 2018 09:15:20 +0200
Subject: [PATCH 09/23] Allow default values for features properties in
 ngeo.format.FeatureHash

---
 contribs/gmf/src/services/permalink.js |  9 ++++++++-
 src/ol-ext/format/featurehash.js       | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/contribs/gmf/src/services/permalink.js b/contribs/gmf/src/services/permalink.js
index cf1963d5c2e2..d287f8355dfa 100644
--- a/contribs/gmf/src/services/permalink.js
+++ b/contribs/gmf/src/services/permalink.js
@@ -86,13 +86,14 @@ gmf.module.value('gmfPermalinkOptions',
  * @param {angular.Scope} $rootScope Angular rootScope.
  * @param {angular.$injector} $injector Main injector.
  * @param {ngeo.Debounce} ngeoDebounce ngeo Debounce service.
+ * @param {angularGettext.Catalog} gettextCatalog Gettext service.
  * @param {ngeo.StateManager} ngeoStateManager The ngeo StateManager service.
  * @param {ngeo.Location} ngeoLocation ngeo location service.
  * @ngInject
  * @ngdoc service
  * @ngname gmfPermalink
  */
-gmf.Permalink = function($timeout, $rootScope, $injector, ngeoDebounce,
+gmf.Permalink = function($timeout, $rootScope, $injector, ngeoDebounce, gettextCatalog,
   ngeoStateManager, ngeoLocation) {
 
   /**
@@ -335,6 +336,12 @@ gmf.Permalink = function($timeout, $rootScope, $injector, ngeoDebounce,
       'showMeasure': ngeo.FeatureProperties.SHOW_MEASURE,
       'strokeColor': ngeo.FeatureProperties.COLOR,
       'strokeWidth': ngeo.FeatureProperties.STROKE
+    },
+    defaultValues: {
+      'name': feature => gettextCatalog.getString(feature.getGeometry().getType()),
+      'fillOpacity': () => 0.5,
+      'showLabel': () => false,
+      'showMeasure': () => false
     }
   });
 
diff --git a/src/ol-ext/format/featurehash.js b/src/ol-ext/format/featurehash.js
index d13db310a7cf..a99559da3888 100644
--- a/src/ol-ext/format/featurehash.js
+++ b/src/ol-ext/format/featurehash.js
@@ -133,6 +133,12 @@ ngeo.format.FeatureHash = function(opt_options) {
    */
   ngeo.format.FeatureHashLegacyProperties_ = (options.propertiesType !== undefined) &&  options.propertiesType;
 
+  /**
+   * @type {Object.<string, *>}
+   * @private
+   */
+  this.defaultValues_ = options.defaultValues !== undefined ? options.defaultValues : {};
+
 };
 ol.inherits(ngeo.format.FeatureHash, ol.format.TextFeature);
 
@@ -1091,6 +1097,16 @@ ngeo.format.FeatureHash.prototype.readFeaturesFromText = function(text, opt_opti
     features.push(feature);
     text = text.substring(index + 1);
   }
+
+  // set default values
+  features.forEach((feature) => {
+    for (const key in this.defaultValues_) {
+      const property = ngeo.format.FeatureHashLegacyProperties_[key];
+      if (feature.get(property) === undefined) {
+        feature.set(property, this.defaultValues_[key].call(null, feature));
+      }
+    }
+  });
   return features;
 };
 

From 2055e7e56ebea29be7b1c79f13117467c8f2a157 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Fri, 27 Jul 2018 14:27:42 +0200
Subject: [PATCH 10/23] Reset prevX/prevX on every new features read, not on
 individual feature read

---
 src/ol-ext/format/featurehash.js            | 8 ++++----
 test/spec/ol-ext/format/featurehash.spec.js | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ol-ext/format/featurehash.js b/src/ol-ext/format/featurehash.js
index a99559da3888..a54e14081eed 100644
--- a/src/ol-ext/format/featurehash.js
+++ b/src/ol-ext/format/featurehash.js
@@ -1086,6 +1086,8 @@ ngeo.format.FeatureHash.prototype.readFeatureFromText = function(text, opt_optio
  */
 ngeo.format.FeatureHash.prototype.readFeaturesFromText = function(text, opt_options) {
   goog.asserts.assert(text[0] === 'F');
+  this.prevX_ = 0;
+  this.prevY_ = 0;
   /** @type {Array.<ol.Feature>} */
   const features = [];
   text = text.substring(1);
@@ -1122,8 +1124,6 @@ ngeo.format.FeatureHash.prototype.readFeaturesFromText = function(text, opt_opti
 ngeo.format.FeatureHash.prototype.readGeometryFromText = function(text, opt_options) {
   const geometryReader = ngeo.format.FeatureHash.GEOMETRY_READERS_[text[0]];
   goog.asserts.assert(geometryReader !== undefined);
-  this.prevX_ = 0;
-  this.prevY_ = 0;
   return geometryReader.call(this, text);
 };
 
@@ -1211,6 +1211,8 @@ ngeo.format.FeatureHash.prototype.writeFeatureText = function(feature, opt_optio
  * @override
  */
 ngeo.format.FeatureHash.prototype.writeFeaturesText = function(features, opt_options) {
+  this.prevX_ = 0;
+  this.prevY_ = 0;
   const textArray = [];
   if (features.length > 0) {
     textArray.push('F');
@@ -1236,7 +1238,5 @@ ngeo.format.FeatureHash.prototype.writeGeometryText = function(geometry, opt_opt
   goog.asserts.assert(geometryWriter !== undefined);
   const transformedGeometry = /** @type {ol.geom.Geometry} */
       (ol.format.Feature.transformWithOptions(geometry, true, opt_options));
-  this.prevX_ = 0;
-  this.prevY_ = 0;
   return geometryWriter.call(this, transformedGeometry);
 };
diff --git a/test/spec/ol-ext/format/featurehash.spec.js b/test/spec/ol-ext/format/featurehash.spec.js
index f0706a270fcf..3726ba71fefd 100644
--- a/test/spec/ol-ext/format/featurehash.spec.js
+++ b/test/spec/ol-ext/format/featurehash.spec.js
@@ -246,7 +246,7 @@ describe('ngeo.format.FeatureHash', () => {
     describe('features decoding', () => {
 
       it('correctly decodes features', () => {
-        const features = fhFormat.readFeatures('Fp(__)l(..__)');
+        const features = fhFormat.readFeatures('Fp(__)l(--__)');
         expect(features.length).toBe(2);
         let feature, geometry, coordinates;
         feature = features[0];
@@ -444,7 +444,7 @@ describe('ngeo.format.FeatureHash', () => {
         });
         const features = [pointFeature, lineStringFeature];
         const result = fhFormat.writeFeatures(features);
-        expect(result).toBe('Fp(__~foo*foo\'bar*bar)l(..__~foo*foo\'bar*bar)');
+        expect(result).toBe('Fp(__~foo*foo\'bar*bar)l(--__~foo*foo\'bar*bar)');
       });
     });
 

From 1e2b2fa58dd670ba3e5b667c72938ee7d851b30e Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Mon, 30 Jul 2018 09:32:41 +0200
Subject: [PATCH 11/23] Add defaultValues in ngeox.format.FeatureHashOptions

---
 options/ngeox.js                 | 6 ++++++
 src/ol-ext/format/featurehash.js | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/options/ngeox.js b/options/ngeox.js
index fc1bed52277f..0601c9599bf7 100644
--- a/options/ngeox.js
+++ b/options/ngeox.js
@@ -1325,6 +1325,7 @@ ngeox.format = {};
 /**
  * @typedef {{
  *    accuracy: (number|undefined),
+ *    defaultValues: (Object.<string, function(ol.Feature)>|undefined),
  *    encodeStyles: (boolean|undefined),
  *    properties: (function(ol.Feature): Object.<string, (string|undefined)>|undefined),
  *    setStyle: (boolean|undefined)
@@ -1339,6 +1340,11 @@ ngeox.format.FeatureHashOptions;
  */
 ngeox.format.FeatureHashOptions.prototype.accuracy;
 
+/**
+ * @type {Object.<string, function(ol.Feature)>|undefined}
+ */
+ngeox.format.FeatureHashOptions.prototype.defaultValues;
+
 
 /**
  * Encode styles. Optional. Default is `true`.
diff --git a/src/ol-ext/format/featurehash.js b/src/ol-ext/format/featurehash.js
index a54e14081eed..ecfd80ca1c29 100644
--- a/src/ol-ext/format/featurehash.js
+++ b/src/ol-ext/format/featurehash.js
@@ -134,7 +134,7 @@ ngeo.format.FeatureHash = function(opt_options) {
   ngeo.format.FeatureHashLegacyProperties_ = (options.propertiesType !== undefined) &&  options.propertiesType;
 
   /**
-   * @type {Object.<string, *>}
+   * @type {Object.<string, function(ol.Feature)>}
    * @private
    */
   this.defaultValues_ = options.defaultValues !== undefined ? options.defaultValues : {};

From 8c9026cd1e7989f82d6dc3d19611e29a5aa1f5da Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Mon, 30 Jul 2018 13:58:32 +0200
Subject: [PATCH 12/23] Fix npm params order to build mobile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 851930c08c11..5e7abd556bc1 100644
--- a/Makefile
+++ b/Makefile
@@ -191,7 +191,7 @@ serve-gmf-apps-desktopalt: .build/node_modules.timestamp $(FONTAWESOME_WEBFONT)
 
 .PHONY: serve-gmf-apps-mobile
 serve-gmf-apps-mobile: .build/node_modules.timestamp $(FONTAWESOME_WEBFONT) $(ANGULAR_LOCALES_FILES)
-	APP=mobile npm THEME=mobile run serve-gmf-apps
+	APP=mobile THEME=mobile npm run serve-gmf-apps
 
 .PHONY: serve-gmf-apps-mobilealt
 serve-gmf-apps-mobilealt: .build/node_modules.timestamp $(FONTAWESOME_WEBFONT) $(ANGULAR_LOCALES_FILES)

From 2cb3dbf2aaa7b4c214592ffd94ddd6462c2672e2 Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Mon, 30 Jul 2018 13:40:35 +0200
Subject: [PATCH 13/23] Metadata display issues - Fix size and position

GSGMF-571
---
 .../gmf/src/controllers/AbstractAppController.js   |  4 ++--
 contribs/gmf/src/controllers/desktop.less          |  7 +++++++
 contribs/gmf/src/controllers/mobile.less           |  7 +++++++
 contribs/gmf/src/query/window.less                 | 14 ++++++--------
 src/message/displaywindowComponent.html            |  4 ++--
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/contribs/gmf/src/controllers/AbstractAppController.js b/contribs/gmf/src/controllers/AbstractAppController.js
index 6fce16771944..decf2265d50c 100644
--- a/contribs/gmf/src/controllers/AbstractAppController.js
+++ b/contribs/gmf/src/controllers/AbstractAppController.js
@@ -559,7 +559,7 @@ const exports = function(config, $scope, $injector) {
    * @type {?string}
    * @export
    */
-  this.displaywindowHeight = null;
+  this.displaywindowHeight = '50vh';
 
   /**
    * @type {boolean}
@@ -583,7 +583,7 @@ const exports = function(config, $scope, $injector) {
    * @type {?string}
    * @export
    */
-  this.displaywindowWidth = null;
+  this.displaywindowWidth = '50vw';
 };
 
 
diff --git a/contribs/gmf/src/controllers/desktop.less b/contribs/gmf/src/controllers/desktop.less
index d61c59db789c..ec56ffc2480e 100644
--- a/contribs/gmf/src/controllers/desktop.less
+++ b/contribs/gmf/src/controllers/desktop.less
@@ -531,6 +531,13 @@ gmf-featurestyle {
   right: @app-margin;
 }
 
+/** ngeo-displayquery-window */
+main div.ngeo-displaywindow {
+  top: @topbar-height + 2 * @app-margin + 2 * @map-tools-size;
+  left: @nav-width + @app-margin;
+  right: inherit
+}
+
 /** Disclaimer */
 @bgselector-image-size: 48px;
 .gmf-app-map-messages {
diff --git a/contribs/gmf/src/controllers/mobile.less b/contribs/gmf/src/controllers/mobile.less
index 16b92c703233..0f53cc471b8d 100644
--- a/contribs/gmf/src/controllers/mobile.less
+++ b/contribs/gmf/src/controllers/mobile.less
@@ -161,3 +161,10 @@ main .gmf-app-map-messages {
     width: 1.5rem;
   }
 }
+
+/** ngeo-displayquery-window */
+main div.ngeo-displaywindow {
+  top: @map-tools-size + 2 * @app-margin;
+  left: @app-margin;
+  right: initial;
+}
diff --git a/contribs/gmf/src/query/window.less b/contribs/gmf/src/query/window.less
index 778d9222e338..1f9cd6327dc6 100644
--- a/contribs/gmf/src/query/window.less
+++ b/contribs/gmf/src/query/window.less
@@ -6,21 +6,21 @@
 @displayquerywindow-detailed-details-line-height: 2rem;
 @displayquerywindow-detailed-details-height: 8 * @displayquerywindow-detailed-details-line-height;
 
-.gmf-displayquerywindow {
+div.gmf-displayquerywindow {
   .details {
     display: none;
   }
-  .animation-container {
-    // height with 2em: 1em per text (title, subtitle)
-    height: calc(4 * @app-margin + @half-app-margin + @map-tools-size ~"+ 2em");
-  }
 }
 
-.ngeo-displaywindow {
+div.ngeo-displaywindow {
+  margin: 0 auto;
   .animation-container {
     height: 100%;
     width: 100%;
   }
+  .details.iframe {
+    overflow: hidden;
+  }
 }
 
 .gmf-displayquerywindow, .ngeo-displaywindow {
@@ -28,9 +28,7 @@
   left: initial;
   bottom: @app-margin;
   width: @displayquerywindow-tablet-width;
-  max-width: @displayquerywindow-tablet-width;
   margin-left: -@displayquerywindow-tablet-width / 2;
-  max-height: 10 * @map-tools-size;
   position: fixed;
   z-index: @above-all;
   .collapse-button {
diff --git a/src/message/displaywindowComponent.html b/src/message/displaywindowComponent.html
index 93acefdc53ba..4365e4195bb5 100644
--- a/src/message/displaywindowComponent.html
+++ b/src/message/displaywindowComponent.html
@@ -20,12 +20,12 @@
           <p class="title">{{ $ctrl.title }}</p>
         </div>
         <div
-          class="details"
+          class="details content"
           ng-if="$ctrl.content"
           ng-bind-html="$ctrl.content">
         </div>
         <div
-          class="details"
+          class="details iframe"
           ng-if="$ctrl.url !== null">
           <iframe
             frameborder="0"

From c73ba3253c556cf62c5f770ea3e7936ab708ce4b Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Mon, 30 Jul 2018 13:46:51 +0200
Subject: [PATCH 14/23] Metadata display issues - Translate title

GSGMF-571
---
 src/message/displaywindowComponent.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/message/displaywindowComponent.html b/src/message/displaywindowComponent.html
index 4365e4195bb5..f724f9059289 100644
--- a/src/message/displaywindowComponent.html
+++ b/src/message/displaywindowComponent.html
@@ -17,7 +17,7 @@
         <div
           class="header ui-draggable-handle"
           ng-if="$ctrl.title !== null">
-          <p class="title">{{ $ctrl.title }}</p>
+          <p class="title">{{$ctrl.title | translate}}</p>
         </div>
         <div
           class="details content"

From 9585b3d888ab0065db9df84461840931d5cc84f1 Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Mon, 30 Jul 2018 15:24:42 +0200
Subject: [PATCH 15/23] Fix window-query collapsed view

---
 contribs/gmf/src/query/window.less | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contribs/gmf/src/query/window.less b/contribs/gmf/src/query/window.less
index 1f9cd6327dc6..79731309ae0c 100644
--- a/contribs/gmf/src/query/window.less
+++ b/contribs/gmf/src/query/window.less
@@ -208,8 +208,11 @@ div.ngeo-displaywindow {
       height: calc(~"100% -" @map-tools-size + @app-margin);
     }
 
-    .animation-container-detailed {
-      height: (@displayquerywindow-detailed-header-height + @displayquerywindow-detailed-details-height / 2 + @app-margin * 3) + @map-tools-size;
+    .animation-container {
+      height: @map-tools-size * 2;
+      &.animation-container-detailed {
+        height: (@displayquerywindow-detailed-header-height + @displayquerywindow-detailed-details-height / 2 + @app-margin * 3) + @map-tools-size;
+      }
     }
   }
 }

From e141850c8b8cd734913c549d563c37c1945fdcfb Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Mon, 30 Jul 2018 15:48:05 +0200
Subject: [PATCH 16/23] Metadata display issues - Don't reset size preferences
 to null

GSGMF-571
---
 src/message/displaywindowComponent.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/message/displaywindowComponent.js b/src/message/displaywindowComponent.js
index 5fa2037fcaac..38ed65128e05 100644
--- a/src/message/displaywindowComponent.js
+++ b/src/message/displaywindowComponent.js
@@ -180,6 +180,8 @@ exports.Controller_ = class {
     this.desktop = this.desktop !== false;
     this.draggableContainment = this.draggableContainment || 'document';
     this.open = this.open === true;
+    this.height = this.height || '240px';
+    this.width = this.width || '240px';
 
     this.draggable = this.draggable !== undefined ?
       this.draggable : this.desktop;
@@ -226,8 +228,8 @@ exports.Controller_ = class {
    */
   get style() {
     return {
-      'height': this.height || '240px',
-      'width': this.width || '240px'
+      'height': this.height,
+      'width': this.width
     };
   }
 
@@ -246,10 +248,8 @@ exports.Controller_ = class {
    */
   clear_() {
     this.content = null;
-    this.height = null;
     this.title = null;
     this.url = null;
-    this.width = null;
   }
 };
 

From 9909ce0ae884c63e6a680d787a1267ac5eaff8b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Mon, 30 Jul 2018 15:41:18 +0200
Subject: [PATCH 17/23] Add the DPI and bbox for QGIS server

---
 contribs/gmf/src/print/component.js | 21 +++++++++++++++++----
 src/map/LayerHelper.js              | 16 +++++++++++++++-
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/contribs/gmf/src/print/component.js b/contribs/gmf/src/print/component.js
index b296d8763a34..a2ad8a384246 100644
--- a/contribs/gmf/src/print/component.js
+++ b/contribs/gmf/src/print/component.js
@@ -843,9 +843,18 @@ exports.Controller_ = class {
     }
 
     if (this.layoutInfo.legend) {
-      const legend = this.getLegend_(scale);
+      const center = this.map.getView().getCenter();
+      const deltaX = this.paperSize_[0] * scale / 2 / ngeoPrintUtils.INCHES_PER_METER_ / ngeoPrintUtils.DOTS_PER_INCH_;
+      const deltaY = this.paperSize_[1] * scale / 2 / ngeoPrintUtils.INCHES_PER_METER_ / ngeoPrintUtils.DOTS_PER_INCH_;
+      const bbox = [
+        center[0] - deltaX,
+        center[1] - deltaY,
+        center[0] + deltaX,
+        center[1] + deltaY,
+      ];
+      const legend = this.getLegend_(scale, this.layoutInfo.dpi, bbox);
       if (legend !== null) {
-        customAttributes['legend'] = this.getLegend_(scale);
+        customAttributes['legend'] = legend;
       }
     }
 
@@ -1072,10 +1081,12 @@ exports.Controller_ = class {
 
   /**
    * @param {number} scale The scale to get the legend (for wms layers only).
+   * @param {number} dpi The DPI.
+   * @param {Array.number} bbox The bbox.
    * @return {Object?} Legend object for print report or null.
    * @private
    */
-  getLegend_(scale) {
+  getLegend_(scale, dpi, bbox) {
     const legend = {'classes': []};
     let classes, layerNames, layerName, icons;
     const gettextCatalog = this.gettextCatalog_;
@@ -1111,7 +1122,9 @@ exports.Controller_ = class {
             icons = this.getMetadataLegendImage_(name);
             if (!icons) {
               icons = this.ngeoLayerHelper_.getWMSLegendURL(source.getUrl(), name,
-                scale);
+                scale, undefined, undefined, undefined, source.serverType_, dpi, bbox,
+                this.map.getView().getProjection().getCode()
+              );
             }
             // Don't add classes without legend url or from layers without any
             // active name.
diff --git a/src/map/LayerHelper.js b/src/map/LayerHelper.js
index dd52eb5728bf..8002fc96ac00 100644
--- a/src/map/LayerHelper.js
+++ b/src/map/LayerHelper.js
@@ -386,11 +386,16 @@ exports.prototype.getWMTSLegendURL = function(layer) {
  * @param {string=} opt_legendRule rule parameters to add to the returned URL.
  * @param {number=} opt_legendWidth the legend width.
  * @param {number=} opt_legendHeight the legend height.
+ * @param {string=} opt_servertype the OpenLayers server type.
+ * @param {number=} opt_dpi the DPI.
+ * @param {Array.number=} opt_bbox the bbox.
+ * @param {string=} opt_srs The projection code.
  * @return {string|undefined} The legend URL or undefined.
  * @export
  */
 exports.prototype.getWMSLegendURL = function(url,
-  layerName, opt_scale, opt_legendRule, opt_legendWidth, opt_legendHeight) {
+  layerName, opt_scale, opt_legendRule, opt_legendWidth, opt_legendHeight,
+  opt_servertype, opt_dpi, opt_bbox, opt_srs) {
   if (!url) {
     return undefined;
   }
@@ -414,6 +419,15 @@ exports.prototype.getWMSLegendURL = function(url,
       queryString['HEIGHT'] = opt_legendHeight;
     }
   }
+  if (opt_servertype == 'qgis') {
+    if (opt_dpi != undefined) {
+      queryString['DPI'] = opt_dpi;
+    }
+    if (opt_bbox != undefined && opt_srs != undefined) {
+      queryString['BBOX'] = opt_bbox.join(',');
+      queryString['SRS'] = opt_srs;
+    }
+  }
   return olUri.appendParams(url, queryString);
 };
 

From 586abcf94cd202bc20d347d4f6bb9b1e65416520 Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Tue, 31 Jul 2018 10:35:43 +0200
Subject: [PATCH 18/23] Text small is not readable

GSGMF-574
---
 contribs/gmf/src/less/base.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contribs/gmf/src/less/base.less b/contribs/gmf/src/less/base.less
index d9c8f850690e..b474b53b6779 100644
--- a/contribs/gmf/src/less/base.less
+++ b/contribs/gmf/src/less/base.less
@@ -44,6 +44,10 @@ i, cite, em, var, address, dfn {
   font-style: italic;
 }
 
+.small {
+  font-size: 90%;
+}
+
 // removes the margin at the bottom of a form-group
 // useful for groups with a range
 .form-group-nomargin {

From 2dd421b205ca2e89d283ff3214760778575f06d3 Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Tue, 31 Jul 2018 10:36:52 +0200
Subject: [PATCH 19/23] Fix too big input-sm

GSGMF-575
---
 contribs/gmf/src/less/base.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/contribs/gmf/src/less/base.less b/contribs/gmf/src/less/base.less
index b474b53b6779..fb640dfddc8d 100644
--- a/contribs/gmf/src/less/base.less
+++ b/contribs/gmf/src/less/base.less
@@ -40,6 +40,11 @@ a {
   padding: @padding-small-vertical @padding-small-horizontal;
 }
 
+.input-sm, select.input-sm {
+  height: inherit;
+  line-height: inherit;
+}
+
 i, cite, em, var, address, dfn {
   font-style: italic;
 }

From 06a461eee1cc0881abd7659dee7a5bfa67bd2685 Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Tue, 31 Jul 2018 13:50:32 +0200
Subject: [PATCH 20/23] Import KML: Manage Empty geometry import error

GSGMF-573
---
 .../datasource/ExternalDataSourcesManager.js  | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/contribs/gmf/src/datasource/ExternalDataSourcesManager.js b/contribs/gmf/src/datasource/ExternalDataSourcesManager.js
index 7d6a01b3b14b..b7cd4cfaec91 100644
--- a/contribs/gmf/src/datasource/ExternalDataSourcesManager.js
+++ b/contribs/gmf/src/datasource/ExternalDataSourcesManager.js
@@ -15,6 +15,7 @@ import ngeoDatasourceOGC from 'ngeo/datasource/OGC.js';
 import ngeoDatasourceOGCGroup from 'ngeo/datasource/OGCGroup.js';
 import ngeoDatasourceWMSGroup from 'ngeo/datasource/WMSGroup.js';
 import * as olBase from 'ol/index.js';
+import {isEmpty} from 'ol/extent.js';
 import * as olEvents from 'ol/events.js';
 import olCollection from 'ol/Collection.js';
 import olFormatGPX from 'ol/format/GPX.js';
@@ -471,29 +472,34 @@ const exports = class {
   createAndAddDataSourceFromFile(file, opt_callback) {
     this.getFileDataSource_(file).then(
       (dataSource) => {
+        let success = true;
         const fileGroup = this.fileGroup_;
 
-        // (1) No need to do anything if the file has already been added...
-        if (fileGroup.dataSources.includes(dataSource)) {
-          return;
-        }
+        // Look if the extent is valid (and so at least one geometry)
+        if (isEmpty(dataSource.extent)) {
+          success = false;
 
-        // (2) Okay, we need to add this data source. First, add its layer
-        //     to the map.
-        this.addLayer_(dataSource.layer);
+        } else {
+          // (1) No need to do anything if the file has already been added...
+          if (fileGroup.dataSources.includes(dataSource)) {
+            return;
+          }
 
-        // (3) Add it to the file group
-        fileGroup.addDataSource(dataSource);
+          // (2) Okay, we need to add this data source. First, add its layer  to the map.
+          this.addLayer_(dataSource.layer);
 
-        // (4) Recenter the map view onto its extent
-        this.map_.getView().fit(dataSource.extent);
+          // (3) Add it to the file group
+          fileGroup.addDataSource(dataSource);
 
-        // (5) Finally, add it to the ngeo collection
-        this.dataSources_.push(dataSource);
+          // (4) Recenter the map view onto its extent if there is at least one geometry (and so a valid extent)
+          this.map_.getView().fit(dataSource.extent);
 
-        // call the callback.
+          // (5) Finally, add it to the ngeo collection
+          this.dataSources_.push(dataSource);
+        }
+        // Call the callback.
         if (opt_callback) {
-          opt_callback(true);
+          opt_callback(success);
         }
       },
       (rejections) => {

From 80ad2964db4d31383a4988fa3054c219743f4896 Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Tue, 31 Jul 2018 15:16:05 +0200
Subject: [PATCH 21/23] Debug IE - add polyfill

GSGMF-576
GSGMF-577
GSGMF-579
GSGMF-580
---
 contribs/gmf/apps/desktop/index.html.ejs     | 1 +
 contribs/gmf/apps/desktop_alt/index.html.ejs | 1 +
 contribs/gmf/apps/mobile/index.html.ejs      | 1 +
 contribs/gmf/apps/mobile_alt/index.html.ejs  | 1 +
 contribs/gmf/apps/oeedit/index.html.ejs      | 1 +
 5 files changed, 5 insertions(+)

diff --git a/contribs/gmf/apps/desktop/index.html.ejs b/contribs/gmf/apps/desktop/index.html.ejs
index 29591c50fbb8..e68f1284f46e 100644
--- a/contribs/gmf/apps/desktop/index.html.ejs
+++ b/contribs/gmf/apps/desktop/index.html.ejs
@@ -318,6 +318,7 @@
         ngeo-resizemap-state="profileChartActive">
       </gmf-profile>
     </footer>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
     <script src="https://maps.googleapis.com/maps/api/js?v=3&key=AIzaSyCYnqxEQA5sz13sWSgMr97ejzvUeGP8gz4"></script>
     <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
     <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs
index e91e7008ebf1..f299b35f6723 100644
--- a/contribs/gmf/apps/desktop_alt/index.html.ejs
+++ b/contribs/gmf/apps/desktop_alt/index.html.ejs
@@ -349,6 +349,7 @@
         ngeo-resizemap-state="queryGridActive">
       </gmf-displayquerygrid>
     </footer>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
     <script src="https://maps.googleapis.com/maps/api/js?v=3&key=AIzaSyCYnqxEQA5sz13sWSgMr97ejzvUeGP8gz4"></script>
     <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
     <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
diff --git a/contribs/gmf/apps/mobile/index.html.ejs b/contribs/gmf/apps/mobile/index.html.ejs
index 817a20515a8c..52151b6b8401 100644
--- a/contribs/gmf/apps/mobile/index.html.ejs
+++ b/contribs/gmf/apps/mobile/index.html.ejs
@@ -169,6 +169,7 @@
         </gmf-authentication>
       </div>
     </ngeo-modal>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
     <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
     <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
     <% } %>
diff --git a/contribs/gmf/apps/mobile_alt/index.html.ejs b/contribs/gmf/apps/mobile_alt/index.html.ejs
index 66e364ac1eb4..a2005644cfb3 100644
--- a/contribs/gmf/apps/mobile_alt/index.html.ejs
+++ b/contribs/gmf/apps/mobile_alt/index.html.ejs
@@ -163,6 +163,7 @@
         gmf-mobile-nav-back="authCtrl.gmfUser.username !== null">
       </gmf-authentication>
     </nav>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
     <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
     <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
     <% } %>
diff --git a/contribs/gmf/apps/oeedit/index.html.ejs b/contribs/gmf/apps/oeedit/index.html.ejs
index 38dbd0abeea0..3fbbfdd00c59 100644
--- a/contribs/gmf/apps/oeedit/index.html.ejs
+++ b/contribs/gmf/apps/oeedit/index.html.ejs
@@ -170,6 +170,7 @@
         ngeo-resizemap-state="profileChartActive">
       </gmf-profile>
     </footer>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
     <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
     <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
     <% } %>

From 2f1d398588b5efe87904ad2ada9c08011123aad7 Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Tue, 31 Jul 2018 16:42:43 +0200
Subject: [PATCH 22/23] Align search color tool in IE 11

GSGMF-578
---
 contribs/gmf/src/search/search.less | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contribs/gmf/src/search/search.less b/contribs/gmf/src/search/search.less
index 78708fc2a6eb..c0aa88504d83 100644
--- a/contribs/gmf/src/search/search.less
+++ b/contribs/gmf/src/search/search.less
@@ -9,11 +9,13 @@ gmf-search {
   z-index: @content-index;
 
   & > * {
-    display: inline-block;
+    display: block;
+    float: left;
     vertical-align: top;
   }
 
   .gmf-search {
+    margin-right: @half-app-margin;
     background-color: @map-tools-bg-color;
     height: @map-tools-size;
     position: relative;

From bd379c296ffb653095a6a0d19c295b02f8ac71a9 Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Thu, 2 Aug 2018 08:50:01 +0200
Subject: [PATCH 23/23] Fix querygrid width in IE/Edge

GSGMF-576
---
 contribs/gmf/src/query/grid.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contribs/gmf/src/query/grid.less b/contribs/gmf/src/query/grid.less
index b30a9ab4e4be..780b35204251 100644
--- a/contribs/gmf/src/query/grid.less
+++ b/contribs/gmf/src/query/grid.less
@@ -10,6 +10,7 @@
   background-color: white;
   height: @grid-height;
   position: fixed;
+  width: 100%;
 
   .ngeo-grid-table-container {
     height: @table-height;