From fb382b08c9db93e6a7de0a6f89b78dd1280437fe Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Sat, 16 Nov 2024 21:34:58 +0100 Subject: [PATCH 1/2] Revert "Encode the style URL in iOS (#2965)" This reverts commit d140d5e1659b3804f90f2e2f7f1b8e304a66decc. --- platform/darwin/src/http_file_source.mm | 5 ++--- platform/darwin/test/MLNResourceTests.mm | 11 ----------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm index d8fbf884363..007a0b902d4 100644 --- a/platform/darwin/src/http_file_source.mm +++ b/platform/darwin/src/http_file_source.mm @@ -226,9 +226,8 @@ BOOL isValidMapboxEndpoint(NSURL *url) { MLN_APPLE_EXPORT NSURL *resourceURL(const Resource& resource) { - NSString *encodedUrlString = [@(resource.url.c_str()) stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet]; - NSURL *url = [NSURL URLWithString:encodedUrlString]; - + NSURL *url = [NSURL URLWithString:@(resource.url.c_str())]; + #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR if (isValidMapboxEndpoint(url)) { NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO]; diff --git a/platform/darwin/test/MLNResourceTests.mm b/platform/darwin/test/MLNResourceTests.mm index 6ad67d63236..401670eecc3 100644 --- a/platform/darwin/test/MLNResourceTests.mm +++ b/platform/darwin/test/MLNResourceTests.mm @@ -86,15 +86,4 @@ - (void)testOfflineQueryParameterIsAddedForOfflineResourceForChina { [self internalTestOfflineQueryParameterIsAddedForOfflineResource:testURL]; } -- (void)testResourceURL { - using namespace mbgl; - - // Test URL with characters requiring encoding - Resource resource(Resource::Kind::Unknown, "https://example.com/test?param1=a|b¶m2=c|d"); - NSURL *url = resourceURL(resource); - - XCTAssertNotNil(url); - XCTAssertEqualObjects(url.absoluteString, @"https://example.com/test?param1=a%7Cb¶m2=c%7Cd"); -} - @end From 484c5c8ea239026dcfb07677de50e1b31903addc Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Sat, 16 Nov 2024 21:40:38 +0100 Subject: [PATCH 2/2] Update changelog --- platform/ios/CHANGELOG.md | 7 +++++++ platform/ios/VERSION | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index b57d49963ac..b49b5c50003 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -4,6 +4,13 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C ## main +## 6.8.1 + +- Update Bazel dependencies ([#3000](https://github.com/maplibre/maplibre-native/pull/3000)). +- Reuse allocated descriptor sets ([#3002](https://github.com/maplibre/maplibre-native/pull/3002)). +- Line SDF shader fix ([#3010](https://github.com/maplibre/maplibre-native/pull/3010)). +- Revert "Encode the style URL in iOS. This change was causing several regressions with styles not loading ([#3024](https://github.com/maplibre/maplibre-native/pull/3024)). + ## 6.8.0 ### Features diff --git a/platform/ios/VERSION b/platform/ios/VERSION index 8a1c5c7e99c..23863d3def7 100644 --- a/platform/ios/VERSION +++ b/platform/ios/VERSION @@ -1 +1 @@ -6.8.0 \ No newline at end of file +6.8.1 \ No newline at end of file