Revert "Encode the style URL in iOS (#2965)" (#3024)

This commit is contained in:
Bart Louwers
2024-11-17 01:03:04 +01:00
committed by GitHub
parent e9afa1f461
commit 6be18d276b
4 changed files with 10 additions and 15 deletions

View File

@@ -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];

View File

@@ -86,15 +86,4 @@ namespace mbgl {
[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

View File

@@ -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

View File

@@ -1 +1 @@
6.8.0
6.8.1