Skip to content

Commit abd40ab

Browse files
authored
Merge pull request #1554 from swisstopo/bugfix/viewer-1531-targetpoint-zoom-auf-gesamte-schweiz
Bug: Aktivierung des Targetpoints zoom auf die gesamte Schweiz
2 parents c83ddcf + bad6372 commit abd40ab

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,24 @@ import { customElement, property, state } from 'lit/decorators.js';
33
import { html } from 'lit';
44
import draggable from './draggable';
55
import { DEFAULT_VIEW } from '../constants';
6-
import { ConstantPositionProperty, Event, Scene, Viewer } from 'cesium';
76
import {
87
ArcType,
98
CallbackProperty,
109
Cartesian3,
1110
Cartographic,
1211
Color,
12+
ConstantPositionProperty,
1313
CustomDataSource,
1414
Entity,
15+
Event,
1516
JulianDate,
1617
KeyboardEventModifier,
1718
Matrix4,
1819
PolylineCollection,
19-
Transforms,
20+
Scene,
2021
ScreenSpaceEventHandler,
2122
ScreenSpaceEventType,
23+
Viewer,
2224
} from 'cesium';
2325
import type { Interactable } from '@interactjs/types';
2426
import { classMap } from 'lit/directives/class-map.js';
@@ -265,22 +267,17 @@ export class NgmNavTools extends LitElementI18n {
265267
showSnackbarError(i18next.t('nav_tools_out_glob_warn'));
266268
return;
267269
}
268-
this.addTargetPoint(position, true);
270+
this.addTargetPoint(position);
269271
}
270272
syncTargetParam(position && Cartographic.fromCartesian(position));
271273
NavToolsStore.setTargetPointPosition(position);
272274
this.toggleAxis(position);
273275
}
274276

275-
addTargetPoint(center: Cartesian3, lookAtTransform = false) {
277+
addTargetPoint(center: Cartesian3) {
276278
this.showTargetPoint = true;
277279
this.refIcon.position = new ConstantPositionProperty(center);
278-
const cam = this.viewer!.camera;
279280
this.refIcon.show = true;
280-
if (lookAtTransform) {
281-
const transform = Transforms.eastNorthUpToFixedFrame(center);
282-
cam.lookAtTransform(transform);
283-
}
284281
document.addEventListener('keydown', this.ctrlListener);
285282
}
286283

@@ -325,8 +322,6 @@ export class NgmNavTools extends LitElementI18n {
325322
this.addTargetPoint(center);
326323
const camera = this.viewer!.camera;
327324
lookAtPoint(center, camera);
328-
const transform = Transforms.eastNorthUpToFixedFrame(center);
329-
camera.lookAtTransform(transform);
330325
this.toggleAxis(center);
331326

332327
this.viewer!.scene.screenSpaceCameraController.enableInputs = true;

0 commit comments

Comments
 (0)