diff options
author | Chris Loer <chris.loer@gmail.com> | 2017-11-13 11:12:03 -0800 |
---|---|---|
committer | Chris Loer <chris.loer@mapbox.com> | 2017-11-17 10:05:15 -0800 |
commit | c39232a89f1feb18454d88f2908f5cbef306b065 (patch) | |
tree | 07589ccc9f4d694688d46367b8c6338660fbf687 /src/mbgl/layout/symbol_layout.cpp | |
parent | 8cfeae9e458aa156e190617f378a4456c7047129 (diff) | |
download | qtlocation-mapboxgl-c39232a89f1feb18454d88f2908f5cbef306b065.tar.gz |
[core] Cleanup in response to review comments.
Diffstat (limited to 'src/mbgl/layout/symbol_layout.cpp')
-rw-r--r-- | src/mbgl/layout/symbol_layout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index d84b74d42a..fc1ede56ff 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -293,7 +293,7 @@ void SymbolLayout::addFeature(const std::size_t index, const float textRepeatDistance = symbolSpacing / 2; IndexedSubfeature indexedFeature(feature.index, sourceLayer->getName(), bucketName, symbolInstances.size(), - sourceID, tileID.canonical.z, tileID.canonical.x, tileID.canonical.y); + sourceID, tileID.canonical); auto addSymbolInstance = [&] (const GeometryCoordinates& line, Anchor& anchor) { // https://github.com/mapbox/vector-tile-spec/tree/master/2.1#41-layers @@ -320,7 +320,7 @@ void SymbolLayout::addFeature(const std::size_t index, symbolInstances.size(), textBoxScale, textPadding, textPlacement, textOffset, iconBoxScale, iconPadding, iconOffset, - glyphPositionMap, indexedFeature, index, feature.text ? *feature.text : std::u16string{}, overscaling); + glyphPositionMap, indexedFeature, index, feature.text.value_or(std::u16string()), overscaling); } }; |