Encode the style URL in iOS (#2965)

maplibre · Oct 30, 2024 · d140d5e · d140d5e
1 parent 75ed159
commit d140d5e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm
@@ -226,8 +226,9 @@ BOOL isValidMapboxEndpoint(NSURL *url) {
 MLN_APPLE_EXPORT
 NSURL *resourceURL(const Resource& resource) {
 
-    NSURL *url = [NSURL URLWithString:@(resource.url.c_str())];
-
+    NSString *encodedUrlString = [@(resource.url.c_str()) stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
+    NSURL *url = [NSURL URLWithString:encodedUrlString];
+
 #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
@@ -86,4 +86,15 @@ - (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&param2=c|d");
+    NSURL *url = resourceURL(resource);
+
+    XCTAssertNotNil(url);
+    XCTAssertEqualObjects(url.absoluteString, @"https://example.com/test?param1=a%7Cb&param2=c%7Cd");
+}
+
 @end