Merge pull request #1565 from swisstopo/develop

Release Candidate 1.1.0

Author: daniel-va

ui/locales/app.de.json

@@ -190,7 +190,7 @@
   "lyr_voxel_geneva_logk_label": "Genf: Hydraulische Leitfähigkeit",
   "lyr_voxel_visp_litho_label": "Visp: Modelliereinheit",
   "lyr_voxel_visp_logk_label": "Visp: Hydraulische Leitfähigkeit",
-  "lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal - Durchlässigkeit",
+  "lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal: Durchlässigkeit",
   "lyr_water_tunnel_label": "Unterirdische Wassertunnel",
   "map_elevation_label": "Höhe (m ü. M.)",
   "map_position_label": "Position",

ui/locales/app.en.json

@@ -190,7 +190,7 @@
   "lyr_voxel_geneva_logk_label": "Geneva: Hydraulic conductivity",
   "lyr_voxel_visp_litho_label": "Visp: Modelling Unit",
   "lyr_voxel_visp_logk_label": "Visp: Hydraulic conductivity",
-  "lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal - Permeability ",
+  "lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal: Permeability ",
   "lyr_water_tunnel_label": "Underground water tunnel",
   "map_elevation_label": "Elevation (m AMSL)",
   "map_position_label": "Position",

ui/locales/app.fr.json

@@ -190,7 +190,7 @@
   "lyr_voxel_geneva_logk_label": "Genève: Conductivité hydraulique",
   "lyr_voxel_visp_litho_label": "Visp: Lithologie",
   "lyr_voxel_visp_logk_label": "Visp: Conductivité hydraulique",
-  "lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal - Perméabilité",
+  "lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal: Perméabilité",
   "lyr_water_tunnel_label": "Tunnel d'eau souterrain",
   "map_elevation_label": "Altitude (m AMSL)",
   "map_position_label": "Position",

ui/locales/app.it.json

@@ -189,7 +189,7 @@
   "lyr_voxel_geneva_logk_label": "Ginevra: Conducibilità idraulica",
   "lyr_voxel_visp_litho_label": "Visp: Litologia",
   "lyr_voxel_visp_logk_label": "Visp: Conducibilità idraulica",
-  "lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal - Permeabilità",
+  "lyr_voxel_rheintal_klasse_label": "St.Galler Rheintal: Permeabilità",
   "lyr_water_tunnel_label": "Condotta idrica sotterranea",
   "map_elevation_label": "Altitudine (m AMSL)",
   "map_position_label": "Positione",

ui/src/elements/ngm-nav-tools.ts

@@ -3,22 +3,24 @@ import { customElement, property, state } from 'lit/decorators.js';
 import { html } from 'lit';
 import draggable from './draggable';
 import { DEFAULT_VIEW } from '../constants';
-import { ConstantPositionProperty, Event, Scene, Viewer } from 'cesium';
 import {
   ArcType,
   CallbackProperty,
   Cartesian3,
   Cartographic,
   Color,
+  ConstantPositionProperty,
   CustomDataSource,
   Entity,
+  Event,
   JulianDate,
   KeyboardEventModifier,
   Matrix4,
   PolylineCollection,
-  Transforms,
+  Scene,
   ScreenSpaceEventHandler,
   ScreenSpaceEventType,
+  Viewer,
 } from 'cesium';
 import type { Interactable } from '@interactjs/types';
 import { classMap } from 'lit/directives/class-map.js';
@@ -265,22 +267,17 @@ export class NgmNavTools extends LitElementI18n {
         showSnackbarError(i18next.t('nav_tools_out_glob_warn'));
         return;
       }
-      this.addTargetPoint(position, true);
+      this.addTargetPoint(position);
     }
     syncTargetParam(position && Cartographic.fromCartesian(position));
     NavToolsStore.setTargetPointPosition(position);
     this.toggleAxis(position);
   }
 
-  addTargetPoint(center: Cartesian3, lookAtTransform = false) {
+  addTargetPoint(center: Cartesian3) {
     this.showTargetPoint = true;
     this.refIcon.position = new ConstantPositionProperty(center);
-    const cam = this.viewer!.camera;
     this.refIcon.show = true;
-    if (lookAtTransform) {
-      const transform = Transforms.eastNorthUpToFixedFrame(center);
-      cam.lookAtTransform(transform);
-    }
     document.addEventListener('keydown', this.ctrlListener);
   }
 
@@ -325,8 +322,6 @@ export class NgmNavTools extends LitElementI18n {
     this.addTargetPoint(center);
     const camera = this.viewer!.camera;
     lookAtPoint(center, camera);
-    const transform = Transforms.eastNorthUpToFixedFrame(center);
-    camera.lookAtTransform(transform);
     this.toggleAxis(center);
 
     this.viewer!.scene.screenSpaceCameraController.enableInputs = true;
@@ -445,17 +440,21 @@ export class NgmNavTools extends LitElementI18n {
           })}"
           @click=${() => this.dispatchEvent(new CustomEvent('togglecamconfig'))}
         ></div>
-        <div
-          title="${i18next.t('nav_target_point')}"
-          class="ngm-coords-icon ${classMap({
-            'ngm-active-icon': this.showTargetPoint,
-            'ngm-disabled':
-              this.lockType !== '' && this.lockType !== 'elevation',
-          })}"
-          @click=${() => this.toggleReference()}
-        ></div>
       </div>
       ${dragArea}
     `;
   }
+
+  // TODO Fix the target point tool and then add this icon back to the toolbar.
+  /*
+  <div
+    title="${i18next.t('nav_target_point')}"
+    class="ngm-coords-icon ${classMap({
+      'ngm-active-icon': this.showTargetPoint,
+      'ngm-disabled':
+        this.lockType !== '' && this.lockType !== 'elevation',
+    })}"
+    @click=${() => this.toggleReference()}
+  ></div>
+   */
 }