Port symbol-placement: line-center to native
#12337
Conversation
2efbc06 to
ad686a0
Compare
|
This is now good to go, except that it depends on two separate gl-js PRs for updated tests:
|
f87ec4a to
478b058
Compare
478b058 to
5b80ea0
Compare
|
@ansis do you know if you'll get a chance to review this soon? It's not urgent, but if it'll take more than a day, I should push some test ignores to GL JS (currently blocking #12415 cc @jfirebaugh) |
5b80ea0 to
c671c82
Compare
- Remove unused/vestigial 'maxCameraDistance' - Create a single collision circle for line labels that are less than half the width of a collision circle
c671c82 to
2770b44
Compare
| // CJL: I'm not sure why SymbolPlacementType::Line -> avoidEdges = false. It seems redundant since | ||
| // getAnchors will already avoid generating anchors outside the tile bounds. | ||
| // However, SymbolPlacementType::LineCenter allows anchors outside tile boundaries, so its behavior | ||
| // here should match SymbolPlacement::Point |
There was a problem hiding this comment.
I think in it's current form this is completely redundant, but I think there is a potential static tile rendering bug this reminds me of:
While the anchors will always be within the tile bounds, the label itself could still cross tile boundaries. This is fine for regular gl maps, but for static tile rendering these labels would cause problems. Since the position of line labels is based on tile clipping, their position is unpredictable and would likely be visibly clipped in static tile maps.
This also applies to line center labels.
But we don't have any support for avoid edges in the current collision code, right? Is the current version of symbol placement in production for static tile maps?
There was a problem hiding this comment.
Ah yeah, is this just a loose end we left behind? I was thinking this was handled by including the tile buffers in collision detection for static tiles, but you're right that doesn't work for line labels. It sounds to me like we probably need to re-implement some kind of avoidEdges support for line labels. Filed as #12461. Since we'll probably want to re-implement it, we might as well leave the rump of the avoidEdges logic in place for now.
Fixes #12300.
Removes unused "maxCameraDistance" shader uniforms (these have been obsolete since the switch to viewport collision detection and render-time line-label layout).
Also changes collision detection behavior for line labels with width less than 1/2 of a collision circle (previously, such labels wouldn't show).
Using an unmerged pin of GL JS for tests.
text-max-angle/line-centeris currently failing because one extra label is showing up -- I haven't dug into why yet./cc @ansis @nickidlugash