place symbol layers in correct order #3543
Conversation
| // We cannot parse this bucket yet. Instead, we're saving it for later. | ||
| pending.emplace_back(layer->as<SymbolLayer>(), std::move(bucket)); | ||
| } else { | ||
| placementPending.emplace(layer->bucketName(), std::move(bucket)); |
There was a problem hiding this comment.
This will not overwrite existing data that has the same key in placementPending. Is this what you want?
There was a problem hiding this comment.
Since label names are unique, there should never be anything to overwrite. Also, this is the same as this
|
@jfirebaugh it would be great to get a third set of 👀 on this if you have time |
|
Will do. |
| partialParse = false; | ||
| placementConfig = config; |
There was a problem hiding this comment.
Instead of storing a copy of placementConfig, would it be better to pass the correct value to TileWorker::parsePendingLayers, and then pass it through as a parameter to placeLayers everywhere?
There was a problem hiding this comment.
yes, that would be cleaner and it could avoid an extra redoPlacement in some cases. changed in 716b01c
|
is this ready for squashing and merging? |
|
LGTM |
Previously, the placement of symbols depended on the order in which the glyphs they need were loaded. The placement order should be based on the style. To fix this, symbol layers are placed in `placementPending` after they are parsed. After all layers are parsed, symbol layers (stored in `placementPending`) are placed and returned.
ansis
force-pushed
the
strict-symbol-placement-order
branch
from
6016ea0
to
e44db93
Compare
Previously, the placement of symbol layers depended on the order in which the glyphs they need were loaded. The placement order should be based on the style.
To fix this, symbol layers are placed in
placementPendingafter they are parsed. After all layers are parsed, symbol layers (stored inplacementPending) are placed and returned.@kkaefer can you review this?