Support for BasemapGallery toolkit control to include 3D Basemaps #628

prathameshnarkhede · 2025-02-27T02:20:47Z

Added support for 3D Basemaps in Basemap Gallery for SceneView.
There is a 3D tag in UI to identify 3D basemaps available.
Added caching to store Basemaps to make switching GeoModel type easier.

WPF	WinUI/UWP	MAUI

Changed 3D basemap identification from Enum to boolean for simplified binding

…D basemaps

…wAppearanceSample`.

src/Toolkit/Toolkit.Maui/BasemapGallery/BasemapGallery.Appearance.cs

… image in Grid View.

src/Toolkit/Toolkit.Maui/BasemapGallery/BasemapGallery.Appearance.cs

src/Toolkit/Toolkit.WPF/UI/Controls/BasemapGallery/BasemapGallery.Theme.xaml

src/Toolkit/Toolkit.Maui/BasemapGallery/BasemapGallery.Appearance.cs

src/Toolkit/Toolkit.WinUI/UI/Controls/BasemapGallery/BasemapGallery.Theme.xaml

src/Toolkit/Toolkit.WinUI/Esri.ArcGISRuntime.Toolkit.WinUI.csproj

src/Toolkit/Toolkit/UI/Controls/BasemapGallery/BasemapGalleryController.cs

…from .Net 9

src/Toolkit/Toolkit.WPF/UI/Controls/BasemapGallery/BasemapGallery.Theme.xaml

src/Toolkit/Toolkit.WinUI/UI/Controls/BasemapGallery/BasemapGallery.Theme.xaml

src/Toolkit/Toolkit/UI/Controls/BasemapGallery/BasemapGalleryController.cs

…r handling improvements

src/Toolkit/Toolkit.Maui/BasemapGallery/BasemapGallery.Appearance.cs

src/Toolkit/Toolkit.WinUI/UI/Controls/BasemapGallery/BasemapGallery.Theme.xaml

prathameshnarkhede · 2025-03-19T17:58:39Z

src/Samples/Toolkit.SampleApp.UWP/Samples/BasemapGallery/BasemapGalleryAppearanceSample.xaml

            <toolkit:BasemapGallery
                x:Name="Gallery"
-                Width="{x:Bind WidthSlider.Value}"
+                Width="{x:Bind WidthSlider.Value, Mode=OneWay}"


Added Mode to One way to fix Width slider in WinUI and UWP.

prathameshnarkhede · 2025-03-19T18:04:10Z

src/Toolkit/Toolkit.Maui/BasemapGallery/BasemapGallery.Appearance.cs

+            Grid thumbnailGrid = new Grid() { WidthRequest = 64, HeightRequest = 64 };
+            Image thumbnail = new Image { Aspect = Aspect.AspectFill, BackgroundColor = Colors.Transparent, HorizontalOptions = LayoutOptions.Center };
+            Border itemTypeBorder = new Border
+            {
+                StrokeShape = new RoundRectangle { CornerRadius = new CornerRadius(7) },
+                Padding = new Thickness(4, 0),
+                Margin = new Thickness(2),
+                HorizontalOptions = LayoutOptions.End,
+                VerticalOptions = LayoutOptions.Start,
+            };
+            itemTypeBorder.SetAppThemeColor(BackgroundColorProperty, Colors.LightGray, Colors.DarkGray);
+            Grid.SetRow(itemTypeBorder, 1);
+
+            Label itemTypeLabel = new Label
+            {
+                Text = "3D",
+                Margin = new Thickness(1),
+                HorizontalTextAlignment = TextAlignment.Center,
+                FontSize = 9,
+                FontAttributes = FontAttributes.Bold
+            };
+            itemTypeLabel.SetAppThemeColor(Label.TextColorProperty, Colors.Black, Colors.White);
+            itemTypeBorder.Content = itemTypeLabel;
+            itemTypeBorder.SetBinding(Border.IsVisibleProperty, static (BasemapGalleryItem item) => item.Is3D, BindingMode.OneWay);
+
+            thumbnailGrid.Children.Add(thumbnail);
+            thumbnailGrid.Children.Add(itemTypeBorder);
+


Here we added the Type of the Basemap (3D) identifier as seen in screenshot and unified thumbnail in a Grid

prathameshnarkhede · 2025-03-19T18:05:48Z

src/Toolkit/Toolkit.Maui/BasemapGallery/BasemapGallery.Appearance.cs

+        {
+            // Special template to take advantage of negative margin support on iOS, Mac
+
+            Border border = new Border
+            {
+                Padding = new Thickness(0),
+#if __IOS__
+                StrokeThickness = 8,
+#else
+                StrokeThickness = 1,
+#endif
+                StrokeShape = new Rectangle(),
+            };


Here, we just moved the code at bottom and maintained same structure as Grid View of BasemapGallery

prathameshnarkhede · 2025-03-19T18:10:28Z

src/Toolkit/Toolkit/UI/Controls/BasemapGallery/BasemapGalleryController.cs

+        private async Task<ObservableCollection<BasemapGalleryItem>> LoadBasemapGalleryItems(ArcGISPortal portal, CancellationToken cancellationToken = default)
        {
-            ArcGISPortal defaultPortal = await ArcGISPortal.CreateAsync(cancellationToken);
-
-            var results = await defaultPortal.GetDeveloperBasemapsAsync(cancellationToken);
-
-            var listOfBasemaps = new List<BasemapGalleryItem>();
-
-            foreach (var basemap in results)
+            async Task<List<BasemapGalleryItem>> LoadBasemapsAsync(Func<CancellationToken, Task<IEnumerable<Basemap>>> getBasemapsFunc)
            {
-                listOfBasemaps.Add(new BasemapGalleryItem(basemap));
+                var basemaps = await getBasemapsFunc(cancellationToken);
+                var basemapItems = basemaps.Select(basemap => new BasemapGalleryItem(basemap)).ToList();
+                foreach (var item in basemapItems)
+                {
+                    _ = item.LoadAsync();
+                }
+                return basemapItems;
            }
+            var basemapGalleryItems = new List<BasemapGalleryItem>();

-            foreach (var item in listOfBasemaps)
+            if (portal.PortalInfo?.Use3DBasemaps is true && GeoModel is Scene)
            {
-                _ = item.LoadAsync();
+                _cached3DBasemaps ??= await LoadBasemapsAsync(portal.Get3DBasemapsAsync);
+                basemapGalleryItems.AddRange(_cached3DBasemaps);
            }
-            return new ObservableCollection<BasemapGalleryItem>(listOfBasemaps);
+
+            _cached2DBasemaps ??= await LoadBasemapsAsync(portal.PortalInfo?.UseVectorBasemaps ?? false
+                    ? portal.GetVectorBasemapsAsync
+                    : portal.GetBasemapsAsync);
+            basemapGalleryItems.AddRange(_cached2DBasemaps);
+
+            return new ObservableCollection<BasemapGalleryItem>(basemapGalleryItems);


This is the effort to reduce redundant code and unify Loading of Basemaps based on type of GeoModel, caching and support to 3D basemaps

prathameshnarkhede · 2025-03-19T18:11:45Z

src/Toolkit/Toolkit/UI/Controls/BasemapGallery/BasemapGalleryController.cs

-        public async Task LoadFromDefaultPortal()
-        {
-            IsLoading = true;
-            _loadCancellationTokenSource = new CancellationTokenSource();
-            try
-            {
-                AvailableBasemaps = await PopulateFromDefaultList(_loadCancellationTokenSource.Token);
-            }
-            catch (OperationCanceledException)
-            { }
-            finally
-            {
-                IsLoading = false;
-            }
-        }
-


This code has been moved close to its invocation and implementation here.

prathameshnarkhede · 2025-03-19T18:15:06Z

src/Toolkit/Toolkit/UI/Controls/BasemapGallery/BasemapGalleryItem.cs

+        /// <summary>
+        /// Gets a value indicating whether this basemap is a 3D basemap.
+        /// </summary>
+        public bool Is3D => this.Basemap?.BaseLayers?.OfType<ArcGISSceneLayer>()?.Any() ?? false;
+


This property is used to bind the visibility of 3D tag on basemap.

jnery

LGTM, thanks 👍 Great job, big PR 👏

* Set version to 200.7 Compile WinUI with AoT support * Order sample collection * Add AoT support to Basemap Gallery * Add x:Bind expressions to sample pages * Add xaml generation to winui * project settings cleanup * Avoid use of implicit datacontext bindings Use relative source or code-behind whenever possible * Rewrites several parts of the SearchView to make it AoT compatible in WinUI (#620) * Rewrites several parts of the SearchView to make it AoT compatible in WinUI * Merge main to v.next (#623) * Update BookmarksView template to use StackLayout and Labels to adapt new CollectionView. (#621) * Add XML namespace and data binding in SymbolEditorSample to resolve bug with Angle property not being refresh in MAUI Android. (#622) * Fix maui version * Remove unused dependency * Update WinUI AoT table * Fix preview in compatibility table * Add built-in barcode scanning (#615) * Add support for built-in iOS barcode scanner * Add Windows support to barcode scanner * Adding barcode scanner to Android (#624) * Adding barcode scanner to Android * Improve windows scanning performance by just using default scanner Improves scanner launch time from ~40s to 1-2s due to a poor/ineffecient device selector string. * Update ios/catalyst target to 18.0 to match default ios tfm * Fix warnings in Android introduced by transitive packages by locking in the dependent version minimums * Fix indents * Support for BasemapGallery toolkit control to include 3D Basemaps (#628) * Add 3D Basemap Gallery support in WPF and BasemapGalleryItem * Add 3D basemap support to BasemapGallery in UWP, WinUI and MAUI Changed 3D basemap identification from Enum to boolean for simplified binding * Added condition to check if `GeoModel` is a `Scene` before fetching 3D basemaps * Renamed `BasemapGallery3DAppearanceSample` to `BasemapGallerySceneViewAppearanceSample`. * Consolidated Basemap fetching methods * Refactor BasemapGalleryItem to dynamically determine Is3D * Refactored 3D tag in BasemapGallery to sta on top right corner of the image in Grid View. * Introduce caching for basemaps in BasemapGalleryController * Update src/Toolkit/Toolkit.WinUI/Esri.ArcGISRuntime.Toolkit.WinUI.csproj * Update bindings to use static lambdas for type safety as new feature from .Net 9 * Reverted binding style for private set properties * Revert Margin in Basemap Gallery Item * Fixing bug in BasemapGallery loading * Restore styling for basemapgallery * Refactor basemap loading to be fully asynchronous * Refactor basemap loading and update visibility handling * Update BasemapGallery itemTypeBorder to theme-based color * Add one-way binding to fix the width sldier in WinUI and UWP and error handling improvements * Refactor loading state handling in BasemapGalleryController * Refactor basemap update logic in BasemapGallery * Enhance theme management in BasemapGallery * Disable aot Several controls are still not AoT compatible * Enhance basemap loading with async task management caching (#631) * Enhance basemap loading with async task management caching - Introduces Task caching mechanism to manage asynchronous loading of basemap gallery items. - Updates `LoadBasemapGalleryItems` to check for ongoing tasks, preventing multiple concurrent loads. * Refactor basemap loading and portal change handling * Refactor basemap handling on portal changes. Restored `HandlePortalChanged` to manage portal changed event including cache invalidation and asynchronous basemap updates. Added invalidating of cache on `AvailableBasemaps` assigned manually. * Skip rendering unknown feature form element types * Skip rendering unknown popup element types * Mac Catalyst min version is 15 * Fix expired app certificate --------- Co-authored-by: Prathamesh Narkhede <[email protected]> Co-authored-by: Prathamesh Narkhede <[email protected]> Co-authored-by: Morten Nielsen <[email protected]>

… 9 (#630) * Set version to 200.7 Compile WinUI with AoT support * Order sample collection * Add AoT support to Basemap Gallery * Add x:Bind expressions to sample pages * Add xaml generation to winui * project settings cleanup * Avoid use of implicit datacontext bindings Use relative source or code-behind whenever possible * Rewrites several parts of the SearchView to make it AoT compatible in WinUI (#620) * Rewrites several parts of the SearchView to make it AoT compatible in WinUI * Merge main to v.next (#623) * Update BookmarksView template to use StackLayout and Labels to adapt new CollectionView. (#621) * Add XML namespace and data binding in SymbolEditorSample to resolve bug with Angle property not being refresh in MAUI Android. (#622) * Fix maui version * Remove unused dependency * Update WinUI AoT table * Fix preview in compatibility table * Add built-in barcode scanning (#615) * Add support for built-in iOS barcode scanner * Add Windows support to barcode scanner * Adding barcode scanner to Android (#624) * Adding barcode scanner to Android * Improve windows scanning performance by just using default scanner Improves scanner launch time from ~40s to 1-2s due to a poor/ineffecient device selector string. * Update ios/catalyst target to 18.0 to match default ios tfm * Fix warnings in Android introduced by transitive packages by locking in the dependent version minimums * Fix indents * Support for BasemapGallery toolkit control to include 3D Basemaps (#628) * Add 3D Basemap Gallery support in WPF and BasemapGalleryItem * Add 3D basemap support to BasemapGallery in UWP, WinUI and MAUI Changed 3D basemap identification from Enum to boolean for simplified binding * Added condition to check if `GeoModel` is a `Scene` before fetching 3D basemaps * Renamed `BasemapGallery3DAppearanceSample` to `BasemapGallerySceneViewAppearanceSample`. * Consolidated Basemap fetching methods * Refactor BasemapGalleryItem to dynamically determine Is3D * Refactored 3D tag in BasemapGallery to sta on top right corner of the image in Grid View. * Introduce caching for basemaps in BasemapGalleryController * Update src/Toolkit/Toolkit.WinUI/Esri.ArcGISRuntime.Toolkit.WinUI.csproj * Update bindings to use static lambdas for type safety as new feature from .Net 9 * Reverted binding style for private set properties * Revert Margin in Basemap Gallery Item * Fixing bug in BasemapGallery loading * Restore styling for basemapgallery * Refactor basemap loading to be fully asynchronous * Refactor basemap loading and update visibility handling * Update BasemapGallery itemTypeBorder to theme-based color * Add one-way binding to fix the width sldier in WinUI and UWP and error handling improvements * Refactor loading state handling in BasemapGalleryController * Refactor basemap update logic in BasemapGallery * Enhance theme management in BasemapGallery * Updated MAUI bindings to use new Compiled Bindings introduced in .Net 9 * Correcting data bindings and tested the code. Removed CodeAnalysis Dynamic Dependencies * Remove unused directives and dependencies in FloorFilter * Remove DynamicDependency attributes and update to correct bindings * Corrected bindings for FormAttachment * Corrected Attachment binding for AttachmentsFormElementView * Fix tooltip binding in AttachmentsFormElementView * Refactor binding expressions for type safety * Refactor popup element bindings for clarity * Refactor element parameter types in bindings to its base type * Update Picker IsEnabled binding in ComboBoxFormInputView to point source to TemplatedParent * Remove AOT compilation from project configuration --------- Co-authored-by: dotMorten <[email protected]> Co-authored-by: Morten Nielsen <[email protected]> Co-authored-by: dotMorten <[email protected]>

Add 3D Basemap Gallery support in WPF and BasemapGalleryItem

7567432

prathameshnarkhede self-assigned this Feb 27, 2025

prathameshnarkhede added 4 commits February 27, 2025 12:30

Add 3D basemap support to BasemapGallery in UWP, WinUI and MAUI

4c14393

Changed 3D basemap identification from Enum to boolean for simplified binding

Added condition to check if GeoModel is a Scene before fetching 3…

bceb6a3

…D basemaps

Renamed BasemapGallery3DAppearanceSample to `BasemapGallerySceneVie…

