Andrewbladon/fix ogc feature service crash (#1273)

* Disable load buttons while loading in c++ sample * Disable load buttons while loading in Qml sample * Tan11389/ab/ogc feature service fix (#1275) * Update loading handlers in C++ * loading logic cleanup * remove unused member variable * Change name of loading QPROPERTY in c++ sample Co-authored-by: Tanner Yould <[email protected]>
Esri · Aug 11, 2021 · d9b2173 · d9b2173
1 parent a880b05
commit d9b2173
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/...SRuntimeSDKQt_CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.cpp b/...SRuntimeSDKQt_CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.cpp
@@ -98,6 +98,9 @@ void BrowseOGCAPIFeatureService::handleError(const Esri::ArcGISRuntime::Error& e
 
 void BrowseOGCAPIFeatureService::loadFeatureService(const QUrl& url)
 {
+  if (m_featureService && m_featureService->loadStatus() == LoadStatus::Loading)
+    return;
+
   clearExistingFeatureService();
 
   // Instantiate new OGCFeatureService object using url
@@ -109,6 +112,9 @@ void BrowseOGCAPIFeatureService::loadFeatureService(const QUrl& url)
   // Connect errorOccurred to handleError()
   connect(m_featureService, &OgcFeatureService::errorOccurred, this, &BrowseOGCAPIFeatureService::handleError);
 
+  // Connect to loadingChanged() to enable and disable UI buttons
+  connect(m_featureService, &OgcFeatureService::loadStatusChanged, this, &BrowseOGCAPIFeatureService::serviceOrFeatureLoadingChanged);
+
   m_featureService->load();
 }
 
@@ -125,6 +131,7 @@ void BrowseOGCAPIFeatureService::clearExistingFeatureService()
     delete m_featureService;
     m_featureService = nullptr;
   }
+
   m_featureCollectionList.clear();
   emit featureCollectionListChanged();
 }
@@ -187,6 +194,11 @@ void BrowseOGCAPIFeatureService::loadFeatureCollection(int selectedFeature)
 
   // Connect errorOccurred to handleError()
   connect(m_featureLayer, &FeatureLayer::errorOccurred, this, &BrowseOGCAPIFeatureService::handleError);
+
+  // Connect to loadingChanged() to enable and disable UI buttons
+  connect(m_featureLayer, &FeatureLayer::loadStatusChanged, this, &BrowseOGCAPIFeatureService::serviceOrFeatureLoadingChanged);
+
+  m_featureLayer->load();
 }
 
 void BrowseOGCAPIFeatureService::clearExistingFeatureLayer()
@@ -213,3 +225,14 @@ void BrowseOGCAPIFeatureService::addFeatureLayerToMap()
   m_map->operationalLayers()->clear();
   m_map->operationalLayers()->append(m_featureLayer);
 }
+
+bool BrowseOGCAPIFeatureService::serviceOrFeatureLoading() const
+{
+  if (m_featureService && m_featureService->loadStatus() == LoadStatus::Loading)
+    return true;
+
+  else if (m_featureLayer && m_featureLayer->loadStatus() == LoadStatus::Loading)
+    return true;
+
+  return false;
+}
diff --git a/ArcGISRuntimeSDKQt_CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h b/ArcGISRuntimeSDKQt_CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h
@@ -43,6 +43,7 @@ class BrowseOGCAPIFeatureService : public QObject
   Q_PROPERTY(QString errorMessage READ errorMessage WRITE setErrorMessage NOTIFY errorMessageChanged)
   Q_PROPERTY(QUrl featureServiceUrl READ featureServiceUrl NOTIFY urlChanged)
   Q_PROPERTY(QStringList featureCollectionList READ featureCollectionList NOTIFY featureCollectionListChanged)
+  Q_PROPERTY(bool serviceOrFeatureLoading READ serviceOrFeatureLoading NOTIFY serviceOrFeatureLoadingChanged)
 
 public:
   explicit BrowseOGCAPIFeatureService(QObject* parent = nullptr);
@@ -58,6 +59,7 @@ class BrowseOGCAPIFeatureService : public QObject
   void errorMessageChanged();
   void urlChanged();
   void featureCollectionListChanged();
+  void serviceOrFeatureLoadingChanged();
 
 private:
   Esri::ArcGISRuntime::MapQuickView* mapView() const;
@@ -73,6 +75,7 @@ class BrowseOGCAPIFeatureService : public QObject
   void createFeatureCollectionList();
   void clearExistingFeatureLayer();
   void addFeatureLayerToMap();
+  bool serviceOrFeatureLoading() const;
 
   Esri::ArcGISRuntime::Map* m_map = nullptr;
   Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr;

diff --git a/...SRuntimeSDKQt_CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml b/...SRuntimeSDKQt_CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml
@@ -65,6 +65,7 @@ Item {
                 Button {
                     id: connectButton
                     text: "Load service"
+                    enabled: !model.serviceOrFeatureLoading
                     onClicked: model.loadService(serviceURLBox.text);
 
                 }
@@ -78,6 +79,7 @@ Item {
                 Button {
                     id: loadLayerButton
                     text: "Load selected layer"
+                    enabled: !model.serviceOrFeatureLoading
                     onClicked: model.loadFeatureCollection(featureList.currentIndex);
                     Layout.columnSpan: 2
                     Layout.fillWidth: true

diff --git a/...SRuntimeSDKQt_QMLSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml b/...SRuntimeSDKQt_QMLSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml
@@ -78,6 +78,7 @@ Rectangle {
                 Button {
                     id: connectButton
                     text: "Load service"
+                    enabled: featureService.loadStatus !== Enums.LoadStatusLoading
                     onClicked: {
                         serviceURL = serviceURLBox.text;
                         loadFeatureService(serviceURL);
@@ -94,6 +95,7 @@ Rectangle {
                 Button {
                     id: loadLayerButton
                     text: "Load selected layer"
+                    enabled: featureLayer.loadStatus !== Enums.LoadStatusLoading
                     onClicked: loadFeatureCollection(featureCollectionListComboBox.currentIndex);
                     Layout.columnSpan: 2
                     Layout.fillWidth: true