Update from base branch

From the artifact of the previous workflow run
camptocamp · Jan 1, 2025 · 2b3527b · 2b3527b
1 parent f7f6328
commit 2b3527b
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 6 deletions.
diff --git a/geoportal/geomapfish_geoportal/static/cog.html b/geoportal/geomapfish_geoportal/static/cog.html
@@ -7,7 +7,7 @@
     <title>Test swissalti3d COG</title>
     <link
       crossorigin="anonymous"
-      href="https://cdn.jsdelivr.net/npm/ol@10.2.1/ol.css"
+      href="https://cdn.jsdelivr.net/npm/ol@10.3.1/ol.css"
       integrity="sha384-Jpg1uvTciFJuHq+90Ly0/2SKRT9yS5OhbIN5FuFoFWji9fc44ok8xxO88CJi8Z5W"
       referrerpolicy="no-referrer"
       rel="stylesheet"
@@ -27,9 +27,9 @@
     <div id="map"></div>
     <script
       crossorigin="anonymous"
-      integrity="sha384-2biaJbygszOKXKsLbF+auMBrB377U1RJUvQIsPmEOtUSKzkcsTOZSykhqnkmx2QU"
+      integrity="sha384-GtOM9G1JWFKmDbfOLBrez9YebIrX1pqVVtYukhqrKOtyneLNxnTIFMe8ER850GT/"
       referrerpolicy="no-referrer"
-      src="https://cdn.jsdelivr.net/npm/ol@10.2.1/dist/ol.js"
+      src="https://cdn.jsdelivr.net/npm/ol@10.3.1/dist/ol.js"
     ></script>
     <script
       crossorigin="anonymous"

diff --git a/qgisserver/project.qgs b/qgisserver/project.qgs
@@ -3412,6 +3412,7 @@ def my_form_open(dialog, layer, feature):
       </wgs84extent>
       <id>landuse_7fa0e9e8_a78c_4702_acc7_937cb583ed13</id>
       <datasource>service='demo' sslmode=require key='fid' srid=2056 type=Polygon checkPrimaryKeyUnicity='1' table="geodata"."osm_landuse" (geom)</datasource>
+      <title wfs="">Landuse test</title>
       <keywordList>
         <value></value>
       </keywordList>

diff --git a/tilegeneration/config.yaml.tmpl b/tilegeneration/config.yaml.tmpl
@@ -144,9 +144,9 @@ ${DISABLE_LOCAL}  admin_path: tiles/admin
 
 process:
   optipng_test:
-    - cmd: optipng -o7 -simulate %(in)s
+    - cmd: optipng -fix -o7 -simulate %(in)s
   optipng:
-    - cmd: optipng %(args)s -zc9 -zm8 -zs3 -f5 %(in)s
+    - cmd: optipng %(args)s -fix -zc9 -zm8 -zs3 -f5 %(in)s
       arg:
         default: '-q'
         quiet: '-q'

diff --git a/ui/desktop.html b/ui/desktop.html
@@ -342,7 +342,7 @@
 
       <!-- Selection -->
       <gmf-selection-button slot="tool-button"></gmf-selection-button>
-      <div slot="tool-panel-query" class="row">
+      <div slot="tool-panel-selection" class="row">
         <div class="col-sm-12">
           <div class="gmf-app-tools-content-heading">{{'Selection' | translate}}</div>
           <ngeo-query-panel></ngeo-query-panel>
@@ -441,6 +441,9 @@
         gmf-map-map="mainCtrl.map"
         gmf-map-manage-resize="mainCtrl.manageResize"
         gmf-map-resize-transition="mainCtrl.resizeTransition"
+        gmf-contextualdata=""
+        gmf-contextualdata-display="mainCtrl.contextualdataActive"
+        gmf-contextualdata-map="::mainCtrl.map"
       >
       </gmf-map>
       <ngeo-query

diff --git a/ui/src/interfaces/ControllerDesktop.ts b/ui/src/interfaces/ControllerDesktop.ts
@@ -39,6 +39,7 @@ import ngeoStreetviewModule from 'ngeo/streetview/module';
 import ngeoRoutingModule from 'ngeo/routing/module';
 import ngeoStatemanagerWfsPermalink from 'ngeo/statemanager/WfsPermalink';
 import '../webcomponents/index';
+import contextualDataHtmlTemplate from './contextualdata.html';
 
 /**
  * @private
@@ -76,6 +77,20 @@ const geomapfishModule = angular.module('Desktop', [
   ngeoStatemanagerWfsPermalink.name,
 ]);
 
+geomapfishModule.value('gmfContextualdatacontentTemplateUrl', 'gmf/contextualdata');
+geomapfishModule.run(
+  /**
+   * @param {angular.ITemplateCacheService} $templateCache
+   */
+  [
+    '$templateCache',
+    ($templateCache) => {
+      // @ts-ignore: webpack
+      $templateCache.put('gmf/contextualdata', contextualDataHtmlTemplate);
+    },
+  ],
+);
+
 geomapfishModule.controller('DesktopController', Controller);
 
 export default geomapfishModule;
diff --git a/ui/src/interfaces/contextualdata.html.js b/ui/src/interfaces/contextualdata.html.js
@@ -0,0 +1,31 @@
+export default `<table>
+  <tr>
+    <td translate>Swiss grid (LV95)</td>
+    <td>{{coord_2056|ngeoNumberCoordinates:0:'{x} / {y}'}}</td>
+  </tr>
+  <tr>
+    <td translate>Swiss grid (LV03)</td>
+    <td>{{coord_21781|ngeoNumberCoordinates:0:'{x} / {y}'}}</td>
+  </tr>
+  <tr>
+    <td translate>Wgs Coord.</td>
+    <td>{{coord_4326|ngeoNumberCoordinates:2:'{y} / {x}'}}</td>
+  </tr>
+  <tr>
+    <td translate>Wgs Coord. DMS</td>
+    <td>{{coord_4326|ngeoDMSCoordinates:0:'{y} {x}'}}</td>
+  </tr>
+  <tr>
+    <td translate>Elevation (SRTM)</td>
+    <td ng-if="srtm">{{srtm | number}} [m]</td>
+  </tr>
+  <tr>
+    <td translate>Elevation (Aster)</td>
+    <td ng-if="aster">{{aster | number}} [m]</td>
+  </tr>
+</table>
+<a
+  ng-href="https://maps.google.ch/?ie=UTF8&ll={{coord_4326_northern}},{{coord_4326_eastern}}&layer=c&cbll={{coord_4326_northern}},{{coord_4326_eastern}}&cbp=12,57.78,,0,8.1"
+  target="_blank"
+  >Google StreetView</a
+>`;