Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core] Attempt placement if at least one image is ready #9816

Closed
wants to merge 2 commits into from
Closed

[core] Attempt placement if at least one image is ready #9816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c73ae50
[core] Attempt placement if at least one image is ready
brunoabinader Aug 21, 2017
e0608df
[core] Always attempt placement when new images are available
brunoabinader Aug 21, 2017
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
1 change: 0 additions & 1 deletion platform/node/test/ignores.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"render-tests/regressions/mapbox-gl-js#4551": "skip - https://github.com/mapbox/mapbox-gl-native/issues/1350",
"render-tests/regressions/mapbox-gl-js#4573": "skip - https://github.com/mapbox/mapbox-gl-native/issues/1350",
"render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357",
"render-tests/regressions/mapbox-gl-native#9792": "skip - https://github.com/mapbox/mapbox-gl-native/issues/9792",
"render-tests/runtime-styling/paint-property-fill-flat-to-extrude": "skip - https://github.com/mapbox/mapbox-gl-native/issues/6745",
"render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude": "skip - needs issue",
"render-tests/runtime-styling/source-add-geojson-inline": "skip - needs issue",
Expand Down
6 changes: 5 additions & 1 deletion src/mbgl/tile/geometry_tile_worker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ void GeometryTileWorker::onImagesAvailable(ImageMap newImageMap) {
pendingImageDependencies.erase(it);
}
}
symbolLayoutsNeedPreparation = true;
symbolDependenciesChanged();
}

Expand Down Expand Up @@ -371,7 +372,9 @@ bool GeometryTileWorker::hasPendingSymbolDependencies() const {
return true;
}
}
return !pendingImageDependencies.empty();

// Attempt placement if at least one image is ready.
return imageMap.empty() && !pendingImageDependencies.empty();
}

void GeometryTileWorker::attemptPlacement() {
Expand All @@ -398,6 +401,7 @@ void GeometryTileWorker::attemptPlacement() {
imageMap, imageAtlas.positions);
}

imageMap.clear();
symbolLayoutsNeedPreparation = false;
}

Expand Down