Merge remote-tracking branch 'origin/2.3'

contribs/gmf/apps/desktop_alt/Controller.js

@@ -14,6 +14,7 @@ import ngeoRoutingModule from 'ngeo/routing/module.js';
 import EPSG2056 from '@geoblocks/proj/src/EPSG_2056.js';
 import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import ngeoStatemanagerWfsPermalink from 'ngeo/statemanager/WfsPermalink.js';
+import {Circle, Fill, Stroke, Style} from 'ol/style';
 import Raven from 'raven-js/src/raven.js';
 import RavenPluginsAngular from 'raven-js/plugins/angular.js';
 
@@ -107,6 +108,24 @@ class Controller extends AbstractDesktopController {
       'Learning [merged]': ['information', 'bus_stop']
     };
 
+    const radius = 5;
+    const fill = new Fill({color: [255, 255, 255, 0.6]});
+    const stroke = new Stroke({color: [255, 0, 0, 1], width: 2});
+    const image = new Circle({fill, radius, stroke});
+    const default_search_style = new Style({
+      fill,
+      image,
+      stroke
+    });
+
+    /**
+     * @type {Object.<string, ol.style.Style>} Map of styles for search overlay.
+     * @export
+     */
+    this.searchStyles = {
+      'default': default_search_style
+    };
+
     // Allow angular-gettext-tools to collect the strings to translate
     /** @type {angular.gettext.gettextCatalog} */
     const gettextCatalog = $injector.get('gettextCatalog');

contribs/gmf/apps/desktop_alt/index.html.ejs

@@ -253,7 +253,8 @@
           gmf-search-coordinatesprojections="::mainCtrl.searchCoordinatesProjections"
           gmf-search-colorchooser="::true"
           gmf-search-delay="mainCtrl.searchDelay"
-          gmf-search-clearbutton="::true">
+          gmf-search-clearbutton="::true"
+          gmf-search-styles="::mainCtrl.searchStyles">
         </gmf-search>
         <ngeo-displaywindow
           content="mainCtrl.displaywindowContent"

contribs/gmf/src/print/component.js

@@ -724,12 +724,7 @@ class Controller {
 
     this.updateCustomFields_();
 
-    const legend = this.isAttributeInCurrentLayout_('legend');
-    if (this.layoutInfo.legend === undefined) {
-      this.layoutInfo.legend = !!(legend !== undefined ?
-        legend : this.fieldValues['legend']);
-    }
-
+    this.layoutInfo.legend = this.fieldValues['legend'] !== false;
     this.layoutInfo.scales = clientInfo['scales'] || [];
     this.layoutInfo.dpis = clientInfo['dpiSuggestions'] || [];
 

contribs/gmf/src/query/windowComponent.html

@@ -1,23 +1,24 @@
 <div
   class="gmf-displayquerywindow"
   ng-class="{'desktop': ctrl.desktop, 'mobile': !ctrl.desktop}"
-  ng-show="ctrl.open"
-  ngeo-swipe-up="ctrl.collapsed = false"
-  ngeo-swipe-down="ctrl.collapsed = true"
-  ngeo-swipe-disable-mouse
-  ng-swipe-disable-mouse
-  ng-swipe-left="ctrl.next()"
-  ng-swipe-right="ctrl.previous()">
+  ng-show="ctrl.open">
 
   <button
     class="collapse-button"
     type="button"
     ng-show="::!ctrl.desktop"
+    ngeo-swipe-up="ctrl.collapsed = false"
+    ngeo-swipe-down="ctrl.collapsed = true"
+    ngeo-swipe-disable-mouse
     ng-click="ctrl.collapsed = !ctrl.collapsed"
     ng-class="[ctrl.collapsed ? 'collapse-button-up' : 'collapse-button-down']">
   </button>
 
-  <div class="windowcontainer">
+  <div
+  class="windowcontainer"
+  ng-swipe-disable-mouse
+  ng-swipe-left="ctrl.next()"
+  ng-swipe-right="ctrl.previous()">
 
     <button
       type="button"

docs/developer-guide.md

@@ -66,30 +66,32 @@ fdescribe('...', function() {
 Checkout the latest version
 
 ```
-git checkout master
+git checkout <release-branch>
 git fetch origin
-git reset --hard origin/master
+git reset --hard origin/<release-branche>
 ```
 
-Create a tag named the same as the version.
+Where `<release-branch>` stand for `2.x`.
+
+Verify that the `<version>` (`2.x.x`) in package.json match with the tag you'll
+create. Then create a tag named the same as the version.
 ```
 git tag <version>
 git push origin <version>
 ```
 
 Travis will create a new package on npm.
 
-
 If you create a new release, bump version in the package.json file:
 ```
 git checkout -b bump
 vi package.json
 git add package.json
-git commit -m "Bump version to 2.4.x+1"
+git commit -m "Bump version to <version + 1>"
 git push origin bump
 ```
 
-Do the pull request
+Do the pull request on branch `<release-branche>`
 
 ## Create a new stabilisation branch
 

src/misc/WMSTime.js

@@ -47,13 +47,15 @@ export class WMSTime extends Time {
     let yearResolution = 'yyyy';
     let monthResolution = 'yyyy-MM';
     let dayResolution = 'yyyy-MM-dd';
+    let secondResolution = undefined;
 
     // Localized format.
     if (!opt_useISOFormat) {
       const gettextCatalog = this.gettextCatalog_;
       yearResolution = gettextCatalog.getString('yyyy');
       monthResolution = gettextCatalog.getString('M/yyyy');
       dayResolution = gettextCatalog.getString('M/d/yyyy');
+      secondResolution = gettextCatalog.getString('M/d/yyyy HH:MM:ss');
     }
 
     switch (resolution) {
@@ -63,10 +65,17 @@ export class WMSTime extends Time {
         return this.$filter_('date')(date, monthResolution, utc);
       case 'day':
         return this.$filter_('date')(date, dayResolution, utc);
+      case 'second':
+        if (secondResolution) {
+          return this.$filter_('date')(date, secondResolution, utc);
+        } else {
+          return date.toISOString().replace(/\.\d{3}/, '');
+        }
       default:
         //case "second":
         return date.toISOString().replace(/\.\d{3}/, '');
     }
+
   }