tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow constraining camera to maximum bounds (#2475)

Browse Source
This commit is contained in:
Christian Hansen
2025-01-09 13:38:35 +01:00
committed by GitHub
parent f582327191
commit 62b92e2038
10 changed files with 314 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
test/map/transform.test.cpp
View File

@@ -611,6 +611,26 @@ TEST(Transform, DefaultTransform) {
point = state.latLngToScreenCoordinate(nullIsland);
ASSERT_DOUBLE_EQ(point.x, center.x);
ASSERT_DOUBLE_EQ(point.y, center.y);
// Constrain to screen while resizing
transform.resize({1000, 500});
transform.setLatLngBounds(LatLngBounds::hull({40.0, -10.0}, {70.0, 40.0}));
transform.setConstrainMode(ConstrainMode::Screen);
// Request impossible zoom
AnimationOptions easeOptions(Seconds(1));
transform.easeTo(CameraOptions().withCenter(LatLng{56, 11}).withZoom(1), easeOptions);
ASSERT_TRUE(transform.inTransition());
transform.updateTransitions(transform.getTransitionStart() + Milliseconds(250));
// Rotate the screen during a transition (resize it)
transform.resize({500, 1000});
// The resize while constraining to screen should have stopped the transition and updated the state
ASSERT_FALSE(transform.inTransition());
ASSERT_NEAR(transform.getLatLng().longitude(), 8.22103, 1e-4);
ASSERT_NEAR(transform.getLatLng().latitude(), 46.6905, 1e-4);
ASSERT_NEAR(transform.getState().getScale(), 38.1529, 1e-4);
}
TEST(Transform, LatLngBounds) {
@@ -803,6 +823,60 @@ TEST(Transform, LatLngBounds) {
ASSERT_DOUBLE_EQ(transform.getLatLng().longitude(), 120.0);
}
TEST(Transform, ConstrainScreenToBounds) {
Transform transform;
transform.resize({500, 500});
transform.setLatLngBounds(LatLngBounds::hull({40.0, -10.0}, {70.0, 40.0}));
transform.setConstrainMode(ConstrainMode::Screen);
// Request impossible zoom
transform.easeTo(CameraOptions().withCenter(LatLng{56, 11}).withZoom(1));
ASSERT_NEAR(transform.getZoom(), 2.81378, 1e-4);
// Request impossible center left
transform.easeTo(CameraOptions().withCenter(LatLng{56, -65}).withZoom(4));
ASSERT_NEAR(transform.getLatLng().longitude(), 0.98632, 1e-4);
ASSERT_NEAR(transform.getLatLng().latitude(), 56.0, 1e-4);
// Request impossible center top
transform.easeTo(CameraOptions().withCenter(LatLng{80, 11}).withZoom(4));
ASSERT_NEAR(transform.getLatLng().longitude(), 11.0, 1e-4);
ASSERT_NEAR(transform.getLatLng().latitude(), 65.88603, 1e-4);
// Request impossible center right
transform.easeTo(CameraOptions().withCenter(LatLng{56, 50}).withZoom(4));
ASSERT_NEAR(transform.getLatLng().longitude(), 29.01367, 1e-4);
ASSERT_NEAR(transform.getLatLng().latitude(), 56.0, 1e-4);
// Request impossible center bottom
transform.easeTo(CameraOptions().withCenter(LatLng{30, 11}).withZoom(4));
ASSERT_NEAR(transform.getLatLng().longitude(), 11.0, 1e-4);
ASSERT_NEAR(transform.getLatLng().latitude(), 47.89217, 1e-4);
// Request impossible center with anchor
transform.easeTo(CameraOptions().withAnchor(ScreenCoordinate{250, 250}).withCenter(LatLng{56, -65}).withZoom(4));
ASSERT_NEAR(transform.getLatLng().longitude(), 0.98632, 1e-4);
ASSERT_NEAR(transform.getLatLng().latitude(), 56.0, 1e-4);
// Request impossible center (anchor)
transform.easeTo(CameraOptions().withAnchor(ScreenCoordinate{250, 250}).withZoom(4));
ASSERT_NEAR(transform.getLatLng().longitude(), 0.98632, 1e-4);
ASSERT_NEAR(transform.getLatLng().latitude(), 56.0, 1e-4);
// Fly to impossible center
transform.flyTo(CameraOptions().withCenter(LatLng{56, -65}).withZoom(4));
ASSERT_NEAR(transform.getZoom(), 4.0, 1e-4);
ASSERT_NEAR(transform.getLatLng().longitude(), 0.98632, 1e-4);
ASSERT_NEAR(transform.getLatLng().latitude(), 56.0, 1e-4);
// Fly to impossible center and zoom
transform.flyTo(CameraOptions().withCenter(LatLng{56, -65}).withZoom(2));
ASSERT_NEAR(transform.getZoom(), 4.0, 1e-4);
ASSERT_NEAR(transform.getLatLng().longitude(), 0.98632, 1e-4);
ASSERT_NEAR(transform.getLatLng().latitude(), 56.0, 1e-4);
}
TEST(Transform, InvalidPitch) {
Transform transform;
transform.resize({1, 1});