Skip to content

Commit

Permalink
Revert "Encode the style URL in iOS (#2965)" (#3024)
Browse files Browse the repository at this point in the history
  • Loading branch information
louwers authored Nov 17, 2024
1 parent e9afa1f commit 6be18d2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 15 deletions.
5 changes: 2 additions & 3 deletions platform/darwin/src/http_file_source.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
11 changes: 0 additions & 11 deletions platform/darwin/test/MLNResourceTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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&param2=c|d");
NSURL *url = resourceURL(resource);

XCTAssertNotNil(url);
XCTAssertEqualObjects(url.absoluteString, @"https://example.com/test?param1=a%7Cb&param2=c%7Cd");
}

@end
7 changes: 7 additions & 0 deletions platform/ios/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platform/ios/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.8.0
6.8.1

0 comments on commit 6be18d2

Please sign in to comment.