Skip to content
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

Jump to bottom

Fix test app issues, add tests #2258

Merged
merged 10 commits into from
Apr 15, 2024
Merged

Fix test app issues, add tests #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b721f2f
Fix layout constraint error when showing a second map view.
TimSylvester Apr 10, 2024
0a76aa0
Add a test for all menu items
TimSylvester Apr 12, 2024
83b4c47
Allow "Add Route Line" and "Style Route Line With Gradient" to be run…
TimSylvester Apr 12, 2024
f6ed5e9
Prevent crashes on missing resources and layers
TimSylvester Apr 12, 2024
c0b31f3
Fix race condition when cancelling computed shape source
TimSylvester Apr 12, 2024
344fbb7
Improve JSON loading, enable some tests that work now
TimSylvester Apr 12, 2024
246f785
Fix crash when changing style while source update timer is active.
TimSylvester Apr 12, 2024
251ecf7
Wait for controllers to come up before trying to close them
TimSylvester Apr 12, 2024
f767984
Custom layers aren't mutually exclusive
TimSylvester Apr 12, 2024
655bf39
Mark the iOS UI test target "large" to avoid timeouts, rebase
TimSylvester Apr 12, 2024
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
8 changes: 6 additions & 2 deletions platform/darwin/src/MLNComputedShapeSource.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,12 @@ - (void)main {
featureCollection.push_back(geoJsonObject);
}
const auto geojson = mbgl::GeoJSON{featureCollection};
if(![self isCancelled] && self.rawSource) {
self.rawSource->setTileData(mbgl::CanonicalTileID(self.z, self.x, self.y), geojson);

// Note: potential race condition with `cancel`
if(![self isCancelled]) {
if (auto *rawSource = self.rawSource) {
rawSource->setTileData(mbgl::CanonicalTileID(self.z, self.x, self.y), geojson);
}
}
}
}
Expand Down
Loading
Loading