From ba7427b4acf116aca7451ad3a6067dc234d3fa70 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 1 Mar 2019 09:58:58 +0200 Subject: [core] Transform{State}: s/angle/bearing/ --- test/map/map.test.cpp | 20 ++++++++++---------- test/map/transform.test.cpp | 22 +++++++++++----------- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'test/map') diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index da3abfcb24..1b64e48614 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -64,7 +64,7 @@ TEST(Map, RendererState) { double bearingInDegrees = 30.0; test.map.getStyle().loadJSON(util::read_file("test/fixtures/api/empty.json")); - test.map.jumpTo(CameraOptions().withCenter(coordinate).withZoom(zoom).withPitch(pitchInDegrees).withAngle(bearingInDegrees)); + test.map.jumpTo(CameraOptions().withCenter(coordinate).withZoom(zoom).withPitch(pitchInDegrees).withBearing(bearingInDegrees)); test.runLoop.runOnce(); test.frontend.render(test.map); @@ -75,7 +75,7 @@ TEST(Map, RendererState) { EXPECT_NEAR(options.center->longitude(), coordinate.longitude(), 1e-7); ASSERT_DOUBLE_EQ(*options.zoom, zoom); ASSERT_DOUBLE_EQ(*options.pitch, pitchInDegrees); - EXPECT_NEAR(*options.angle, bearingInDegrees, 1e-7); + EXPECT_NEAR(*options.bearing, bearingInDegrees, 1e-7); { const LatLng& latLng = test.frontend.latLngForPixel(ScreenCoordinate { 0, 0 }); @@ -148,7 +148,7 @@ TEST(Map, LatLngBoundsToCamera) { EXPECT_NEAR(*virtualCamera.zoom, 1.55467, 1e-5); } -TEST(Map, LatLngBoundsToCameraWithAngle) { +TEST(Map, LatLngBoundsToCameraWithBearing) { MapTest<> test; test.map.jumpTo(CameraOptions().withCenter(LatLng { 40.712730, -74.005953 }).withZoom(16.0)); @@ -158,10 +158,10 @@ TEST(Map, LatLngBoundsToCameraWithAngle) { CameraOptions virtualCamera = test.map.cameraForLatLngBounds(bounds, {}, 35.0); ASSERT_TRUE(bounds.contains(*virtualCamera.center)); EXPECT_NEAR(*virtualCamera.zoom, 1.21385, 1e-5); - EXPECT_NEAR(virtualCamera.angle.value_or(0), 35.0, 1e-5); + EXPECT_NEAR(virtualCamera.bearing.value_or(0), 35.0, 1e-5); } -TEST(Map, LatLngBoundsToCameraWithAngleAndPitch) { +TEST(Map, LatLngBoundsToCameraWithBearingAndPitch) { MapTest<> test; test.map.jumpTo(CameraOptions().withCenter(LatLng { 40.712730, -74.005953 }).withZoom(16.0)); @@ -172,7 +172,7 @@ TEST(Map, LatLngBoundsToCameraWithAngleAndPitch) { ASSERT_TRUE(bounds.contains(*virtualCamera.center)); EXPECT_NEAR(*virtualCamera.zoom, 13.66272, 1e-5); ASSERT_DOUBLE_EQ(*virtualCamera.pitch, 20.0); - EXPECT_NEAR(virtualCamera.angle.value_or(0), 35.0, 1e-5); + EXPECT_NEAR(virtualCamera.bearing.value_or(0), 35.0, 1e-5); } TEST(Map, LatLngsToCamera) { @@ -181,19 +181,19 @@ TEST(Map, LatLngsToCamera) { std::vector latLngs{{ 40.712730, 74.005953 }, {15.68169,73.499857}, {30.82678, 83.4082}}; CameraOptions virtualCamera = test.map.cameraForLatLngs(latLngs, {}, 23.0); - EXPECT_NEAR(virtualCamera.angle.value_or(0), 23.0, 1e-5); + EXPECT_NEAR(virtualCamera.bearing.value_or(0), 23.0, 1e-5); EXPECT_NEAR(virtualCamera.zoom.value_or(0), 2.75434, 1e-5); EXPECT_NEAR(virtualCamera.center->latitude(), 28.49288, 1e-5); EXPECT_NEAR(virtualCamera.center->longitude(), 74.97437, 1e-5); } -TEST(Map, LatLngsToCameraWithAngleAndPitch) { +TEST(Map, LatLngsToCameraWithBearingAndPitch) { MapTest<> test; std::vector latLngs{{ 40.712730, 74.005953 }, {15.68169,73.499857}, {30.82678, 83.4082}}; CameraOptions virtualCamera = test.map.cameraForLatLngs(latLngs, {}, 23, 20); - EXPECT_NEAR(virtualCamera.angle.value_or(0), 23.0, 1e-5); + EXPECT_NEAR(virtualCamera.bearing.value_or(0), 23.0, 1e-5); EXPECT_NEAR(virtualCamera.zoom.value_or(0), 3.04378, 1e-5); EXPECT_NEAR(virtualCamera.center->latitude(), 28.53718, 1e-5); EXPECT_NEAR(virtualCamera.center->longitude(), 74.31746, 1e-5); @@ -256,7 +256,7 @@ TEST(Map, SetStyleDefaultCamera) { CameraOptions camera = test.map.getCameraOptions(); EXPECT_DOUBLE_EQ(*camera.zoom, 0.0); EXPECT_DOUBLE_EQ(*camera.pitch, 0.0); - EXPECT_DOUBLE_EQ(*camera.angle, 0.0); + EXPECT_DOUBLE_EQ(*camera.bearing, 0.0); EXPECT_EQ(*camera.center, LatLng {}); test.map.getStyle().loadJSON(util::read_file("test/fixtures/api/empty-zoomed.json")); diff --git a/test/map/transform.test.cpp b/test/map/transform.test.cpp index 85f92ae52c..540761212a 100644 --- a/test/map/transform.test.cpp +++ b/test/map/transform.test.cpp @@ -61,19 +61,19 @@ TEST(Transform, InvalidBearing) { ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude()); ASSERT_DOUBLE_EQ(0, transform.getZoom()); - transform.jumpTo(CameraOptions().withZoom(1.0).withAngle(2.0)); + transform.jumpTo(CameraOptions().withZoom(1.0).withBearing(2.0)); ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude()); ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude()); ASSERT_DOUBLE_EQ(1, transform.getZoom()); - ASSERT_NEAR(-2.0 * util::DEG2RAD, transform.getAngle(), 1e-15); + ASSERT_NEAR(-2.0 * util::DEG2RAD, transform.getBearing(), 1e-15); const double invalid = NAN; - transform.jumpTo(CameraOptions().withAngle(invalid)); + transform.jumpTo(CameraOptions().withBearing(invalid)); ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude()); ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude()); ASSERT_DOUBLE_EQ(1, transform.getZoom()); - ASSERT_NEAR(-2.0 * util::DEG2RAD, transform.getAngle(), 1e-15); + ASSERT_NEAR(-2.0 * util::DEG2RAD, transform.getBearing(), 1e-15); } TEST(Transform, IntegerZoom) { @@ -196,7 +196,7 @@ TEST(Transform, Anchor) { ASSERT_DOUBLE_EQ(latLng.latitude(), transform.getLatLng().latitude()); ASSERT_DOUBLE_EQ(latLng.longitude(), transform.getLatLng().longitude()); ASSERT_DOUBLE_EQ(10, transform.getZoom()); - ASSERT_DOUBLE_EQ(0, transform.getAngle()); + ASSERT_DOUBLE_EQ(0, transform.getBearing()); const LatLng anchorLatLng = transform.getState().screenCoordinateToLatLng(anchorPoint); ASSERT_NE(latLng.latitude(), anchorLatLng.latitude()); @@ -247,18 +247,18 @@ TEST(Transform, Anchor) { ASSERT_NE(latLng.latitude(), transform.getLatLng().latitude()); ASSERT_NE(latLng.longitude(), transform.getLatLng().longitude()); - transform.jumpTo(CameraOptions().withCenter(latLng).withZoom(10.0).withAngle(-45.0)); - ASSERT_NEAR(M_PI_4, transform.getAngle(), 0.000001); + transform.jumpTo(CameraOptions().withCenter(latLng).withZoom(10.0).withBearing(-45.0)); + ASSERT_NEAR(M_PI_4, transform.getBearing(), 0.000001); ASSERT_DOUBLE_EQ(latLng.latitude(), transform.getLatLng().latitude()); ASSERT_DOUBLE_EQ(latLng.longitude(), transform.getLatLng().longitude()); - transform.jumpTo(CameraOptions().withAngle(0.0)); - ASSERT_DOUBLE_EQ(0, transform.getAngle()); + transform.jumpTo(CameraOptions().withBearing(0.0)); + ASSERT_DOUBLE_EQ(0, transform.getBearing()); ASSERT_DOUBLE_EQ(latLng.latitude(), transform.getLatLng().latitude()); ASSERT_DOUBLE_EQ(latLng.longitude(), transform.getLatLng().longitude()); - transform.jumpTo(CameraOptions().withAngle(45.0).withAnchor(anchorPoint)); - ASSERT_NEAR(-45.0 * util::DEG2RAD, transform.getAngle(), 0.000001); + transform.jumpTo(CameraOptions().withBearing(45.0).withAnchor(anchorPoint)); + ASSERT_NEAR(-45.0 * util::DEG2RAD, transform.getBearing(), 0.000001); ASSERT_NEAR(anchorLatLng.latitude(), transform.getLatLng().latitude(), 1); ASSERT_NEAR(anchorLatLng.longitude(), transform.getLatLng().longitude(), 1); -- cgit v1.2.1