dd83807

…wAppearanceSample`.

Consolidated Basemap fetching methods

88b9296

prathameshnarkhede requested review from dotMorten and mstefarov February 27, 2025 22:36

prathameshnarkhede marked this pull request as ready for review February 27, 2025 22:36

prathameshnarkhede changed the base branch from main to v.next February 27, 2025 22:39

prathameshnarkhede commented Feb 27, 2025

View reviewed changes

src/Toolkit/Toolkit.Maui/BasemapGallery/BasemapGallery.Appearance.cs Show resolved Hide resolved

prathameshnarkhede added 3 commits February 27, 2025 15:32

Refactor BasemapGalleryItem to dynamically determine Is3D

d5298a5

Refactored 3D tag in BasemapGallery to sta on top right corner of the…

ed5edbd

… image in Grid View.

Introduce caching for basemaps in BasemapGalleryController

ba14de8

dotMorten reviewed Mar 4, 2025

View reviewed changes

prathameshnarkhede and others added 7 commits March 4, 2025 12:17

Update src/Toolkit/Toolkit.WinUI/Esri.ArcGISRuntime.Toolkit.WinUI.csproj

9de0da1

Update bindings to use static lambdas for type safety as new feature …

dcaed50

…from .Net 9

Reverted binding style for private set properties

c194240

Revert Margin in Basemap Gallery Item

4358565

Fixing bug in BasemapGallery loading

e86f2e3

Restore styling for basemapgallery

009dc01

Refactor basemap loading to be fully asynchronous

94dddb4

prathameshnarkhede requested a review from dotMorten March 6, 2025 00:07

dotMorten reviewed Mar 6, 2025

View reviewed changes

Refactor basemap loading and update visibility handling

b884fe3

prathameshnarkhede requested a review from dotMorten March 6, 2025 01:24

Update BasemapGallery itemTypeBorder to theme-based color

9ca2ffd

mstefarov reviewed Mar 8, 2025

View reviewed changes

prathameshnarkhede added 2 commits March 10, 2025 10:17

Add one-way binding to fix the width sldier in WinUI and UWP and erro…

bffa7aa

…r handling improvements

Refactor loading state handling in BasemapGalleryController

0967132

Refactor basemap update logic in BasemapGallery

35741ff

prathameshnarkhede requested a review from mstefarov March 11, 2025 00:08

mstefarov approved these changes Mar 11, 2025

View reviewed changes

dotMorten reviewed Mar 17, 2025

View reviewed changes

Enhance theme management in BasemapGallery

97dbb3c

prathameshnarkhede requested review from dotMorten and jnery March 17, 2025 22:20

prathameshnarkhede commented Mar 19, 2025

View reviewed changes

jnery approved these changes Mar 19, 2025

View reviewed changes

prathameshnarkhede merged commit 75c9bbe into v.next Mar 19, 2025

prathameshnarkhede deleted the pratham/3d-basemapgallery branch March 19, 2025 18:40

Support for BasemapGallery toolkit control to include 3D Basemaps #628

Support for BasemapGallery toolkit control to include 3D Basemaps #628

Uh oh!

Conversation

prathameshnarkhede commented Feb 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

prathameshnarkhede Mar 19, 2025

Choose a reason for hiding this comment

Uh oh!

prathameshnarkhede Mar 19, 2025

Choose a reason for hiding this comment

Uh oh!

prathameshnarkhede Mar 19, 2025

Choose a reason for hiding this comment

Uh oh!

prathameshnarkhede Mar 19, 2025

Choose a reason for hiding this comment

Uh oh!

prathameshnarkhede Mar 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

prathameshnarkhede Mar 19, 2025

Choose a reason for hiding this comment

Uh oh!

jnery left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

prathameshnarkhede commented Feb 27, 2025 •

edited

Loading

prathameshnarkhede Mar 19, 2025 •

edited

Loading

jnery left a comment •

edited

Loading