-
Notifications
You must be signed in to change notification settings - Fork 1.3k
[core] Avoid clipping symbols in continuous mode #6832
Conversation
@brunoabinader, thanks for your PR! By analyzing the history of the files in this pull request, we identified @jfirebaugh, @mikemorris and @ansis to be potential reviewers. |
e9d6a7e
to
9821b3e
Compare
Can you comment on #6670 (comment) and help fill in the gaps in my understanding? |
9821b3e
to
db310c9
Compare
I've added an extensive introspection as a comment in #6670. |
ccf145e
to
adcdf2c
Compare
@@ -298,8 +297,7 @@ void SymbolLayout::addFeature(const GeometryCollection &lines, | |||
// be drawn across tile boundaries. Instead they need to be included in | |||
// the buffers for both tiles and clipped to tile boundaries at draw time. | |||
// | |||
// TODO remove the `&& false` when is #1673 implemented | |||
const bool addToBuffers = (mode == MapMode::Still) || inside || (mayOverlap && false); | |||
const bool addToBuffers = inside || mayOverlap; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see how removing mode == MapMode::Still
here is safe. In still mode, rendering a single tile, we cannot throw away features in the tile buffer under any circumstances, for the reasons detailed in #6670 (comment).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are right - for Still mode we need to render all features.
Per #6670 (comment) - it seems we no longer need padding for symbol annotations - we can sort symbol render tiles instead prior to rendering. We still clip in still mode, but just because we need to update our render test results. I'm deferring this work to a following PR. |
9ceff83
to
8854e8d
Compare
8854e8d
to
c4ba5ba
Compare
Based on @jfirebaugh's comments, I'm going to revert a few comments about clipping symbols for Still mode I've had removed on this PR. Will flag it reviewable again once it is finished. |
a161f22
to
43ceefd
Compare
Ready for review. |
43ceefd
to
72557cb
Compare
@jfirebaugh @ansis I have cleaned up the patches from this PR, removing stuff that was not related to the proposed changes:
|
72557cb
to
2b783b7
Compare
Re-enable symbol clipping based on layout property settings, cleaning up workarounds and adds padding to symbol annotation tiles.Avoid clipping symbols in continuous mode - preserving clipping behavior in still mode. To avoid overdrawing symbols on tile edges, we avoid inserting symbol features with anchors located among the tile extent edges.
Fixes #1673 and #6670.
/cc @jfirebaugh @ansis