Merge remote-tracking branch 'origin/2.4'

contribs/gmf/apps/desktop_alt/Controller.js

@@ -161,7 +161,7 @@ class Controller extends AbstractDesktopController {
    * @param {JQueryEventObject} event keydown event.
    */
   onKeydown(event) {
-    if (event.ctrlKey && event.key === 'p') {
+    if (event && event.ctrlKey && event.key === 'p') {
       this.printPanelActive = true;
       event.preventDefault();
     }

contribs/gmf/src/controllers/AbstractAppController.js

@@ -235,7 +235,7 @@ export function AbstractAppController(config, map, $scope, $injector) {
       if (!themeName) {
         throw new Error('Missing themeName');
       }
-      this.gmfThemeManager.updateCurrentTheme(themeName, previousThemeName);
+      this.gmfThemeManager.updateCurrentTheme(themeName, previousThemeName, true);
     }
     this.setDefaultBackground_(null);
     this.updateHasEditableLayers_();
@@ -711,7 +711,7 @@ AbstractAppController.prototype.initLanguage = function() {
   const browserLanguage = /** @type {string|undefined} */
       (this.getBrowserLanguage(Object.keys(this.langUrls)));
   const urlLanguage = /** @type {string|undefined} */
-      (this.stateManager.getInitialValue('lang'));
+      (this.stateManager.getInitialStringValue('lang'));
 
   if (urlLanguage !== undefined && urlLanguage in this.langUrls) {
     this.switchLanguage(urlLanguage);

contribs/gmf/src/datasource/ExternalDataSourcesManager.js

@@ -355,7 +355,7 @@ export class ExternalDatSourcesManager {
         id: id,
         name: layer.Title,
         ogcImageType: ogcImageType,
-        ogcLayers: [{
+        wmsLayers: [{
           name: layer.Name,
           queryable: queryable
         }],

contribs/gmf/src/datasource/Manager.js

@@ -462,7 +462,8 @@ export class DatasourceManager {
     const ogcType = gmfLayer.type;
     let maxResolution = 0;
     let minResolution = 0;
-    let ogcLayers;
+    let wmsLayers;
+    let wfsLayers;
     let ogcServer;
     let wmtsLayer;
     let wmtsUrl;
@@ -482,7 +483,13 @@ export class DatasourceManager {
       // OGC Layers
       const layers = meta.queryLayers || meta.wmsLayers;
       if (layers) {
-        ogcLayers = layers.split(',').map((layer) => {
+        wmsLayers = layers.split(',').map((layer) => {
+          return {
+            name: layer,
+            queryable: true
+          };
+        });
+        wfsLayers = layers.split(',').map((layer) => {
           return {
             maxResolution: maxResolution,
             minResolution: minResolution,
@@ -506,7 +513,20 @@ export class DatasourceManager {
       minResolution = gmfLayerWMS.minResolutionHint;
 
       // OGC Layers
-      ogcLayers = gmfLayerWMS.childLayers.map((childLayer) => {
+      let queryable = false;
+      for (const wfslayer of gmfLayerWMS.childLayers) {
+        if (wfslayer.queryable) {
+          queryable = true;
+          break;
+        }
+      }
+      wmsLayers = gmfLayerWMS.layers.split(',').map((childLayer) => {
+        return {
+          name: childLayer,
+          queryable: queryable,
+        };
+      });
+      wfsLayers = gmfLayerWMS.childLayers.map((childLayer) => {
         return {
           maxResolution: childLayer.maxResolutionHint,
           minResolution: childLayer.minResolutionHint,
@@ -601,8 +621,11 @@ export class DatasourceManager {
     if (ogcImageType) {
       options.ogcImageType = ogcImageType;
     }
-    if (ogcLayers) {
-      options.ogcLayers = ogcLayers;
+    if (wmsLayers) {
+      options.wmsLayers = wmsLayers;
+    }
+    if (wfsLayers) {
+      options.wfsLayers = wfsLayers;
     }
     if (ogcServerType) {
       options.ogcServerType = ogcServerType;

contribs/gmf/src/datasource/OGC.js

@@ -27,8 +27,10 @@ import ngeoDatasourceOGC from 'ngeo/datasource/OGC.js';
  * @property {boolean} [filtrable] Whether the data source is filtrable or not.
  * @property {string} [geometryName] The name of the geometry attribute.
  * @property {string} [ogcImageType] The type of images to fetch by queries by the (WMS) or (WMTS).
- * @property {Array<import('ngeo/datasource/OGC').OGCLayer>} [ogcLayers] A list of layer definitions that
- *    are used by (WMS) and (WFS) queries.
+ * @property {Array<import('ngeo/datasource/OGC').WMSLayer>} [wmsLayers] A list of layer definitions that are used by WMS queries.
+ *    These are **not** used by the (WMTS) queries (the wmtsLayers is used by WMTS queries).
+ * @property {Array<import('ngeo/datasource/OGC').WFSLayer>} [wfsLayers] A list of layer definitions that
+ *    are used by WFS queries.
  *    These are **not** used by the (WMTS) queries (the wmtsLayers is used by WMTS queries).
  * @property {string} [ogcServerType] The type of OGC server.
  * @property {string} [ogcType] The type data source. Can be: 'WMS' or 'WMTS'.

contribs/gmf/src/datasource/WFSAliases.js

@@ -37,7 +37,7 @@ export class DatasourceWFSAlias {
     // Only QGIS Server supports WFS aliases
     if (dataSource.ogcServerType === ServerType.QGISSERVER &&
       dataSource.wfsUrl_ &&
-      dataSource.getOGCLayerNames().length == 1 &&
+      dataSource.getWFSLayerNames().length == 1 &&
       !dataSource.attributes) {
       // Trigger an additional WFS DescribeFeatureType request to get
       // datasource attributes, including aliases.

contribs/gmf/src/filters/filterselectorComponent.js

@@ -489,7 +489,7 @@ class FilterSelectorController {
    *
    *  1) have its name in the list of filtrable layer node names
    *  2) support WFS
-   *  3) have only one ogcLayers defined
+   *  3) have only one wfsLayers defined
    *  4) the ogcLayer must be queryable
    *
    * If 1) is true but not any of the others, then the server has not been
@@ -527,14 +527,14 @@ class FilterSelectorController {
       }
 
       // (3) The DS must have only one ogcLayer
-      if (!dataSource.ogcLayers || !dataSource.ogcLayers.length) {
+      if (!dataSource.wfsLayers || !dataSource.wfsLayers.length) {
         msgs.push(gettext.getString(
-          'The data source must have only 1 ogcLayer defined.'
+          'The data source must have only 1 wfsLayer defined.'
         ));
-      } else if (!dataSource.ogcLayers[0].queryable) {
+      } else if (!dataSource.wfsLayers[0].queryable) {
         // (4) The ogcLayer must be queryable
         msgs.push(gettext.getString(
-          'The ogcLayer within the data source must be queryable.'
+          'The wfsLayer within the data source must be queryable.'
         ));
       }
 

contribs/gmf/src/index.js

@@ -25,6 +25,7 @@ export const COORDINATES_LAYER_NAME = 'gmfCoordinatesLayerName';
  */
 export const PermalinkParam = {
   BG_LAYER: 'baselayer_ref',
+  BG_LAYER_OPACITY: 'baselayer_opacity',
   EXTERNAL_DATASOURCES_NAMES: 'eds_n',
   EXTERNAL_DATASOURCES_URLS: 'eds_u',
   FEATURES: 'rl_features',

contribs/gmf/src/layertree/TreeManager.js

@@ -179,7 +179,7 @@ LayertreeTreeManager.prototype.setFirstLevelGroups = function(firstLevelGroups)
  *     group.
  * @param {boolean=} opt_add if true, force to use the 'add' mode this time.
  * @param {boolean=} opt_silent if true notifyCantAddGroups_ is not called.
- * @return{boolean} True if the group has been added. False otherwise.
+ * @return {boolean} True if the group has been added. False otherwise.
  */
 LayertreeTreeManager.prototype.addFirstLevelGroups = function(firstLevelGroups, opt_add, opt_silent) {
   /** @type {import('gmf/themes.js').GmfGroup[]} */

contribs/gmf/src/permalink/Permalink.js

@@ -536,7 +536,8 @@ export function PermalinkService(
       this.ngeoBackgroundLayerMgr_,
       'change',
       this.handleBackgroundLayerManagerChange_,
-      this);
+      this
+    );
   }
 
   // visibility
@@ -890,7 +891,6 @@ PermalinkService.prototype.setMap = function(map) {
       this.registerMap_(map, null);
     }
   }
-
 };
 
 
@@ -996,8 +996,7 @@ PermalinkService.prototype.unregisterMap_ = function() {
 
 
 /**
- * Get the background layer object to use to initialize the map from the
- * state manager.
+ * Get the background layer object to use to initialize the map from the state manager.
  * @param {Array<import("ol/layer/Base.js").default>} layers Array of background layer objects.
  * @return {?import("ol/layer/Base.js").default} Background layer.
  */
@@ -1014,6 +1013,16 @@ PermalinkService.prototype.getBackgroundLayer = function(layers) {
 };
 
 
+/**
+ * Get the background layer opacity to use to initialize the map from the state manager.
+ * @return {number} Opacity.
+ */
+PermalinkService.prototype.getBackgroundLayerOpacity = function() {
+  const opacity_ = this.ngeoStateManager_.getInitialNumberValue(PermalinkParam.BG_LAYER_OPACITY);
+  return opacity_ === undefined ? undefined : opacity_ / 100;
+};
+
+
 /**
  * Called when the background layer changes. Update the state using the
  * background layer label, i.e. its name.
@@ -1037,6 +1046,31 @@ PermalinkService.prototype.handleBackgroundLayerManagerChange_ = function() {
   const object = {};
   object[PermalinkParam.BG_LAYER] = layerName;
   this.ngeoStateManager_.updateState(object);
+
+  const backgroundLayer = this.ngeoBackgroundLayerMgr_.getOpacityBgLayer(this.map_);
+  if (backgroundLayer) {
+    const opacity = this.getBackgroundLayerOpacity();
+    if (opacity !== undefined) {
+      backgroundLayer.setOpacity(opacity);
+    } else {
+      const opacity = backgroundLayer.getOpacity();
+      /** @type {Object<string, string>} */
+      const object = {};
+      object[PermalinkParam.BG_LAYER_OPACITY] = `${opacity * 100}`;
+      this.ngeoStateManager_.updateState(object);
+    }
+    olEvents.listen(
+      backgroundLayer,
+      'change:opacity',
+      () => {
+        const opacity = backgroundLayer.getOpacity();
+        /** @type {Object<string, string>} */
+        const object = {};
+        object[PermalinkParam.BG_LAYER_OPACITY] = `${opacity * 100}`;
+        this.ngeoStateManager_.updateState(object);
+      }
+    );
+  }
 };
 
 
@@ -1476,9 +1510,9 @@ PermalinkService.prototype.initExternalDataSources_ = function() {
 
   const promises = [];
 
-  const layerNamesString = this.ngeoStateManager_.getInitialValue(
+  const layerNamesString = this.ngeoStateManager_.getInitialStringValue(
     PermalinkParam.EXTERNAL_DATASOURCES_NAMES);
-  const urlsString = this.ngeoStateManager_.getInitialValue(
+  const urlsString = this.ngeoStateManager_.getInitialStringValue(
     PermalinkParam.EXTERNAL_DATASOURCES_URLS);
 
   if (layerNamesString && urlsString) {
@@ -1724,7 +1758,7 @@ PermalinkService.prototype.setExternalDataSourcesState_ = function() {
           // External WMS data sources always have only one OGC layer name,
           // as they are created using a single Capability Layer object that
           // has only 1 layer name
-          const layerName = wmsDataSource.getOGCLayerNames()[0];
+          const layerName = wmsDataSource.getWFSLayerNames()[0];
           wmsGroupLayerNames.push(layerName);
         }
       }

contribs/gmf/src/query/window.scss

@@ -62,7 +62,6 @@ div.ngeo-displaywindow {
       flex-direction: column;
       width: 100%;
       height: 100%;
-      padding: $app-margin;
       text-align: left;
       white-space: nowrap;
       overflow: hidden;
@@ -76,6 +75,14 @@ div.ngeo-displaywindow {
       .content-template-container {
         overflow: auto;
       }
+      .header {
+        padding: $app-margin $app-margin 0 $app-margin;
+      }
+      .details {
+        padding: 0 $app-margin $app-margin $app-margin;
+        // small margin so that the scrollbar and the window resize are not in conflict.
+        margin-right: $half-app-margin;
+      }
     }
   }
   .animation-container-detailed {

contribs/gmf/src/query/windowComponent.html

@@ -34,7 +34,7 @@
         ng-animate-swap="ctrl.animate"
         class="slide-animation gmf-animatable">
 
-        <div class="header">
+        <div class="header ui-draggable-handle">
           <p
             class="title"
             >{{ctrl.source.label | translate}}</p>

contribs/gmf/src/query/windowComponent.js

@@ -324,14 +324,15 @@ QueryWindowController.prototype.$onInit = function() {
   }
   highlightFeaturesOverlay.setStyle(highlightFeatureStyle);
 
+  const windowContainer = this.element_.find('.gmf-displayquerywindow .windowcontainer');
   if (this.desktop) {
-    this.element_.find('.gmf-displayquerywindow .windowcontainer').draggable({
-      'cancel': 'input,textarea,button,select,option,tr',
-      'containment': this.draggableContainment
+    windowContainer.draggable({
+      handle: '.header',
+      containment: this.draggableContainment
     });
-    this.element_.find('.gmf-displayquerywindow .windowcontainer').resizable({
-      'minHeight': 240,
-      'minWidth': 240
+    windowContainer.resizable({
+      minHeight: 240,
+      minWidth: 240
     });
   }
 };

contribs/gmf/src/theme/Manager.js

@@ -119,15 +119,16 @@ ThemeManagerService.prototype.isLoading = function() {
 /**
  * @param {string} themeName wanted theme name.
  * @param {string} fallbackThemeName fallback theme name.
+ * @param {boolean=} opt_silent if true notifyCantAddGroups_ is not called.
  * @export
  */
-ThemeManagerService.prototype.updateCurrentTheme = function(themeName, fallbackThemeName) {
+ThemeManagerService.prototype.updateCurrentTheme = function(themeName, fallbackThemeName, opt_silent) {
   this.gmfThemes_.getThemesObject().then((themes) => {
     if (!themeName && this.modeFlush) {
       // In flush mode load current theme private groups
       const fallbackTheme = findThemeByName(themes, fallbackThemeName);
       if (fallbackTheme) {
-        this.gmfTreeManager_.addFirstLevelGroups(fallbackTheme.children, false, false);
+        this.gmfTreeManager_.addFirstLevelGroups(fallbackTheme.children, false, opt_silent);
       }
     }
     if (themeName) {

examples/bboxquery.js

@@ -136,7 +136,11 @@ function MainController($scope, ngeoDataSources) {
     visible: true,
     wfsFeatureNS: MAPSERVER_WFS_FEATURE_NS,
     wfsUrl: MAPSERVER_PROXY,
-    ogcLayers: [{
+    wmsLayers: [{
+      name: 'bus_stop',
+      queryable: true
+    }],
+    wfsLayers: [{
       name: 'bus_stop',
       queryable: true
     }]
@@ -148,7 +152,11 @@ function MainController($scope, ngeoDataSources) {
     visible: true,
     wfsFeatureNS: MAPSERVER_WFS_FEATURE_NS,
     wfsUrl: MAPSERVER_PROXY,
-    ogcLayers: [{
+    wmsLayers: [{
+      name: 'information',
+      queryable: true
+    }],
+    wfsLayers: [{
       name: 'information',
       queryable: true
     }]

examples/mapquery.js

@@ -147,7 +147,11 @@ function MainController($scope, ngeoDataSources, ngeoToolActivateMgr) {
     name: 'bus_stop',
     visible: true,
     wmsUrl: MAPSERVER_PROXY,
-    ogcLayers: [{
+    wmsLayers: [{
+      name: 'bus_stop',
+      queryable: true
+    }],
+    wfsLayers: [{
       name: 'bus_stop',
       queryable: true
     }]
@@ -158,7 +162,11 @@ function MainController($scope, ngeoDataSources, ngeoToolActivateMgr) {
     name: 'information',
     visible: true,
     wmsUrl: MAPSERVER_PROXY,
-    ogcLayers: [{
+    wmsLayers: [{
+      name: 'information',
+      queryable: true
+    }],
+    wfsLayers: [{
       name: 'information',
       queryable: true
     }]

src/datasource/Helper.js

@@ -96,7 +96,7 @@ export class DatasourceHelper {
       this.ngeoQuerent_.wfsDescribeFeatureType(dataSource).then((featureType_) => {
         // We know, at this point, that there's only one definition that
         // was returned.  Just to be sure, let's do a bunch of assertions.
-        const ogcLayerName = dataSource.getOGCLayerNames()[0];
+        const ogcLayerName = dataSource.getWFSLayerNames()[0];
         console.assert(typeof ogcLayerName == 'string', 'The data source should have only one ogcLayer.');
         const featureType = /** @type {Object<string, *>} */(/** @type {unknown} */(featureType_));
         for (const element of featureType.element) {