-
-
Notifications
You must be signed in to change notification settings - Fork 634
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
Globe - symbols & symbol bugfixes #4067
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## globe #4067 +/- ##
===========================================
+ Coverage 70.12% 86.94% +16.82%
===========================================
Files 249 250 +1
Lines 34756 34854 +98
Branches 1326 2122 +796
===========================================
+ Hits 24371 30303 +5932
+ Misses 9059 3548 -5511
+ Partials 1326 1003 -323 ☔ View full report in Codecov by Sentry. |
Globe render tests for symbols are duplicated - each test has two variants, one with collision box debug disabled, and one with enabled. In base MapLibre, collision tests are separate, so I separated them here as well. But I'm wondering if I could keep just the variant with collisions for globe render tests, since it also inherently tests regular symbol rendering. |
Also, in the second screenshot on the left side you can notice the |
I'll review this in the coming days, thanks for this! |
I know I've previously said that the changes are too deeply rooted into globe, but after taking another look at the actual diffs of the files, I think it might not be too much work to port it over to main. The easiest approach is to create a greatly reduced version of the |
I believe so, as long as we keep the changes minimal I think it will be a good way forward. |
Let's focus on the following PR first: Once merged to main and to globe branch and to globe-pr-symbol I'll review this PR. |
There's a need to resolve conflict I suppose. |
…symbols # Conflicts: # CHANGELOG.md # src/data/bucket/symbol_bucket.test.ts # src/geo/projection/globe.ts # src/geo/projection/mercator.ts # src/geo/projection/projection.ts # src/render/draw_collision_debug.ts # src/render/draw_symbol.ts # src/render/program/collision_program.ts # src/shaders/collision_box.vertex.glsl # src/shaders/symbol_icon.vertex.glsl # src/shaders/symbol_sdf.vertex.glsl # src/shaders/symbol_text_and_icon.vertex.glsl # src/style/pauseable_placement.ts # src/symbol/collision_index.test.ts # src/symbol/collision_index.ts # src/symbol/placement.ts # src/symbol/projection.test.ts # src/symbol/projection.ts # src/symbol/symbol_layout.ts # test/build/min.test.ts # test/integration/render/tests/debug/collision-text-translate/rotation-alignment-map/pitch-alignment-map/text-translate-anchor-map/expected.png # test/integration/render/tests/debug/collision-text-translate/rotation-alignment-map/pitch-alignment-map/text-translate-anchor-viewport/expected.png # test/integration/render/tests/debug/collision-text-translate/rotation-alignment-viewport/pitch-alignment-map/text-translate-anchor-map/expected.png # test/integration/render/tests/debug/collision-text-translate/rotation-alignment-viewport/pitch-alignment-map/text-translate-anchor-viewport/expected.png
The 10 kb size increase seems to come from the main branch
…symbols # Conflicts: # test/build/min.test.ts
I've managed to remove |
GREAT! Thanks for the update! |
Symbol layer adaptation + symbol bugfixes
Issue & discussion of globe:
maplibre/maplibre#190
maplibre/maplibre#161
Additions and changes since the previous PR:
draw_fill
andpainter
changes are related to this).showCollisionBoxes
) not showing the actual bounding boxes used for collision and click areas. The displayed boxes now match actual collision boxes exactly. Displayed collision boxes will react to map motion with some latency. (Just as the actual collision boxes do.)text-translate
property for translation instead of the correcticon-translate
.text-translate
andicon-translate
behaving weirdly and inconsistently with other-translate
properties. (#3456)I've updated the public globe demo with MapLibre build from this PR:
https://kvaleya.gitlab.io/maplibre/globe/globedemo.html
Main vector globe branch with all changes
Launch Checklist
CHANGELOG.md
under the## main
section.