Inserts again intermediate migration results to remote repo

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_analysis.cpp

@@ -16,7 +16,9 @@
 
 #include <AnalysisOverlay.h>
 #include <AnalysisListModel.h>
+#include <AnalysisOverlayListModel.h>
 #include <ExploratoryLocationViewshed.h>
+#include <Point.h>
 
 // Qt
 #include <QDebug>

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.cpp

@@ -27,19 +27,30 @@
 #include <GeoprocessingParameter.h>
 #include <GeoprocessingParameters.h>
 #include <GeoprocessingResult.h>
+#include <GeoprocessingTypes.h>
 #include <FeatureCollectionTable.h>
 #include <Feature.h>
 #include <SimpleMarkerSymbol.h>
 #include <SimpleFillSymbol.h>
+#include <SimpleLineSymbol.h>
+#include <SymbolTypes.h>
+#include <Point.h>
+#include <Polygon.h>
+#include <LinearUnit.h>
+#include <FeatureIterator.h>
+#include <AttributeListModel.h>
 
 #include <GeoprocessingLinearUnit.h>
 #include <ImageServiceRaster.h>
 #include <RasterLayer.h>
 #include <GeometryEngine.h>
+#include <GraphicListModel.h>
+#include <Field.h>
 
 // Qt
 #include <QDebug>
 #include <QMessageBox>
+#include <QUuid>
 
 
 namespace SituationMap
@@ -394,7 +405,14 @@ bool ViewshedGeoProcessing::processRasterResults(Esri::ArcGISRuntime::Geoprocess
 {
   DEBUG_LOG(m_logger) << LOGFUNCTION << " viewshedResultRaster -> url = " << viewshedResultRaster->url().toString();
 
-  connect(viewshedResultRaster, &Esri::ArcGISRuntime::GeoprocessingRaster::fetchFileCompleted, this, [this] (QUuid, const QString& filePath) {
+  QFuture<QString> future = viewshedResultRaster->fetchFileAsync(QStringLiteral("/tmp/viewshedFetched.tif"));
+  if (!future.isValid())
+  {
+    ERROR_LOG(m_logger) << LOGFUNCTION << " m_mapImpl failed";
+    return false;
+  }
+
+  future.then(this, [this] (const QString& filePath) {
     DEBUG_LOG(m_logger) << LOGFUNCTION << " filePath=" << filePath;
 
     Esri::ArcGISRuntime::Raster *raster = new Esri::ArcGISRuntime::Raster(filePath, this);
@@ -441,13 +459,6 @@ bool ViewshedGeoProcessing::processRasterResults(Esri::ArcGISRuntime::Geoprocess
     raster->load();
   });
 
-  QFuture<QString> future = viewshedResultRaster->fetchFileAsync(QStringLiteral("/tmp/viewshedFetched.tif"));
-  if (!future.isValid())
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " m_mapImpl failed";
-    return false;
-  }
-
   return true;
 }
 
@@ -484,7 +495,7 @@ void ViewshedGeoProcessing::createExtentGraphic(const Esri::ArcGISRuntime::Point
     m_resultsOverlay->graphics()->append(m_extentGraphic);
   }
 
-   const Esri::ArcGISRuntime::Polygon &circlePoly = Esri::ArcGISRuntime::GeometryEngine::buffer(origin, radius); // circlePoly.parts().part(0).pointCount(); -> 96
+   const Esri::ArcGISRuntime::Polygon &circlePoly = Esri::ArcGISRuntime::GeometryEngine::buffer(static_cast<const Esri::ArcGISRuntime::Geometry&>(origin), radius); // circlePoly.parts().part(0).pointCount(); -> 96
 
    m_extentGraphic->setGeometry(circlePoly);
 

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_geo_processing.h

@@ -14,6 +14,7 @@
 // ESRI
 #include <Map.h>
 #include <SpatialReference.h>
+#include <TaskTypes.h>
 
 
 // Qt

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/viewshed_impl.cpp

@@ -23,6 +23,12 @@
 
 #include "Rubberbands/rubberband_factory.h"
 
+// ESRI
+#include <LinearUnit.h>
+#include <AngularUnit.h>
+#include <GeometryEngine.h>
+#include <GeodeticDistanceResult.h>
+
 
 // Qt
 
@@ -707,8 +713,8 @@ void ViewshedImpl::onSightFanRb3DApply(RB::RubberbandBase *rbnd)
     Esri::ArcGISRuntime::Point geom2(coord.x(), coord.y(), sr);
 
     Esri::ArcGISRuntime::GeodeticDistanceResult geodeticDistanceResult = gEngine->distanceGeodetic(geom1, geom2,
-      Esri::ArcGISRuntime::LinearUnitId::Meters,
-      Esri::ArcGISRuntime::AngularUnitId::Degrees,
+      Esri::ArcGISRuntime::LinearUnit(Esri::ArcGISRuntime::LinearUnitId::Meters),
+      Esri::ArcGISRuntime::AngularUnit(Esri::ArcGISRuntime::AngularUnitId::Degrees),
       Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
 
     viewshedParameter.outerRadius = geodeticDistanceResult.distance();
@@ -860,8 +866,8 @@ void ViewshedImpl::onRb3DApply(RB::RubberbandBase *rbnd)
     Esri::ArcGISRuntime::Point geom2(coord.x(), coord.y(), sr);
 
     Esri::ArcGISRuntime::GeodeticDistanceResult geodeticDistanceResult = gEngine->distanceGeodetic(geom1, geom2,
-                                                            Esri::ArcGISRuntime::LinearUnitId::Meters,
-                                                            Esri::ArcGISRuntime::AngularUnitId::Degrees,
+                                                            Esri::ArcGISRuntime::LinearUnit(Esri::ArcGISRuntime::LinearUnitId::Meters),
+                                                            Esri::ArcGISRuntime::AngularUnit(Esri::ArcGISRuntime::AngularUnitId::Degrees),
                                                             Esri::ArcGISRuntime::GeodeticCurveType::Geodesic);
 
     viewshedParameter.outerRadius = geodeticDistanceResult.distance();