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.

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

fix: order of normalizeSpriteURL and transformRequest in load sprites #3898

Merged
merged 2 commits into from
Oct 22, 2024

Conversation

Kai-W
Copy link
Contributor

@Kai-W Kai-W commented Mar 25, 2024

This PR fixes the order of transformRequest and normalizeSpriteURL on loading Sprites.

(#3897)

Launch Checklist

  • Confirm your changes do not include backports from Mapbox projects (unless with compliant license) - if you are not sure about this, please ask!
  • Briefly describe the changes in this PR.
  • Link to related issues.
  • Include before/after visuals or gifs if this PR includes visual changes.
  • Write tests for all new functionality.
  • Document any changes to public APIs.
  • Post benchmark scores.
  • Add an entry to CHANGELOG.md under the ## main section.

@codecov-commenter
Copy link

codecov-commenter commented Mar 31, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.79%. Comparing base (f24dfe6) to head (789f158).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3898      +/-   ##
==========================================
+ Coverage   87.50%   87.79%   +0.28%     
==========================================
  Files         265      265              
  Lines       37970    37974       +4     
  Branches     2409     2402       -7     
==========================================
+ Hits        33227    33339     +112     
+ Misses       3665     3553     -112     
- Partials     1078     1082       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@HarelM
Copy link
Collaborator

HarelM commented Oct 22, 2024

@Kai-W can you resolve conflict and prepare this PR to be merged? I want to move forward with the breaking changes of version 5.

transformRequest is now called once with ResourceType.Sprite and not seperatly for SpiteJSON and SpriteImage. URL validation and appending of json/png is done afterwards
@Kai-W
Copy link
Contributor Author

Kai-W commented Oct 22, 2024

I rebased the branch, but i dont know why the windows rendert test 0 is failing. @HarelM can you look at it?

CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Collaborator

@HarelM HarelM left a comment

Choose a reason for hiding this comment

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

I hope this will work well with all kind of tokens etc...

@HarelM HarelM merged commit 54cf54e into maplibre:main Oct 22, 2024
15 checks passed
jcary741 added a commit to jcary741/maplibre-gl-js that referenced this pull request Nov 2, 2024
HarelM added a commit that referenced this pull request Nov 7, 2024
* Revert "fix: order of normalizeSpriteURL  and transformRequest in load sprites (#3898)"

This reverts commit 54cf54e

* Fix URL parsing in normalizeSpriteURL

* add documentation

---------

Co-authored-by: Harel M <harel.mazor@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants