diff --git a/.github/workflows/android-ci-pull.yml b/.github/workflows/android-ci-pull.yml index 6bffa3109..2c187cab3 100644 --- a/.github/workflows/android-ci-pull.yml +++ b/.github/workflows/android-ci-pull.yml @@ -28,6 +28,7 @@ on: - ".github/workflows/macos-ci.yml" - ".github/workflows/macos-release.yml" - ".github/workflows/node-ci.yml" + - ".github/workflows/node-release.yml" - ".github/workflows/qt-ci-windows.yml" - ".github/workflows/qt-ci.yml" - ".github/workflows/update-gl-js.yml" diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 89a092e8c..4465d04b1 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -29,6 +29,7 @@ on: - ".github/workflows/macos-ci.yml" - ".github/workflows/macos-release.yml" - ".github/workflows/node-ci.yml" + - ".github/workflows/node-release.yml" - ".github/workflows/qt-ci-windows.yml" - ".github/workflows/qt-ci.yml" - ".github/workflows/update-gl-js.yml" diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml index e991b7334..b580ccff7 100644 --- a/.github/workflows/ios-ci.yml +++ b/.github/workflows/ios-ci.yml @@ -30,6 +30,7 @@ on: - ".github/workflows/macos-ci.yml" - ".github/workflows/macos-release.yml" - ".github/workflows/node-ci.yml" + - ".github/workflows/node-release.yml" - ".github/workflows/qt-ci-windows.yml" - ".github/workflows/qt-ci.yml" - ".github/workflows/update-gl-js.yml" @@ -61,6 +62,7 @@ on: - ".github/workflows/macos-ci.yml" - ".github/workflows/macos-release.yml" - ".github/workflows/node-ci.yml" + - ".github/workflows/node-release.yml" - ".github/workflows/qt-ci-windows.yml" - ".github/workflows/qt-ci.yml" - ".github/workflows/update-gl-js.yml" diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml index 5c753d326..d4c9039c9 100644 --- a/.github/workflows/macos-ci.yml +++ b/.github/workflows/macos-ci.yml @@ -31,6 +31,7 @@ on: - ".github/workflows/ios-release.yml" - ".github/workflows/macos-release.yml" - ".github/workflows/node-ci.yml" + - ".github/workflows/node-release.yml" - ".github/workflows/qt-ci-windows.yml" - ".github/workflows/qt-ci.yml" - ".github/workflows/update-gl-js.yml" @@ -60,6 +61,7 @@ on: - ".github/workflows/ios-release.yml" - ".github/workflows/macos-release.yml" - ".github/workflows/node-ci.yml" + - ".github/workflows/node-release.yml" - ".github/workflows/qt-ci-windows.yml" - ".github/workflows/qt-ci.yml" - ".github/workflows/update-gl-js.yml" diff --git a/platform/ios/platform/darwin/test/MGLCoordinateFormatterTests.m b/platform/ios/platform/darwin/test/MGLCoordinateFormatterTests.m index 21869a2cb..2ef1c6276 100644 --- a/platform/ios/platform/darwin/test/MGLCoordinateFormatterTests.m +++ b/platform/ios/platform/darwin/test/MGLCoordinateFormatterTests.m @@ -24,7 +24,11 @@ coordinate = CLLocationCoordinate2DMake(38.9131982, -77.0325453144239); XCTAssertEqualObjects([shortFormatter stringFromCoordinate:coordinate], @"38°54′48″N, 77°1′57″W"); XCTAssertEqualObjects([mediumFormatter stringFromCoordinate:coordinate], @"38°54′48″ north, 77°1′57″ west"); + #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR XCTAssertEqualObjects([longFormatter stringFromCoordinate:coordinate], @"38 degree(s), 54 minute(s), and 48 second(s) north by 77 degree(s), 1 minute(s), and 57 second(s) west"); + #else + XCTAssertEqualObjects([longFormatter stringFromCoordinate:coordinate], @"38 degrees, 54 minutes, and 48 seconds north by 77 degrees, 1 minute, and 57 seconds west"); + #endif shortFormatter.allowsSeconds = NO; mediumFormatter.allowsSeconds = NO; @@ -33,7 +37,12 @@ coordinate = CLLocationCoordinate2DMake(38.9131982, -77.0325453144239); XCTAssertEqualObjects([shortFormatter stringFromCoordinate:coordinate], @"38°55′N, 77°2′W"); XCTAssertEqualObjects([mediumFormatter stringFromCoordinate:coordinate], @"38°55′ north, 77°2′ west"); + #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR XCTAssertEqualObjects([longFormatter stringFromCoordinate:coordinate], @"38 degree(s) and 55 minute(s) north by 77 degree(s) and 2 minute(s) west"); + #else + XCTAssertEqualObjects([longFormatter stringFromCoordinate:coordinate], @"38 degrees and 55 minutes north by 77 degrees and 2 minutes west"); + #endif + shortFormatter.allowsMinutes = NO; mediumFormatter.allowsMinutes = NO; @@ -42,7 +51,13 @@ coordinate = CLLocationCoordinate2DMake(38.9131982, -77.0325453144239); XCTAssertEqualObjects([shortFormatter stringFromCoordinate:coordinate], @"39°N, 77°W"); XCTAssertEqualObjects([mediumFormatter stringFromCoordinate:coordinate], @"39° north, 77° west"); + + #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR XCTAssertEqualObjects([longFormatter stringFromCoordinate:coordinate], @"39 degree(s) north by 77 degree(s) west"); + #else + XCTAssertEqualObjects([longFormatter stringFromCoordinate:coordinate], @"39 degrees north by 77 degrees west"); + #endif + } @end