Merge remote-tracking branch 'origin/2.4'

api/index.js

@@ -1,7 +1,8 @@
 import config from './src/constants.js';
 import Map from './src/Map.js';
 
-config.themesUrl = 'https://geomapfish-demo-2-5.camptocamp.com/themes?version=2&background=background';
+config.themesUrl = 'https://geomapfish-demo-2-5.camptocamp.com/themes?' +
+  'version=2&background=background&interface=api';
 
 const lib = {
   Map

api/src/Map.js

@@ -410,7 +410,7 @@ class Map {
       if (table) {
         contentHTML += '<table><tbody>';
         for (const key in properties) {
-          if (!EXCLUDE_PROPERTIES.includes(key) || key !== geometryName) {
+          if (!EXCLUDE_PROPERTIES.includes(key) && key !== geometryName) {
             contentHTML += '<tr>';
             contentHTML += `<th>${key}</th>`;
             contentHTML += `<td>${properties[key]}</td>`;

contribs/gmf/src/backgroundlayerselector/component.js

@@ -215,6 +215,7 @@ Controller.prototype.getSetBgLayerOpacity = function(val) {
   }
   if (val !== undefined) {
     this.opacityLayer.setOpacity(val);
+    this.opacityLayer.setVisible(val !== 0);
   }
   return this.opacityLayer.getOpacity();
 };

contribs/gmf/src/layertree/TreeManager.js

@@ -129,6 +129,12 @@ export function LayertreeTreeManager($timeout, $injector, gettextCatalog, ngeoLa
    */
   this.ngeoStateManager_ = ngeoStateManager;
 
+  /**
+   * @type {Array.<import('gmf/themes.js').GmfGroup>|undefined}
+   * @private
+   */
+  this.initialLevelFirstGroups_ = undefined;
+
   /**
    * A reference to the OGC servers loaded by the theme service.
    * @type {?import('gmf/themes.js').GmfOgcServers}
@@ -197,6 +203,22 @@ LayertreeTreeManager.prototype.addFirstLevelGroups = function(firstLevelGroups,
   return groupNotAdded.length === 0;
 };
 
+/**
+ * @param {Array.<import('gmf/themes.js').GmfGroup>} firstGroups The groups we add to the layertree
+ */
+LayertreeTreeManager.prototype.setItintialFirstLevelGroups = function(firstGroups) {
+  this.initialLevelFirstGroups_ = firstGroups;
+};
+
+/**
+ * @param {array} array An array of groups.
+ * @param {number} old_index The old index before reorder (the current one).
+ * @param {number} new_index The new index after reorder.
+ * @private
+ */
+LayertreeTreeManager.prototype.reorderChild_ = function(array, old_index, new_index) {
+  array.splice(new_index, 0, array.splice(old_index, 1)[0]);
+};
 
 /**
  * Update the application state with the list of first level groups in the tree
@@ -265,7 +287,20 @@ LayertreeTreeManager.prototype.addFirstLevelGroup_ = function(group) {
     // Add each first-level-groups.
     this.groupsToAddInThisDigestLoop_.forEach((grp) => {
       this.root.children.unshift(grp);
+
+      // We reorder the groups now as it has to be done before the permalink to be updated
+      // initialFirstGroups_ is only defined for user change theme loading
+      this.root.children.forEach((group, old_index) => {
+        if (this.initialLevelFirstGroups_ !== undefined) {
+          const new_index = this.initialLevelFirstGroups_.findIndex(
+            firstLevelGroup => firstLevelGroup.id === group.id);
+          if (new_index !== -1 && new_index !== old_index) {
+            this.reorderChild_(this.root.children, old_index, new_index);
+          }
+        }
+      });
     });
+    this.initialLevelFirstGroups_ = undefined;
     //Update the permalink
     this.updateTreeGroupsState_(this.root.children);
     // Reset the groups and the promise state. Don't reset the

contribs/gmf/src/layertree/datasourceGroupTreeComponent.html

@@ -61,7 +61,7 @@
           ng-click="$ctrl.removeDataSource(dataSource)">
           <span class="fa fa-trash"></span>
         </a>
-  </span>
+      </span>
     </div>
   </li>
 </ul>

contribs/gmf/src/theme/Manager.js

@@ -128,6 +128,7 @@ ThemeManagerService.prototype.updateCurrentTheme = function(themeName, fallbackT
       // In flush mode load current theme private groups
       const fallbackTheme = findThemeByName(themes, fallbackThemeName);
       if (fallbackTheme) {
+        this.gmfTreeManager_.setItintialFirstLevelGroups(fallbackTheme.children);
         this.gmfTreeManager_.addFirstLevelGroups(fallbackTheme.children, false, opt_silent);
       }
     }

src/map/BackgroundLayerMgr.js

@@ -164,8 +164,9 @@ export class MapBackgroundLayerManager extends olObservable {
     const opacityBackgroundLayer = this.getOpacityBgLayer(map);
     if (opacityBackgroundLayer) {
       const previous = bgGroup.getLayers().remove(opacityBackgroundLayer);
-      layer.setOpacity(previous ? previous.getOpacity() : 0);
-      layer.setVisible(previous ? previous.getVisible() : true);
+      const opacity = previous ? previous.getOpacity() : 0;
+      layer.setOpacity(opacity);
+      layer.setVisible(opacity !== 0);
     }
     const ZIndex = -100;
     layer.setZIndex(ZIndex);