Skip to content

Commit 4f66633

Browse files
committed
Fix tilt-zooming not correctly respecting a custom min-zoom-distance
1 parent c274797 commit 4f66633

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

common/webapp/src/js/controls/map/mouse/MouseAngleControls.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,12 @@ export class MouseAngleControls {
8787

8888
this.manager.angle += this.deltaAngle * smoothing * this.speed * this.pixelToSpeedMultiplierY;
8989

90-
if (this.dynamicDistance) {
91-
this.manager.distance = softSet(this.manager.distance, Math.min(MapControls.getMaxDistanceForPerspectiveAngle(this.manager.angle), this.startDistance), 0.4);
90+
if (this.dynamicDistance && this.manager.distance > this.manager.controls.minDistance) {
91+
let targetDistance = this.startDistance
92+
targetDistance = Math.min(targetDistance, MapControls.getMaxDistanceForPerspectiveAngle(this.manager.angle));
93+
targetDistance = Math.max(targetDistance, this.manager.controls.minDistance);
94+
this.manager.distance = softSet(this.manager.distance, targetDistance, 0.4);
95+
this.manager.angle = softMax(this.manager.angle, MapControls.getMaxPerspectiveAngleForDistance(targetDistance), 0.8);
9296
} else {
9397
this.manager.angle = softMax(this.manager.angle, MapControls.getMaxPerspectiveAngleForDistance(this.manager.distance), 0.8);
9498
}

0 commit comments

Comments
 (0)