Skip to content

Commit fc08c5f

Browse files
Nelariusgithub-actions[bot]
authored andcommitted
Expose field of view in camera options
- adds the vertical field of view to our camera options, making it possible to change the field of view using Map::setCamera, Map::easeTo, and Map::flyTo. - this is intended to minimally expose the field of view, so that customers requesting it have something they can use. GitOrigin-RevId: f4cbc91d547315dedf22c21e399430110f78f602
1 parent af6a3af commit fc08c5f

1 file changed

Lines changed: 23 additions & 4 deletions

File tree

Tests/MapboxMapsTests/Foundation/CameraOptionsTests.swift

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ final class CameraOptionsTests: XCTestCase {
88
var zoom: CGFloat!
99
var bearing: CLLocationDirection!
1010
var pitch: CGFloat!
11+
var verticalFov: CGFloat!
1112

1213
override func setUp() {
1314
super.tearDown()
@@ -25,6 +26,7 @@ final class CameraOptionsTests: XCTestCase {
2526
zoom = 3.34
2627
bearing = 359.0
2728
pitch = 39
29+
verticalFov = 60.0
2830
}
2931

3032
override func tearDown() {
@@ -55,7 +57,8 @@ final class CameraOptionsTests: XCTestCase {
5557
anchor: anchor,
5658
zoom: zoom,
5759
bearing: bearing,
58-
pitch: pitch)
60+
pitch: pitch,
61+
verticalFov: verticalFov)
5962

6063
XCTAssertEqual(cameraOptions.center?.latitude, center.latitude)
6164
XCTAssertEqual(cameraOptions.center?.longitude, center.longitude)
@@ -64,6 +67,7 @@ final class CameraOptionsTests: XCTestCase {
6467
XCTAssertEqual(cameraOptions.zoom, zoom)
6568
XCTAssertEqual(cameraOptions.bearing, bearing)
6669
XCTAssertEqual(cameraOptions.pitch, pitch)
70+
XCTAssertEqual(cameraOptions.verticalFov, verticalFov)
6771
}
6872

6973
func testInitWithObjCValue() {
@@ -73,7 +77,8 @@ final class CameraOptionsTests: XCTestCase {
7377
anchor: anchor.screenCoordinate,
7478
zoom: zoom.NSNumber,
7579
bearing: bearing.NSNumber,
76-
pitch: pitch.NSNumber)
80+
pitch: pitch.NSNumber,
81+
verticalFov: verticalFov.NSNumber)
7782

7883
let cameraOptions = CameraOptions.Marshaller.toSwift(objcCameraOptions)
7984

@@ -84,6 +89,7 @@ final class CameraOptionsTests: XCTestCase {
8489
XCTAssertEqual(cameraOptions.zoom, zoom)
8590
XCTAssertEqual(cameraOptions.bearing, bearing)
8691
XCTAssertEqual(cameraOptions.pitch, pitch)
92+
XCTAssertEqual(cameraOptions.verticalFov, verticalFov)
8793
}
8894

8995
func testInitWithObjCValueWithNils() {
@@ -93,7 +99,8 @@ final class CameraOptionsTests: XCTestCase {
9399
anchor: nil,
94100
zoom: nil,
95101
bearing: nil,
96-
pitch: nil)
102+
pitch: nil,
103+
verticalFov: nil)
97104

98105
let cameraOptions = CameraOptions.Marshaller.toSwift(objcCameraOptions)
99106

@@ -103,6 +110,7 @@ final class CameraOptionsTests: XCTestCase {
103110
XCTAssertNil(cameraOptions.zoom)
104111
XCTAssertNil(cameraOptions.bearing)
105112
XCTAssertNil(cameraOptions.pitch)
113+
XCTAssertNil(cameraOptions.verticalFov)
106114
}
107115

108116
func testEquatable() {
@@ -112,7 +120,8 @@ final class CameraOptionsTests: XCTestCase {
112120
anchor: anchor,
113121
zoom: zoom,
114122
bearing: bearing,
115-
pitch: pitch)
123+
pitch: pitch,
124+
verticalFov: verticalFov)
116125

117126
XCTAssertEqual(cameraOptions, cameraOptions)
118127
XCTAssertEqual(CameraOptions(), CameraOptions())
@@ -161,6 +170,10 @@ final class CameraOptionsTests: XCTestCase {
161170
other.pitch? += 1
162171
XCTAssertNotEqual(cameraOptions, other)
163172

173+
other = cameraOptions
174+
other.verticalFov? += 1
175+
XCTAssertNotEqual(cameraOptions, other)
176+
164177
other = cameraOptions
165178
other.center = nil
166179
XCTAssertNotEqual(cameraOptions, other)
@@ -184,6 +197,10 @@ final class CameraOptionsTests: XCTestCase {
184197
other = cameraOptions
185198
other.pitch = nil
186199
XCTAssertNotEqual(cameraOptions, other)
200+
201+
other = cameraOptions
202+
other.verticalFov = nil
203+
XCTAssertNotEqual(cameraOptions, other)
187204
}
188205

189206
func testConversionToMapboxCoreMapsCameraOptions() {
@@ -204,6 +221,7 @@ final class CameraOptionsTests: XCTestCase {
204221
XCTAssertEqual(objcCameraOptions.zoom, zoom.NSNumber)
205222
XCTAssertEqual(objcCameraOptions.bearing, bearing.NSNumber)
206223
XCTAssertEqual(objcCameraOptions.pitch, pitch.NSNumber)
224+
XCTAssertNil(objcCameraOptions.verticalFov)
207225
}
208226

209227
func testConversionToMapboxCoreMapsCameraOptionsWithNils() {
@@ -218,5 +236,6 @@ final class CameraOptionsTests: XCTestCase {
218236
XCTAssertNil(objcCameraOptions.zoom)
219237
XCTAssertNil(objcCameraOptions.bearing)
220238
XCTAssertNil(objcCameraOptions.pitch)
239+
XCTAssertNil(objcCameraOptions.verticalFov)
221240
}
222241
}

0 commit comments

Comments
 (0)