Skip to content

Commit 2af7f5e

Browse files
persidskiygithub-actions[bot]
authored andcommitted
Maps iOS: Fix build with new GLNative
GitOrigin-RevId: 37ca873dde6ad81d8dad23a1f2ab760b3b02e3de
1 parent 01a26e9 commit 2af7f5e

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

Sources/MapboxMaps/Foundation/Extensions/Core/MapOptions.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ extension MapOptions {
6464
crossSourceCollisions: crossSourceCollisions.NSNumber,
6565
size: mbmSize,
6666
pixelRatio: Float(pixelRatio ?? ScreenShim.nativeScale),
67-
glyphsRasterizationOptions: glyphsRasterizationOptions)
67+
glyphsRasterizationOptions: glyphsRasterizationOptions,
68+
screenShape: nil)
6869
}
6970

7071
/// The map constrain mode. This can be used to limit the map to wrap around

Sources/MapboxMaps/Foundation/MapInitOptions.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ extension MapInitOptions {
101101
crossSourceCollisions: mapOptions.__crossSourceCollisions,
102102
size: Size(width: Float(bounds.width), height: Float(bounds.height)),
103103
pixelRatio: mapOptions.pixelRatio,
104-
glyphsRasterizationOptions: mapOptions.glyphsRasterizationOptions)
104+
glyphsRasterizationOptions: mapOptions.glyphsRasterizationOptions,
105+
screenShape: nil)
106+
105107

106108
// Use the overriding style URI if provided (currently from IB)
107109
let resolvedStyleURI = overridingStyleURI.map { StyleURI(url: $0) } ?? styleURI

Tests/MapboxMapsTests/Foundation/MapboxMapTests.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ final class MapboxMapTests: XCTestCase {
5353
crossSourceCollisions: mapInitOptions.mapOptions.crossSourceCollisions.NSNumber,
5454
size: mapInitOptions.mapOptions.size.map(Size.init),
5555
pixelRatio: mapInitOptions.mapOptions.pixelRatio,
56-
glyphsRasterizationOptions: nil) // __map.getOptions() always returns nil for glyphsRasterizationOptions
56+
glyphsRasterizationOptions: nil,
57+
screenShape: nil) // __map.getOptions() always returns nil for glyphsRasterizationOptions
5758

5859
let actualMapOptions = mapboxMap.options
5960

0 commit comments

Comments
 (0)