Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: usage of PMTiles on iOS 17 through VectorSource with NSString #625

Merged
merged 9 commits into from
Feb 25, 2025
Merged

fix: usage of PMTiles on iOS 17 through VectorSource with NSString #625

merged 9 commits into from
Feb 25, 2025

Conversation

KiwiKilian
Copy link
Collaborator

Fixes #618

To test, use this Bug Report example #618 (comment)

Now it also works on iOS 17.

@KiwiKilian KiwiKilian requested a review from tyrauber January 20, 2025 17:57
@KiwiKilian
Copy link
Collaborator Author

@conbrad could you please also have a look at this?

@conbrad
Copy link

conbrad commented Jan 20, 2025 •
edited
Loading

@conbrad could you please also have a look at this?

Looks reasonable, however is it possible to simplify, remove the conditional block and just always use tileUrlTemplates, at least until a proper upstream fix is in place?

Regarding @tyrauber 's comment , I believe PMTiles relies solely on HTTP headers, so URL params shouldn't be a factor, unless of course you're using params through a proxy or something...

@KiwiKilian
Copy link
Collaborator Author

@conbrad see my comment here maplibre/maplibre-native#3151 (comment) regarding only using tileUrlTemplates.

@KiwiKilian KiwiKilian requested a review from tyrauber January 20, 2025 21:15
conbrad
conbrad approved these changes Jan 20, 2025
View reviewed changes
Copy link

@conbrad conbrad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@KiwiKilian
Copy link
Collaborator Author

I've posted a workaround to the issue. Therefore lets wait for the release of the fix maplibre/maplibre-native#3163 upstream, then I will adopt this PR.

@KiwiKilian KiwiKilian marked this pull request as draft January 22, 2025 06:14
@KiwiKilian KiwiKilian marked this pull request as ready for review February 25, 2025 10:12
@KiwiKilian
Copy link
Collaborator Author

This is now ready for review, to be merged after #650.

@KiwiKilian KiwiKilian changed the title fix: evade parsing of pmtiles with NSURL fix: usage of PMTiles on iOS 17 through VectorSource with NSString Feb 25, 2025
tyrauber
tyrauber approved these changes Feb 25, 2025
View reviewed changes
Copy link
Collaborator

@tyrauber tyrauber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this builds on the other PR updated the native SDK, but the protomap code looks cleaner. Nice!

@KiwiKilian
Merge branch 'main' into fix/pmtiles-ios-17
ea67f14 
# Conflicts:
#	android/gradle.properties
@KiwiKilian KiwiKilian merged commit f9d0823 into maplibre:main Feb 25, 2025
9 checks passed
@KiwiKilian KiwiKilian deleted the fix/pmtiles-ios-17 branch February 25, 2025 19:11
github-actions bot pushed a commit that referenced this pull request Feb 25, 2025
@semantic-release-bot
chore(release): 10.1.0 [skip ci]
c68be42 
# [10.1.0](v10.0.1...v10.1.0) (2025-02-25)

### Bug Fixes

* usage of PMTiles on iOS 17 through VectorSource with NSString ([#625](#625)) ([f9d0823](f9d0823))

### Features

* allow configuration of Android SDK variant ([#622](#622)) ([6bc5fec](6bc5fec))
* upgrade MapLibre Native Android (11.8.1) & iOS (6.11.0) ([#650](#650)) ([0053ee7](0053ee7))
@github-actions GitHub Actions
Copy link

🎉 This PR is included in version 10.1.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tyrauber tyrauber tyrauber approved these changes

@conbrad conbrad conbrad approved these changes

Assignees
No one assigned
Labels
released Upstream
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

PMTiles URL schema throws error in iOS
3 participants
@KiwiKilian @conbrad @tyrauber