Skip to content

Fix hasIconPotentially check #905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matzf wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix hasIconPotentially check #905

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,15 @@ void Tiled2dMapVectorSymbolGroup::initialize(std::weak_ptr<std::vector<Tiled2dMa
if (hasImageFromCustomProvider) {
hasIconPotentially = true;
} else if (!hasImageFromCustomProviderRequested && layerDescription->style.iconImageEvaluator.getValue()) {
// Attempt to evaluate without zoom and state
const auto zoomAndStateIndependentEvalCtx = EvaluationContext(dpFactor, context.get(), nullptr);
const auto value = layerDescription->style.iconImageEvaluator.getValue();
const auto res = value->evaluate(zoomAndStateIndependentEvalCtx);
const std::string *iconImage = std::get_if<std::string>(&res);
// if this succeeded returns empty, there is no icon image for any zoom level.
hasIconPotentially = (iconImage != nullptr && !iconImage->empty());
const auto iconImageUsedKeys = layerDescription->style.iconImageEvaluator.getValue()->getUsedKeys();
if (iconImageUsedKeys.isStateDependant() ||
iconImageUsedKeys.containsUsedKey(ValueKeys::ZOOM)) {
hasIconPotentially = true;
} else {
// Expression independent of zoom/state, so we can evaluate to see if there is an icon for this feature.
const auto iconImage = layerDescription->style.getIconImage(evalContext);
hasIconPotentially = !iconImage.value.empty();
}
} else {
hasIconPotentially = false;
}
Expand Down