Skip to content

BugFix: Fixing BasemapGallery Sceneview appears blank sometimes. #660

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

Merged
merged 10 commits into from
Jul 1, 2025
Merged

BugFix: Fixing BasemapGallery Sceneview appears blank sometimes. #660

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b8047ea
Fixing BasemapGallery Sceneview appears blank sometimes.
prathameshnarkhede Jun 12, 2025
edf8b23
Using Async Await in foreach block
prathameshnarkhede Jun 13, 2025
795bbe4
Introduced a semaphore for thread-safe access to UpdateBasemaps. This…
prathameshnarkhede Jun 13, 2025
b502261
Refactor UpdateBasemaps for better error handling
prathameshnarkhede Jun 18, 2025
a6b71c2
Modified `UpdateBasemaps` to attempt semaphore entry without waiting.
prathameshnarkhede Jun 20, 2025
5db8985
Adding missing space
prathameshnarkhede Jun 20, 2025
861dcdf
Removing Redundant code
prathameshnarkhede Jun 20, 2025
d2f88b9
Removing redundant method nesting
prathameshnarkhede Jun 20, 2025
ef2b614
Moving logic away from SemaphoreSlim and using pending boolean locks …
prathameshnarkhede Jun 28, 2025
452a3aa
Removed the _isUpdatingBasemaps variable and replaced it with the IsL…
prathameshnarkhede Jun 30, 2025
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
45 changes: 24 additions & 21 deletions src/Toolkit/Toolkit/UI/Controls/BasemapGallery/BasemapGalleryController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,20 +197,34 @@ private async Task HandlePortalChanged()
await UpdateBasemaps();
}

private bool _pendingUpdateBasemaps;

public async Task UpdateBasemaps()
{
_pendingUpdateBasemaps = true;
if (IsLoading)
return;

IsLoading = true;
// Cancel any pending load before starting a new one
_loadCancellationTokenSource?.Cancel();
_loadCancellationTokenSource = new CancellationTokenSource();
try
{
_availableBasemaps = await PopulateBasemaps(_loadCancellationTokenSource.Token);
HandleAvailableBasemapsChanged();
}
catch (Exception ex)
{
System.Diagnostics.Trace.WriteLine(ex.Message);
while (_pendingUpdateBasemaps)
{
_pendingUpdateBasemaps = false;

_loadCancellationTokenSource?.Cancel();
_loadCancellationTokenSource = new CancellationTokenSource();
try
{
_availableBasemaps = await PopulateBasemaps(_loadCancellationTokenSource.Token);
HandleAvailableBasemapsChanged();
}
catch (OperationCanceledException) { }
catch (Exception ex)
{
System.Diagnostics.Trace.WriteLine(ex.Message);
}
}
}
finally
{
Expand Down Expand Up @@ -284,18 +298,7 @@ private static bool BasemapIsActuallyNotABasemap(Basemap input)
return await LoadBasemapGalleryItems(Portal, cancellationToken);
}

private Task<ObservableCollection<BasemapGalleryItem>> LoadBasemapGalleryItems(ArcGISPortal portal, CancellationToken cancellationToken = default)
{
if (_loadBasemapGalleryItemsTask is null || _loadBasemapGalleryItemsTask.IsCompleted)
{
_loadBasemapGalleryItemsTask = LoadBasemapGalleryItemsInternal(portal, cancellationToken);
return _loadBasemapGalleryItemsTask;
}

return _loadBasemapGalleryItemsTask;
}

private async Task<ObservableCollection<BasemapGalleryItem>> LoadBasemapGalleryItemsInternal(ArcGISPortal portal, CancellationToken cancellationToken = default)
private async Task<ObservableCollection<BasemapGalleryItem>> LoadBasemapGalleryItems(ArcGISPortal portal, CancellationToken cancellationToken = default)
{
async Task<List<BasemapGalleryItem>> LoadBasemapsAsync(Func<CancellationToken, Task<IEnumerable<Basemap>>> getBasemapsFunc)
{
Expand Down
Loading