From 00d4f812acb3a513fd70f4e15a71ae47662bf292 Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Tue, 20 Aug 2019 17:26:35 -0700 Subject: [ios] Update MGLTileSetTests.testTileSetFromTileURLTemplates for Xcode 11 --- platform/darwin/test/MGLTileSetTests.mm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/platform/darwin/test/MGLTileSetTests.mm b/platform/darwin/test/MGLTileSetTests.mm index 998d4baee6..65e096ae7f 100644 --- a/platform/darwin/test/MGLTileSetTests.mm +++ b/platform/darwin/test/MGLTileSetTests.mm @@ -84,9 +84,18 @@ // the attribution is reflected by the mbgl tileset #if TARGET_OS_IPHONE - NSString *html = (@"" - @"Mapbox " - @"GL\n"); + NSString *html; + if (@available(iOS 13.0, *)) { + // TODO: investigate visual impact + // iOS 13 evidently changes font size from points to pixels + html = (@"" + @"Mapbox " + @"GL\n"); + } else { + html = (@"" + @"Mapbox " + @"GL\n"); + } #else NSString *html = (@"" @"Mapbox " @@ -111,7 +120,7 @@ // the scheme is reflected by the mbgl tileset XCTAssertEqual(tileSet.scheme, mbgl::Tileset::Scheme::TMS); - // when the dem enciding is changed using an NSNumber + // when the dem encoding is changed using an NSNumber tileSet = MGLTileSetFromTileURLTemplates(tileURLTemplates, @{ MGLTileSourceOptionDEMEncoding: @(MGLDEMEncodingTerrarium), }); @@ -119,7 +128,7 @@ // the encoding is reflected by the mbgl tileset XCTAssertEqual(tileSet.encoding, mbgl::Tileset::DEMEncoding::Terrarium); - // when the dem enciding is changed using an NSValue + // when the dem encoding is changed using an NSValue MGLDEMEncoding terrarium = MGLDEMEncodingTerrarium; tileSet = MGLTileSetFromTileURLTemplates(tileURLTemplates, @{ MGLTileSourceOptionDEMEncoding: [NSValue value:&terrarium withObjCType:@encode(MGLDEMEncoding)], -- cgit v1.2.1