From fb382b08c9db93e6a7de0a6f89b78dd1280437fe Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Sat, 16 Nov 2024 21:34:58 +0100 Subject: [PATCH] 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