summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnsis Brammanis <ansis@mapbox.com>2018-02-21 11:36:40 -0500
committerAnsis Brammanis <ansis.brammanis@gmail.com>2018-02-21 14:38:30 -0500
commitebb72b9002f9d497e696a08030fcec2f489c273c (patch)
tree2406b615eb0b2a95191afdc124544e984108f156
parentc2d9d6a4235d5bce5c10b40b3f8cfaeb331d7878 (diff)
downloadqtlocation-mapboxgl-ebb72b9002f9d497e696a08030fcec2f489c273c.tar.gz
[core] don't hide icons if text is an empty string
-rw-r--r--platform/node/test/ignores.json1
-rw-r--r--src/mbgl/text/placement.cpp6
2 files changed, 3 insertions, 4 deletions
diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json
index 50e2aa1d61..42751da30f 100644
--- a/platform/node/test/ignores.json
+++ b/platform/node/test/ignores.json
@@ -34,7 +34,6 @@
"render-tests/regressions/mapbox-gl-js#5599": "https://github.com/mapbox/mapbox-gl-native/issues/10399",
"render-tests/regressions/mapbox-gl-js#5740": "https://github.com/mapbox/mapbox-gl-native/issues/10619",
"render-tests/regressions/mapbox-gl-js#5982": "https://github.com/mapbox/mapbox-gl-native/issues/10619",
- "render-tests/regressions/mapbox-gl-js#6160": "https://github.com/mapbox/mapbox-gl-native/pull/11206",
"render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357",
"render-tests/runtime-styling/image-add-sdf": "https://github.com/mapbox/mapbox-gl-native/issues/9847",
"render-tests/runtime-styling/paint-property-fill-flat-to-extrude": "https://github.com/mapbox/mapbox-gl-native/issues/6745",
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp
index fc24c78902..54b2b7539b 100644
--- a/src/mbgl/text/placement.cpp
+++ b/src/mbgl/text/placement.cpp
@@ -95,9 +95,6 @@ void Placement::placeLayerBucket(
auto partiallyEvaluatedTextSize = bucket.textSizeBinder->evaluateForZoom(state.getZoom());
auto partiallyEvaluatedIconSize = bucket.iconSizeBinder->evaluateForZoom(state.getZoom());
- const bool iconWithoutText = !bucket.hasTextData() || bucket.layout.get<style::TextOptional>();
- const bool textWithoutIcon = !bucket.hasIconData() || bucket.layout.get<style::IconOptional>();
-
for (auto& symbolInstance : bucket.symbolInstances) {
if (seenCrossTileIDs.count(symbolInstance.crossTileID) == 0) {
@@ -140,6 +137,9 @@ void Placement::placeLayerBucket(
offscreen &= placed.second;
}
+ const bool iconWithoutText = !symbolInstance.hasText || bucket.layout.get<style::TextOptional>();
+ const bool textWithoutIcon = !symbolInstance.hasIcon || bucket.layout.get<style::IconOptional>();
+
// combine placements for icon and text
if (!iconWithoutText && !textWithoutIcon) {
placeText = placeIcon = placeText && placeIcon;