Merge pull request #608 from Esri/bri12415/QFuturizePortal

QFuturize toolkit portal API usage

Author: bri12415

uitools/cpp/Esri/ArcGISRuntime/Toolkit/BasemapGalleryController.cpp

@@ -34,6 +34,7 @@
 #include <SpatialReference.h>
 
 // Qt headers
+#include <QFuture>
 #include <QPersistentModelIndex>
 #include <QPointer>
 
@@ -240,29 +241,29 @@ namespace Esri::ArcGISRuntime::Toolkit {
 
     /*!
       \internal
-      Calls Portal::fetchDeveloperBasemaps on the portal. Note that we do
-      not call Portal::fetchBasemaps. The former call is for retrieving the modern API-key
+      Calls Portal::fetchDeveloperBasemapsAsync on the portal. Note that we do
+      not call Portal::fetchBasemapsAsync. The former call is for retrieving the modern API-key
       metered basemaps, while the latter returns older-style basemaps. The latter is required
       only when the user applies a custom portal, as it is also the call for retrieving an
       enterprises's custom basemaps if set.
      */
     void setToDefaultBasemaps(BasemapGalleryController* self, Portal* portal)
     {
-      // For every "discovered" basemap we add it to our gallery.
-      QObject::connect(
-          portal, &Portal::developerBasemapsChanged, self, [portal, self]()
-          {
-            BasemapListModel* basemaps = portal->developerBasemaps();
-
-            sortBasemapsAndAddToGallery(self, basemaps);
-          });
-
       // Load the portal and kick-off the group discovery.
-      QObject::connect(portal, &Portal::doneLoading, self, [portal](Error e)
+      QObject::connect(portal, &Portal::doneLoading, self, [portal, self](Error e)
                        {
                          if (!e.isEmpty())
                            return;
-                         portal->fetchDeveloperBasemaps();
+
+                         portal->fetchDeveloperBasemapsAsync().then(
+                         [portal, self]()
+                         {
+                           // Sort and append the basemaps to the gallery.
+                           BasemapListModel* basemaps = portal->developerBasemaps();
+                           sortBasemapsAndAddToGallery(self, basemaps);
+                           // Notify the demo that the basemaps have changed.
+                           emit self->basemapsChanged();
+                         });
                        });
       portal->load();
     }
@@ -411,7 +412,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
     \brief Sets the current portal. This resets the gallery.
 
     When \a portal is set, the basemaps of the Portal
-    are fetched via \c{Portal::fetchBasemaps}.
+    are fetched via \c{Portal::fetchBasemapsAsync}.
 
     This is useful for displaying an organization's basemaps or to display a gallery of the old-style basemaps
     (which do not require an API key or named user.)
@@ -457,13 +458,13 @@ namespace Esri::ArcGISRuntime::Toolkit {
                  }
                  else
                  {
-                   connect(m_portal, &Portal::basemapsChanged, this, [this]
-                           {
-                             BasemapListModel* basemaps = m_portal->basemaps();
-
-                             sortBasemapsAndAddToGallery(this, basemaps);
-                           });
-                   m_portal->fetchBasemaps();
+                   m_portal->fetchBasemapsAsync().then(
+                   [this]()
+                   {
+                     BasemapListModel* basemaps = m_portal->basemaps();
+                     sortBasemapsAndAddToGallery(this, basemaps);
+                     emit basemapsChanged();
+                   });
                  }
                });
     }

uitools/cpp/Esri/ArcGISRuntime/Toolkit/BasemapGalleryController.h

@@ -72,6 +72,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
   signals:
     void geoModelChanged();
     void portalChanged();
+    void basemapsChanged();
     void currentBasemapChanged();
 
   private:

uitools/examples/cpp_quick/src/demos/BasemapGalleryDemo.cpp

@@ -33,21 +33,17 @@ BasemapGalleryDemo::BasemapGalleryDemo(QObject* parent) :
   auto portal = m_controller->portal();
   // Once the portal has loaded up basemaps. Choose the first available basemap from the model
   // and apply it to our active view.
-  connect(portal, &Portal::developerBasemapsChanged, this,
+  connect(m_controller, &Toolkit::BasemapGalleryController::basemapsChanged, this,
           [this, portal]
           {
-            if (portal->developerBasemaps()->size() > 0)
-            {
-              auto basemap = portal->developerBasemaps()->at(0);
-              if (geoView()->geoViewType() == GeoViewType::MapView)
-              {
-                setGeoModel(new Map(basemap, this));
-              }
-              else if (geoView()->geoViewType() == GeoViewType::SceneView)
-              {
-                setGeoModel(new Scene(basemap, this));
-              }
-            }
+            if (!portal->developerBasemaps() || portal->developerBasemaps()->isEmpty())
+              return;
+
+            auto basemap = portal->developerBasemaps()->at(0);
+            if (geoView()->geoViewType() == GeoViewType::MapView)
+              setGeoModel(new Map(basemap, this));
+            else if (geoView()->geoViewType() == GeoViewType::SceneView)
+              setGeoModel(new Scene(basemap, this));
           });
 }
 

uitools/import/Esri/ArcGISRuntime/Toolkit/BasemapGallery.qml

@@ -77,7 +77,7 @@ Pane {
     /*!
        \qmlproperty Portal portal
        \brief The \c Portal contains basemaps which will be fetched and displayed in the gallery if applicable.
-       When a valid Portal is set then `Portal.fetchBasemaps` is immediately called.
+       When a valid Portal is set then `Portal.fetchBasemapsAsync` is immediately called.
 
        Note: Changing the current active portal will reset the contents of the gallery.
      */