Merge pull request #613 from Esri/v.next

ldanzinger · web-flow · commit 2f4e7e193526 · 2024-04-11T10:55:57.000-05:00
V.next
diff --git a/augmentedreality/Examples/CppArExample/CppArExample.pro b/augmentedreality/Examples/CppArExample/CppArExample.pro
@@ -35,7 +35,7 @@ equals(QT_MAJOR_VERSION, 6) {
   }
 }
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 HEADERS += \
diff --git a/augmentedreality/Examples/QmlArExample/QmlArExample.pro b/augmentedreality/Examples/QmlArExample/QmlArExample.pro
@@ -37,7 +37,7 @@ equals(QT_MAJOR_VERSION, 6) {
   }
 }
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/augmentedreality/README.md b/augmentedreality/README.md
@@ -84,7 +84,7 @@ for details.
 [ArcGIS Maps SDK for Qt Toolkit](https://github.com/Esri/arcgis-maps-sdk-toolkit-qt).
 
 3. In Qt Creator, create a new project and select the app template named
-"ArcGIS Maps 200.2.0 Qt Quick C++ app". Select the option "3D project" in the
+"ArcGIS Maps 200.4.0 Qt Quick C++ app". Select the option "3D project" in the
 "Details" dialog.
 
 4. In the newly created project, add the following lines anywhere in the app's project (`.pro`)
@@ -231,7 +231,7 @@ for details.
 
 2. Download the sources of the [ArcGIS Maps SDK for Qt Toolkit](https://github.com/Esri/arcgis-maps-sdk-toolkit-qt) from GitHub.
 
-3. In Qt Creator, create a new project and select "ArcGIS Maps 200.2.0 Qt Quick QML app".
+3. In Qt Creator, create a new project and select "ArcGIS Maps 200.4.0 Qt Quick QML app".
 Select the option "3D project" in the "Details" step.
 
 4. In the created project, add the following lines anywhere in the app's project
diff --git a/calcite-qml/demo/calcite_test.pro b/calcite-qml/demo/calcite_test.pro
@@ -23,7 +23,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick quickcontrols2
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/tests/uitools/cpp_quick/unit_tests/BasemapGalleryItemUnitTest/BasemapGalleryItemUnitTest.pro b/tests/uitools/cpp_quick/unit_tests/BasemapGalleryItemUnitTest/BasemapGalleryItemUnitTest.pro
@@ -27,7 +27,7 @@ QT += testlib
 QT -= gui
 QT += core gui opengl xml testlib network positioning sensors multimedia quick
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 
 include($$PWD/../arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitcpp.pri)
diff --git a/tests/uitools/qml_quick/functional_tests/FloorFilterControllerFuncTest/FloorFilterControllerFuncTest.pro b/tests/uitools/qml_quick/functional_tests/FloorFilterControllerFuncTest/FloorFilterControllerFuncTest.pro
@@ -16,7 +16,7 @@ CONFIG += c++17 warn_on qmltestcase
 
 TEMPLATE = app
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/../../shared/arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitqml.pri)
 
diff --git a/tests/uitools/qml_quick/functional_tests/FloorFilterFuncTest/FloorFilterFuncTest.pro b/tests/uitools/qml_quick/functional_tests/FloorFilterFuncTest/FloorFilterFuncTest.pro
@@ -16,7 +16,7 @@ CONFIG += c++17 warn_on qmltestcase
 
 TEMPLATE = app
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/../../shared/arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitqml.pri)
 
diff --git a/tests/uitools/qml_quick/unit_tests/FloorFilterControllerUnitTest/FloorFilterControllerUnitTest.pro b/tests/uitools/qml_quick/unit_tests/FloorFilterControllerUnitTest/FloorFilterControllerUnitTest.pro
@@ -16,7 +16,7 @@ CONFIG += c++17 warn_on qmltestcase
 
 TEMPLATE = app
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/../../shared/arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitqml.pri)
 
diff --git a/uitools/README.md b/uitools/README.md
@@ -47,7 +47,7 @@ project.
 A good way to start using the toolkit is to use one of the template apps which
 get added to QtCreator when you install the ArcGIS Runime SDK for Qt.
 
-- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.2.0 Quick QML App`
+- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.4.0 Quick QML App`
 - choose settings to match the platform etc. you are building for
 - in the `.pro` file of your new app, add a line to add the toolkit for your
   QML application. For example:
