Merge pull request #4798 from camptocamp/merge_2.3_into_master

Merge 2.3 into master
camptocamp · Apr 5, 2019 · d8c3748 · d8c3748
2 parents 0766097 + c297e39
commit d8c3748
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/contribs/gmf/apps/mobile/index.html.ejs b/contribs/gmf/apps/mobile/index.html.ejs
@@ -69,7 +69,11 @@
         ng-click="mainCtrl.toggleRightNavVisibility()">
         <i class="fa fa-wrench"></i>
       </button>
-      <div class="overlay" ng-click="mainCtrl.hideNav()"></div>
+      <div class="overlay"
+        ng-swipe-disable-mouse
+        ng-swipe-left="mainCtrl.hideNav()"
+        ng-swipe-right="mainCtrl.hideNav()"
+        ng-click="mainCtrl.hideNav()"></div>
       <div
         class="gmf-search-overlay"
         ng-click="mainCtrl.searchOverlayVisible = false">

diff --git a/contribs/gmf/apps/mobile_alt/index.html.ejs b/contribs/gmf/apps/mobile_alt/index.html.ejs
@@ -66,7 +66,11 @@
         ng-click="mainCtrl.toggleRightNavVisibility()">
         <i class="fa fa-wrench"></i>
       </button>
-      <div class="overlay" ng-click="mainCtrl.hideNav()"></div>
+      <div class="overlay"
+        ng-swipe-disable-mouse
+        ng-swipe-left="mainCtrl.hideNav()"
+        ng-swipe-right="mainCtrl.hideNav()"
+        ng-click="mainCtrl.hideNav()"></div>
       <div
         class="gmf-search-overlay"
         ng-click="mainCtrl.searchOverlayVisible = false">

diff --git a/contribs/gmf/src/datasource/ExternalDataSourcesManager.js b/contribs/gmf/src/datasource/ExternalDataSourcesManager.js
@@ -34,7 +34,7 @@ export class ExternalDatSourcesManager {
 
   /**
    * External data sources come remote online resources, such as WMS/WMTS
-   * servers, and also files such as KML/GXP. This service is responsible of
+   * servers, and also files such as KML/GPX. This service is responsible of
    * creating, storing and managing them.
    *
    * @param {!angular.gettext.gettextCatalog} gettextCatalog service.

diff --git a/contribs/gmf/src/editing/editFeatureSelectorComponent.js b/contribs/gmf/src/editing/editFeatureSelectorComponent.js
@@ -47,6 +47,8 @@ module.run(/* @ngInject */ ($templateCache) => {
  *     buffer in pixels to use when making queries to get the features.
  * @htmlAttribute {import("ol/layer/Vector.js").default} gmf-editfeatureselector-vector The vector
  *     layer where the selected or created features are drawn.
+ * @htmlAttribute {ngeo.layertree.Controller} gmf-editfeatureselector-tree The
+ *     layertree controller handling the selectable editable layers list.
  * @return {angular.IDirective} The directive specs.
  * @ngdoc directive
  * @ngname gmfEditfeatureselector
@@ -58,7 +60,8 @@ function editingEditFeatureComponent() {
       'active': '=gmfEditfeatureselectorActive',
       'map': '<gmfEditfeatureselectorMap',
       'tolerance': '<?gmfEditfeatureselectorTolerance',
-      'vectorLayer': '<gmfEditfeatureselectorVector'
+      'vectorLayer': '<gmfEditfeatureselectorVector',
+      'selectedEditableTreeCtrl': '=?gmfEditfeatureselectorTree'
     },
     bindToController: true,
     templateUrl: 'gmf/editing/editFeatureSelectorComponent'

diff --git a/src/print/Service.js b/src/print/Service.js
@@ -89,9 +89,9 @@ export function PrintService(url, $http, gettextCatalog, ngeoLayerHelper) {
 
   /**
    * @type {import("ngeo/print/VectorEncoder.js").default}
-   * @private
+   * @protected
    */
-  this.vectorEncoder_ = new ngeoPrintVectorEncoder();
+  this.vectorEncoder = new ngeoPrintVectorEncoder();
 
   /**
    * @type {boolean}
@@ -212,10 +212,18 @@ PrintService.prototype.encodeLayer = function(arr, layer, resolution) {
   } else if (layer instanceof olLayerTile) {
     this.encodeTileLayer_(arr, layer);
   } else if (layer instanceof olLayerVector) {
-    this.vectorEncoder_.encodeVectorLayer(arr, layer, resolution);
+    this.encodeVectorLayer(arr, layer, resolution);
   }
 };
 
+/**
+ * @param {Array.<import('ngeo/print/mapfish-print-v3.js').MapFishPrintLayer>} arr Array.
+ * @param {olLayerVector} layer Layer.
+ * @param {number} resolution Resolution.
+ */
+PrintService.prototype.encodeVectorLayer = function(arr, layer, resolution) {
+  this.vectorEncoder.encodeVectorLayer(arr, layer, resolution);
+};
 
 /**
  * @param {Array.<import('ngeo/print/mapfish-print-v3.js').MapFishPrintLayer>} arr Array.