Inserts again intermediate migration results to remote repo

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/abstract_graphical_object.cpp

@@ -16,6 +16,12 @@
 #include <Graphic.h>
 #include <GraphicsOverlay.h>
 #include <Multipart.h>
+#include <GraphicListModel.h>
+#include <AttributeListModel.h>
+#include <ImmutablePartCollection.h>
+#include <ImmutablePart.h>
+#include <SpatialReference.h>
+#include <SymbolTypes.h>
 
 
 // Qt
@@ -87,7 +93,7 @@ AbstractGraphicalObject::~AbstractGraphicalObject()
 
     auto graphicCopy = m_graphic;
 
-    QObject::connect (m_graphicsLayer->graphics(), &Esri::ArcGISRuntime::GraphicListModel::graphicRemoved,
+    QObject::connect (m_graphicsLayer->graphics(), &Esri::ArcGISRuntime::GraphicListModel::itemRemoved,
                       m_graphic, [idx, graphicCopy](int index)
     {
       if (idx == index)

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_attributes.cpp

@@ -16,6 +16,10 @@
 // ESRI
 #include <Map.h>
 #include <GraphicsOverlay.h>
+#include <Graphic.h>
+#include <Geometry.h>
+#include <Point.h>
+#include <AttributeListModel.h>
 
 // Qt
 

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_cube.cpp

@@ -14,6 +14,10 @@
 // ESRI
 #include <GraphicsOverlay.h>
 #include <PolygonBuilder.h>
+#include <Graphic.h>
+#include <SpatialReference.h>
+#include <Geometry.h>
+#include <Polygon.h>
 
 
 // Qt

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_ellipse.cpp

@@ -17,6 +17,12 @@
 #include <GeometryEngine.h>
 #include <SimpleLineSymbol.h>
 #include <SimpleFillSymbol.h>
+#include <GeodesicEllipseParameters.h>
+#include <Graphic.h>
+#include <SpatialReference.h>
+#include <Point.h>
+#include <ImmutablePart.h>
+#include <ImmutablePartCollection.h>
 
 
 // Qt
@@ -162,7 +168,7 @@ void GraphicalObjectEllipse::parameterToInternal()
   Esri::ArcGISRuntime::Point mapPoint(origin.x(), origin.y(), origin.z(), spatialReference());  // center of ellipse
 
   Esri::ArcGISRuntime::Point normalizedPt =
-    Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(mapPoint);
+    static_cast<Esri::ArcGISRuntime::Point>(Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(mapPoint));
   m_internalParameters->setCenter(normalizedPt);
   //  m_internalParameters->setCenter(mapPoint);
 
@@ -269,7 +275,7 @@ bool GraphicalObjectEllipse::createCirclePolygon(const Esri::ArcGISRuntime::Poin
   const Esri::ArcGISRuntime::Point &mapPoint = originMap;  // center of ellipse
 
   Esri::ArcGISRuntime::Point normalizedPt =
-    Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(mapPoint);
+    static_cast<Esri::ArcGISRuntime::Point>(Esri::ArcGISRuntime::GeometryEngine::normalizeCentralMeridian(mapPoint));
   ePara.setCenter(normalizedPt);
 
   // 3, 4

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_model_scene_marker.cpp

@@ -15,6 +15,12 @@
 // ESRI
 #include <GraphicsOverlay.h>
 #include <ModelSceneSymbol.h>
+#include <Graphic.h>
+#include <SpatialReference.h>
+#include <Point.h>
+
+// Local
+#include <Map/point3D.h>
 
 
 // Qt

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_multi_path.cpp

@@ -19,6 +19,13 @@
 #include <SimpleFillSymbol.h>
 #include <GeoView.h>
 #include <GeometryEngine.h>
+#include <Graphic.h>
+#include <SpatialReference.h>
+#include <Part.h>
+#include <PartCollection.h>
+#include <Polyline.h>
+#include <Polygon.h>
+#include <Geometry.h>
 
 
 // Qt

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_path.cpp

@@ -19,6 +19,12 @@
 #include <SimpleFillSymbol.h>
 #include <GeoView.h>
 #include <GeometryEngine.h>
+#include <SpatialReference.h>
+#include <Polyline.h>
+#include <Polygon.h>
+#include <Graphic.h>
+#include <LinearUnit.h>
+#include <AngularUnit.h>
 
 // Qt
 
@@ -220,7 +226,15 @@ bool GraphicalObjectPath::updateViewImpl()
   break;
   } // switch
 
-  const int count = AbstractGraphicalObject::countOfPolygonFirstPart(m_graphic->geometry());
+  // Cast geometry to Multipart for vertex count check
+  const Esri::ArcGISRuntime::Geometry geom = m_graphic->geometry();
+  const Esri::ArcGISRuntime::Multipart* multipart = nullptr;
+  if (geom.geometryType() == Esri::ArcGISRuntime::GeometryType::Polyline)
+    multipart = static_cast<const Esri::ArcGISRuntime::Polyline*>(&geom);
+  else if (geom.geometryType() == Esri::ArcGISRuntime::GeometryType::Polygon)
+    multipart = static_cast<const Esri::ArcGISRuntime::Polygon*>(&geom);
+
+  const int count = multipart ? AbstractGraphicalObject::countOfPolygonFirstPart(*multipart) : 0;
   if (count > 1000)
     WARNING_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << m_debugInfo << "'"
                         << ", huge amount of vertices, countOfPolygonFirstPart = " << count;

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_picture_marker.cpp

@@ -18,6 +18,11 @@
 #include <PictureMarkerSymbol.h>
 #include <SimpleMarkerSymbol.h>
 #include <MultipointBuilder.h>
+#include <Point.h>
+#include <Graphic.h>
+#include <SpatialReference.h>
+#include <PointCollection.h>
+#include <Geometry.h>
 
 
 // Qt

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_range.cpp

@@ -16,6 +16,13 @@
 #include <PolygonBuilder.h>
 #include <MultipartBuilder.h>
 #include <ImmutablePartCollection.h>
+#include <Polygon.h>
+#include <Part.h>
+#include <PartCollection.h>
+#include <ImmutablePart.h>
+#include <Point.h>
+#include <Graphic.h>
+#include <SpatialReference.h>
 
 
 // Qt

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.cpp

@@ -15,6 +15,9 @@
 // ESRI
 #include <GraphicsOverlay.h>
 #include <ModelSceneSymbol.h>
+#include <Graphic.h>
+#include <SpatialReference.h>
+#include <Point.h>
 
 
 // Qt
@@ -98,7 +101,10 @@ bool GraphicalObjectRendererAttributes::updateViewImpl()
     if (m_logger.isDebugEnabled())
       qCritical() <<  " debugInfo='" << m_debugInfo << "'" << ", QVariantMap before unite " << cur;
 
-    cur.unite(m_attributeMap.value());
+    // Qt6: QMap::unite removed, use insert() loop instead
+    const QVariantMap attrs = m_attributeMap.value();
+    for (auto it = attrs.begin(); it != attrs.end(); ++it)
+      cur.insert(it.key(), it.value());
 
     if (m_logger.isDebugEnabled())
       qCritical() <<  " debugInfo='" << m_debugInfo << "'" << ", QVariantMap after  unite " << cur;

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_scene_marker.cpp

@@ -16,6 +16,13 @@
 // ESRI
 #include <GraphicsOverlay.h>
 #include <SimpleMarkerSceneSymbol.h>
+#include <Graphic.h>
+#include <SpatialReference.h>
+#include <Point.h>
+#include <MapTypes.h>
+
+// Local
+#include <Map/point3D.h>
 
 
 // Qt

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_text.cpp

@@ -15,6 +15,10 @@
 #include <GraphicsOverlay.h>
 #include <TextSymbol.h>
 #include <PictureMarkerSymbol.h>
+#include <SymbolTypes.h>
+#include <Graphic.h>
+#include <Point.h>
+#include <SpatialReference.h>
 
 // Qt
 #include <QString>

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/tactical_appearance.cpp

@@ -20,6 +20,11 @@
 // ESRI
 #include <Map.h>
 #include <GraphicsOverlay.h>
+#include <Graphic.h>
+#include <GraphicListModel.h>
+#include <AttributeListModel.h>
+#include <Geometry.h>
+#include <PointCollection.h>
 #include <PolygonBuilder.h>
 #include <PolylineBuilder.h>
 #include <MultipointBuilder.h>