Merge remote-tracking branch 'origin/2.2'

contribs/gmf/less/search.less

@@ -90,6 +90,9 @@ gmf-search {
       }
     }
   }
+  .tt-menu.tt-open.gmf-search-no-results {
+    display: block !important;
+  }
 }
 
 // Overrides for small browser widths only

contribs/gmf/src/disclaimer/component.js

@@ -30,6 +30,7 @@ gmf.disclaimer.component = angular.module('gmfDisclaimer', [
  * @param {!angular.Scope} $scope Angular scope.
  * @param {!angular.$sce} $sce Angular sce service.
  * @param {!angular.$timeout} $timeout Angular timeout service.
+ * @param {!angularGettext.Catalog} gettextCatalog Gettext catalog.
  * @param {!ngeox.PopupFactory} ngeoCreatePopup Popup service.
  * @param {!ngeo.message.Disclaimer} ngeoDisclaimer Ngeo Disclaimer service.
  * @param {!ngeo.misc.EventHelper} ngeoEventHelper Ngeo Event Helper.
@@ -40,7 +41,7 @@ gmf.disclaimer.component = angular.module('gmfDisclaimer', [
  * @ngname GmfDisclaimerController
  */
 gmf.disclaimer.component.Controller_ = function($element, $scope, $sce, $timeout,
-  ngeoCreatePopup, ngeoDisclaimer, ngeoEventHelper, ngeoLayerHelper) {
+  gettextCatalog, ngeoCreatePopup, ngeoDisclaimer, ngeoEventHelper, ngeoLayerHelper) {
 
   /**
    * @type {?ol.Map}
@@ -92,6 +93,12 @@ gmf.disclaimer.component.Controller_ = function($element, $scope, $sce, $timeout
    */
   this.timeout_ = $timeout;
 
+  /**
+   * @type {!angularGettext.Catalog}
+   * @private
+   */
+  this.gettextCatalog_ = gettextCatalog;
+
   /**
    * @type {!angular.JQLite}
    * @private
@@ -251,6 +258,7 @@ gmf.disclaimer.component.Controller_.prototype.$onDestroy = function() {
  * @private
  */
 gmf.disclaimer.component.Controller_.prototype.showDisclaimerMessage_ = function(msg) {
+  msg = this.gettextCatalog_.getString(msg);
   if (this.external) {
     if (this.msgs_.indexOf(msg) < 0) {
       this.msgs_.push(msg);
@@ -273,6 +281,7 @@ gmf.disclaimer.component.Controller_.prototype.showDisclaimerMessage_ = function
  * @private
  */
 gmf.disclaimer.component.Controller_.prototype.closeDisclaimerMessage_ = function(msg) {
+  msg = this.gettextCatalog_.getString(msg);
   if (this.external) {
     this.visibility = false;
     this.msgs_.length = 0;

contribs/gmf/src/print/component.html

@@ -156,10 +156,9 @@
 
         <div class="col-md-5">
           <input
-            class="form-control"
+            class="form-control gmf-print-rotation-input"
             type="range"
-            ng-model="$ctrl.getSetRotation"
-            ng-model-options="{getterSetter: true}"
+            value="0"
             min="-180"
             max="180"
             data-toggle="tooltip"
@@ -168,10 +167,11 @@
 
         <div class="col-md-4">
           <input
-            class="form-control"
+            class="form-control gmf-print-rotation-input"
             type="number"
-            ng-model="$ctrl.getSetRotation"
-            ng-model-options="{getterSetter: true}">
+            min="-180"
+            max="180"
+            value="0">
         </div>
       </div>
 

contribs/gmf/src/print/component.js

@@ -180,6 +180,7 @@ gmf.print.component.component('gmfPrint', gmf.print.component.component_);
 gmf.print.component.Controller_ = class {
 
   /**
+   * @param {angular.JQLite} $element Element.
    * @param {angular.Scope} $rootScope Angular root scope.
    * @param {angular.Scope} $scope Angular scope.
    * @param {angular.$timeout} $timeout Angular timeout service.
@@ -202,7 +203,7 @@ gmf.print.component.Controller_ = class {
    * @ngdoc controller
    * @ngname GmfPrintController
    */
-  constructor($rootScope, $scope, $timeout, $q, $injector,
+  constructor($element, $rootScope, $scope, $timeout, $q, $injector,
     gettextCatalog, ngeoLayerHelper, ngeoFeatureOverlayMgr,  ngeoPrintUtils,
     ngeoCreatePrint, gmfPrintUrl, gmfAuthenticationService, ngeoQueryResult,
     $filter, gmfPrintState, gmfThemes) {
@@ -436,6 +437,19 @@ gmf.print.component.Controller_ = class {
      */
     this.scaleManuallySelected_ = false;
 
+    /**
+     * @type {angular.JQLite}
+     * @export
+     */
+    this.rotationInput_ = $element.find('.gmf-print-rotation-input');
+
+    this.rotationInput_.on('input', (event) => {
+      const rotation = $(event.target).val();
+      if (rotation !== '') {
+        this.setRotation(/** @type {number} */ (rotation));
+      }
+    });
+
     /**
      * @type {function(ol.render.Event)}
      */
@@ -563,7 +577,7 @@ gmf.print.component.Controller_ = class {
       ol.events.unlistenByKey(this.postComposeListenerKey_);
       ol.events.unlistenByKey(this.pointerDragListenerKey_);
       ol.events.unlistenByKey(this.mapViewResolutionChangeKey_);
-      this.getSetRotation(0);
+      this.setRotation(0);
       this.map.render(); // Redraw (remove) post compose mask;
     }
   }
@@ -731,32 +745,22 @@ gmf.print.component.Controller_ = class {
 
 
   /**
-   * Getter setter to update or get the current rotation value. Param and result
-   *     are in degree. Updating the rotation will redraw the mask or rorate the
-   *     map (depending on the configuration);
-   * @param {number=} opt_rotation The optional new rotation value.
-   * @return {number} The new value of rotation;
-   * @export
+   * Set the current rotation value.
+   * Updating the rotation will redraw the mask or rotate the map (depending on the configuration).
+   * @param {number} rotation The optional new rotation value in degrees.
    */
-  getSetRotation(opt_rotation) {
-    if (opt_rotation !== undefined) {
-      let rotation = parseInt(opt_rotation, 10);
-      if (rotation > 180) {
-        rotation = -180;
-      } else if (rotation < -180) {
-        rotation = 180;
-      }
-      this.rotation = rotation;
+  setRotation(rotation) {
+    this.rotation = ol.math.clamp(rotation, -180, 180);
 
-      // Render the map to update the postcompose mask or rotate the map.
-      if (this.rotateMask) {
-        this.map.render();
-      } else {
-        this.map.getView().setRotation(ol.math.toRadians(this.rotation));
-      }
+    // sync all the inputs
+    this.rotationInput_.val(this.rotation.toString());
 
+    // Render the map to update the postcompose mask or rotate the map.
+    if (this.rotateMask_) {
+      this.map.render();
+    } else {
+      this.map.getView().setRotation(ol.math.toRadians(this.rotation));
     }
-    return this.rotation;
   }
 
 
@@ -793,7 +797,7 @@ gmf.print.component.Controller_ = class {
         const increment = Math.round(ol.math.toDegrees(angle) * boost);
 
         // Set rotation then update the view.
-        this.getSetRotation(this.rotation + increment);
+        this.setRotation(this.rotation + increment);
         this.$scope_.$digest();
       }
       // Prepare the removal of this session of drags events

contribs/gmf/src/search/component.js

@@ -1037,8 +1037,9 @@ gmf.search.component.SearchController_ = class {
     }
     if (empty) {
       message.show();
-      menu.show();
+      menu.addClass('gmf-search-no-results');
     } else {
+      menu.removeClass('gmf-search-no-results');
       message.hide();
     }
   }

contribs/gmf/test/spec/controllers/gmfprintcontroller.spec.js

@@ -11,7 +11,9 @@ describe('GmfPrintController', () => {
     $controller = _$controller_;
     $rootScope = _$rootScope_;
     $scope = $rootScope.$new();
+    const $element = angular.element('<div></div>');
     gmfPrintCtrl = $controller('GmfPrintController', {
+      $element: $element,
       $scope: $scope,
       gmfPrintUrl: ''
     });
@@ -25,11 +27,14 @@ describe('GmfPrintController', () => {
     gmfPrintCtrl.parseCapabilities_({data: gmf.test.data.printcapabilities});
   }));
 
-  it('Get Set rotation', () => {
+  it('Set rotation', () => {
     expect(gmfPrintCtrl.rotation).toBe(0);
-    gmfPrintCtrl.getSetRotation(25);
-    expect(gmfPrintCtrl.rotation).toBe(gmfPrintCtrl.getSetRotation());
+    gmfPrintCtrl.setRotation(25);
     expect(gmfPrintCtrl.rotation).toBe(25);
+    gmfPrintCtrl.setRotation(190);
+    expect(gmfPrintCtrl.rotation).toBe(180);
+    gmfPrintCtrl.setRotation(-1000);
+    expect(gmfPrintCtrl.rotation).toBe(-180);
   });
 
   it('Set layout and test depending layout informations changes', () => {

src/filter/rulecomponent.html

@@ -244,7 +244,7 @@
           <span>{{ $ctrl.timeToDate($ctrl.rule.upperBoundary) }}</span>
         </div>
         <div ng-switch-default>
-          <span>{{ $ctrl.rule.operator }}</span>
+          <span>{{ $ctrl.operatorsShortFormat[$ctrl.rule.operator] }}</span>
           <span>{{ $ctrl.timeToDate($ctrl.rule.getExpression()) }}</span>
         </div>
       </div>
@@ -291,7 +291,7 @@
           <span>{{ $ctrl.rule.upperBoundary }}</span>
         </div>
         <div ng-switch-default>
-          <span>{{ $ctrl.rule.operator }}</span>
+          <span>{{ $ctrl.operatorsShortFormat[$ctrl.rule.operator] }}</span>
           <span>{{ $ctrl.rule.getExpression() }}</span>
         </div>
       </div>

src/filter/rulecomponent.js

@@ -200,6 +200,23 @@ ngeo.filter.ruleComponent.RuleController_ = class {
       [tot.EQUALS]: gettextCatalog.getString('Is equal to')
     };
 
+    /**
+     * @type {Object.<string, string>}
+     * @export
+     */
+    this.operatorsShortFormat = {
+      [ot.EQUAL_TO]: '=',
+      [ot.GREATER_THAN]: '>',
+      [ot.GREATER_THAN_OR_EQUAL_TO]: '>=',
+      [ot.LESSER_THAN]: '<',
+      [ot.LESSER_THAN_OR_EQUAL_TO]: '<=',
+      [ot.NOT_EQUAL_TO]: '!=',
+      [ot.LIKE]: '~',
+      [tot.BEGINS]: '>=',
+      [tot.ENDS]: '<=',
+      [tot.EQUALS]: '='
+    };
+
     /**
      * Time property used when the rule is of type 'date|datetime' and uses
      * a range of date.

src/format/xsdattribute.js

@@ -173,7 +173,7 @@ ngeo.format.XSDAttribute.prototype.setAttributeByXsdType_ = function(
     attribute.type = ngeo.format.AttributeType.DATETIME;
   } else if (type === 'xsd:time') {
     attribute.type = ngeo.format.AttributeType.TIME;
-  } else if (type === 'xsd:decimal') {
+  } else if (type === 'xsd:decimal' || type === 'xsd:double') {
     attribute.type = ngeo.format.AttributeType.NUMBER;
     attribute.numType = ngeo.format.XSDAttribute.NumberType.FLOAT;
   } else if (type === 'xsd:integer') {

src/message/displaywindowComponent.js

@@ -1,5 +1,6 @@
 goog.provide('ngeo.message.displaywindowComponent');
 
+goog.require('goog.asserts');
 goog.require('ngeo'); // nowebpack
 // webpack: import 'jquery-ui/ui/widgets/resizable.js';
 // webpack: import 'jquery-ui/ui/widgets/draggable.js';
@@ -51,7 +52,7 @@ ngeo.message.displaywindowComponent.Controller_ = class {
    * @param {!jQuery} $element Element.
    * @param {!angular.$sce} $sce Angular sce service.
    * @param {!angular.Scope} $scope Scope.
-   * @param {angular.$compile} $compile The compile provider.
+   * @param {!angular.$compile} $compile The compile provider.
    * @private
    * @ngInject
    * @ngdoc controller
@@ -153,7 +154,7 @@ ngeo.message.displaywindowComponent.Controller_ = class {
     this.sce_ = $sce;
 
     /**
-     * @type {angular.Scope}
+     * @type {!angular.Scope}
      * @private
      */
     this.scope_ = $scope;
@@ -201,10 +202,10 @@ ngeo.message.displaywindowComponent.Controller_ = class {
     }
 
     if (this.contentTemplate) {
-      const scope = this.contentScope || this.scope_;
+      const scope = goog.asserts.assert(this.contentScope || this.scope_);
       const compiled = this.compile_(this.contentTemplate)(scope);
       const displayWindow = this.element_.find('.ngeo-displaywindow .windowcontainer .animation-container');
-      displayWindow.append(compiled);
+      displayWindow.append(/** @type {?} */ (compiled));
     }
   }
 

src/misc/datepickerComponent.html

@@ -3,7 +3,7 @@
     <div ng-if="::datepickerCtrl.time.widget === 'datepicker'">
       <div class="ngeo-datepicker-start-date">
         <span ng-if="::datepickerCtrl.time.mode === 'range'" translate>From:</span>
-        <span ng-if="::datepickerCtrl.time.mode !== 'range'"translate>Date:</span>
+        <span ng-if="::datepickerCtrl.time.mode !== 'range'" translate>Date:</span>
         <input name="sdate" ui-date="datepickerCtrl.sdateOptions" ng-model="datepickerCtrl.sdate" required=""/>
       </div>
       <div

src/misc/datepickerComponent.js

@@ -62,6 +62,8 @@ ngeo.misc.datepickerComponent.component_ = function(ngeoDatePickerTemplateUrl,
       $['datepicker']['setDefaults']($['datepicker']['regional'][lang]);
 
       ctrl.sdateOptions = angular.extend({}, ctrl.sdateOptions, {
+        'minDate': ctrl.initialMinDate,
+        'maxDate': ctrl.initialMaxDate,
         'onClose': (selectedDate) => {
           if (selectedDate) {
             $(element[0]).find('input[name="edate"]').datepicker('option', 'minDate', selectedDate);
@@ -70,6 +72,8 @@ ngeo.misc.datepickerComponent.component_ = function(ngeoDatePickerTemplateUrl,
       });
 
       ctrl.edateOptions = angular.extend({}, ctrl.edateOptions, {
+        'minDate': ctrl.initialMinDate,
+        'maxDate': ctrl.initialMaxDate,
         'onClose': (selectedDate) => {
           if (selectedDate) {
             $(element[0]).find('input[name="sdate"]').datepicker('option', 'maxDate', selectedDate);
@@ -166,8 +170,6 @@ ngeo.misc.datepickerComponent.Controller_ = function($scope, $injector,
    * @export
    */
   this.edateOptions = {
-    'minDate': this.initialMinDate,
-    'maxDate': this.initialMaxDate,
     'changeMonth': true,
     'changeYear': true
   };
@@ -178,8 +180,6 @@ ngeo.misc.datepickerComponent.Controller_ = function($scope, $injector,
    * @export
    */
   this.sdateOptions = {
-    'minDate': this.initialMinDate,
-    'maxDate': this.initialMaxDate,
     'changeMonth': true,
     'changeYear': true
   };

src/rule/rule.js

@@ -363,8 +363,8 @@ ngeo.rule.Rule.SpatialOperatorType = {
  * @enum {string}
  */
 ngeo.rule.Rule.TemporalOperatorType = {
-  BEGINS: '>=',
-  DURING: '..',
-  ENDS: '<=',
-  EQUALS: '='
+  BEGINS: 'time_start',
+  DURING: 'time_during',
+  ENDS: 'time_end',
+  EQUALS: 'time_equal'
 };