@@ -111,7 +111,7 @@ MapView {
 A good way to start using the toolkit is to use one of the template apps which
 get added to QtCreator when you install the ArcGIS Runime SDK for Qt.
 
-- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.2.0 Qt Quick C++ App`
+- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.4.0 Qt Quick C++ App`
 - choose settings to match the platform etc. you are building for
 - in the `.pro` file of your new app, add a line to add the library for your QML
   plugin - for example:
@@ -172,7 +172,7 @@ MapView {
 A good way to start using the toolkit is to use one of the template apps which
 get added to QtCreator when you install the ArcGIS Maps SDK for Qt.
 
-- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.2.0 Qt Widgets App`
+- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.4.0 Qt Widgets App`
 - choose settings to match the platform etc. you are building for
 - in the `.pro` file of your new app, add a line to add the library for your QML
   plugin - for example:
diff --git a/uitools/cpp/Esri/ArcGISRuntime/Toolkit/BasemapGalleryController.cpp b/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();
+                   });
                  }
                });
     }
diff --git a/uitools/cpp/Esri/ArcGISRuntime/Toolkit/BasemapGalleryController.h b/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:
diff --git a/uitools/examples/cpp_quick/cpp_quick.pro b/uitools/examples/cpp_quick/cpp_quick.pro
@@ -39,7 +39,7 @@ equals(QT_MAJOR_VERSION, 6) {
   }
 }
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 include($$PWD/../../toolkitcpp.pri)
 
diff --git a/uitools/examples/cpp_quick/src/demos/BasemapGalleryDemo.cpp b/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));
           });
 }
 
diff --git a/uitools/examples/qml_quick/qml_quick.pro b/uitools/examples/qml_quick/qml_quick.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.3.0
+ARCGIS_RUNTIME_VERSION = 200.4.0
 include($$PWD/arcgisruntime.pri)
 include($$PWD/../../toolkitqml.pri)
 
diff --git a/uitools/import/Esri/ArcGISRuntime/Toolkit/BasemapGallery.qml b/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.
      */
diff --git a/uitools/import/Esri/ArcGISRuntime/Toolkit/Controller/qmldir b/uitools/import/Esri/ArcGISRuntime/Toolkit/Controller/qmldir
@@ -15,7 +15,7 @@
 module Esri.ArcGISRuntime.Toolkit.Controller
 
 # Current version increment
-CurrentVersion 200.2 CurrentVersion.qml
+CurrentVersion 200.4 CurrentVersion.qml
 
 # Controller components
 AuthenticationController 100.10 AuthenticationController.qml
diff --git a/uitools/import/Esri/ArcGISRuntime/Toolkit/qmldir b/uitools/import/Esri/ArcGISRuntime/Toolkit/qmldir
@@ -14,10 +14,10 @@
 
 module Esri.ArcGISRuntime.Toolkit
 
-depends Esri.ArcGISRuntime.Toolkit.Controller 200.2
+depends Esri.ArcGISRuntime.Toolkit.Controller 200.4
 
 # Current version increment
-CurrentVersion 200.2 CurrentVersion.qml
+CurrentVersion 200.4 CurrentVersion.qml
 
 # View components
 AuthenticationView 100.10 AuthenticationView.qml
diff --git a/uitools/toolkit.qdocconf b/uitools/toolkit.qdocconf
@@ -16,7 +16,7 @@ project = EsriArcGISRuntimeToolkit
 
 description = Esri ArcGISRuntime Toolkit Documentation
 
-version = 200.2
+version = 200.4
 
 headers.fileextensions  = "*.h"
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ equals(QT_MAJOR_VERSION, 6) {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-ARCGIS_RUNTIME_VERSION = 200.3.0`
	`38`	`+ARCGIS_RUNTIME_VERSION = 200.4.0`
`39`	`39`	`include($$PWD/arcgisruntime.pri)`
`40`	`40`
`41`	`41`	`HEADERS += \`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ equals(QT_MAJOR_VERSION, 6) {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-ARCGIS_RUNTIME_VERSION = 200.3.0`
	`40`	`+ARCGIS_RUNTIME_VERSION = 200.4.0`
`41`	`41`	`include($$PWD/arcgisruntime.pri)`
`42`	`42`
`43`	`43`	`TEMPLATE = app`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ equals(QT_MAJOR_VERSION, 6) {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`-ARCGIS_RUNTIME_VERSION = 200.3.0`
	`42`	`+ARCGIS_RUNTIME_VERSION = 200.4.0`
`43`	`43`	`include($$PWD/arcgisruntime.pri)`
`44`	`44`	`include($$PWD/../../toolkitcpp.pri)`
`45`	`45`