Copies intermediate migration results to repo

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp

@@ -12,13 +12,14 @@
 
 
 // Esri
-#include <arcgis/CoreTypes.h> // for LicenseStatus
-#include <arcgis/MapTypes.h>
-#include <arcgis/Viewpoint.h>
-#include <arcgis/Camera.h>
+#include <CoreTypes.h> // for LicenseStatus
+#include <MapTypes.h>
+#include <Viewpoint.h>
+#include <Camera.h>
+#include <Geometry.h>
+#include <Point.h>
 
 
-#include <arcgis/arcgisversion.h>  // This file is created by RME, not ESRI
 
 #if ACRGIS_VERSION >= 0x640600 // 100.6.0 / Update 6
 #define HAS_SURFACEPLACEMENT_RELATIVETOSCENE
@@ -228,12 +229,16 @@ QString toString(SurfacePlacement value)
 {
   switch (value)
   {
-  case SurfacePlacement::Draped:
-    return QStringLiteral("Draped");
+  case SurfacePlacement::DrapedFlat:
+    return QStringLiteral("DrapedFlat");
   case SurfacePlacement::Absolute:
     return QStringLiteral("Absolute");
   case SurfacePlacement::Relative:
     return QStringLiteral("Relative");
+  case SurfacePlacement::DrapedBillboarded:
+    return QStringLiteral("DrapedBillboarded");
+  case SurfacePlacement::RelativeToScene:
+    return QStringLiteral("RelativeToScene");
   } // switch
   Q_ASSERT(false);
   return QStringLiteral("SurfacePlacementERROR");
@@ -241,9 +246,9 @@ QString toString(SurfacePlacement value)
 
 bool fromString(SituationMap::SurfacePlacement &surfacePlacement, const QString &str)
 {
-  if (str.compare(QStringLiteral("Draped")) == 0)
+  if (str.compare(QStringLiteral("DrapedFlat")) == 0)
   {
-    surfacePlacement = SurfacePlacement::Draped;
+    surfacePlacement = SurfacePlacement::DrapedFlat;
     return true;
   }
   if (str.compare(QStringLiteral("Absolute")) == 0)
@@ -256,6 +261,16 @@ bool fromString(SituationMap::SurfacePlacement &surfacePlacement, const QString
     surfacePlacement = SurfacePlacement::Relative;
     return true;
   }
+  if (str.compare(QStringLiteral("DrapedBillboarded")) == 0)
+  {
+    surfacePlacement = SurfacePlacement::DrapedBillboarded;
+    return true;
+  }
+  if (str.compare(QStringLiteral("RelativeToScene")) == 0)
+  {
+    surfacePlacement = SurfacePlacement::RelativeToScene;
+    return true;
+  }
   return false;
 }
 
@@ -378,7 +393,7 @@ QString toString(const Error &value)
 {
   std::ostringstream stream;
   stream << "Esri::ArcGISRuntime::Error: "
-         << " code="                << value.code()
+         << " errorType="            << (int)value.errorType()
          << ", domain="             << (int)value.domain()
          << ", extendedErrorType="  << (int)value.extendedErrorType()
          << ", message='"           << value.message() << "'"
@@ -496,8 +511,6 @@ QString toString(const Esri::ArcGISRuntime::LayerType value)
     return QStringLiteral("FeatureLayer");
   case Esri::ArcGISRuntime::LayerType::KMLLayer:
     return QStringLiteral("KMLLayer");
-  case Esri::ArcGISRuntime::LayerType::BingMapLayer:
-    return QStringLiteral("BingMapLayer");
   case Esri::ArcGISRuntime::LayerType::RasterLayer:
     return QStringLiteral("RasterLayer");
   case Esri::ArcGISRuntime::LayerType::UnsupportedLayer:
@@ -539,9 +552,19 @@ QString toString(const Esri::ArcGISRuntime::LayerType value)
 
 #if ACRGIS_VERSION >= 0x640D00 // 100.13.0
   case Esri::ArcGISRuntime::LayerType::DimensionLayer:
-    return QStringLiteral("SubtypeFeatureLayer");
+    return QStringLiteral("DimensionLayer");
 #endif // ACRGIS_VERSION
 
+  // ArcGIS SDK v300 new layer types
+  case Esri::ArcGISRuntime::LayerType::DynamicEntityLayer:
+    return QStringLiteral("DynamicEntityLayer");
+  case Esri::ArcGISRuntime::LayerType::Ogc3dTilesLayer:
+    return QStringLiteral("Ogc3dTilesLayer");
+  case Esri::ArcGISRuntime::LayerType::BuildingSceneLayer:
+    return QStringLiteral("BuildingSceneLayer");
+  case Esri::ArcGISRuntime::LayerType::OrientedImageryLayer:
+    return QStringLiteral("OrientedImageryLayer");
+
   case Esri::ArcGISRuntime::LayerType::UnknownLayer:
     return QStringLiteral("UnknownLayer");
 
@@ -643,8 +666,6 @@ QString toString(const Esri::ArcGISRuntime::ViewpointType value)
 {
   switch (value)
   {
-  case Esri::ArcGISRuntime::ViewpointType::Unknown:
-    return QStringLiteral("Unknown");
   case Esri::ArcGISRuntime::ViewpointType::CenterAndScale:
     return QStringLiteral("CenterAndScale");
   case Esri::ArcGISRuntime::ViewpointType::BoundingGeometry:
@@ -696,23 +717,16 @@ QString toString(Esri::ArcGISRuntime::SurfacePlacement value)
 {
   switch (value)
   {
-  case Esri::ArcGISRuntime::SurfacePlacement::Draped:
-    return QStringLiteral("Draped");
+  case Esri::ArcGISRuntime::SurfacePlacement::DrapedBillboarded:
+    return QStringLiteral("DrapedBillboarded");
   case Esri::ArcGISRuntime::SurfacePlacement::Absolute:
     return QStringLiteral("Absolute");
   case Esri::ArcGISRuntime::SurfacePlacement::Relative:
     return QStringLiteral("Relative");
-
-#ifdef HAS_SURFACEPLACEMENT_RELATIVETOSCENE
   case Esri::ArcGISRuntime::SurfacePlacement::RelativeToScene:
     return QStringLiteral("RelativeToScene");
-#endif // HAS_SURFACEPLACEMENT_RELATIVETOSCENE
-
-#if ACRGIS_VERSION >= 0x640700 // 100.7.0 / Update 7
   case Esri::ArcGISRuntime::SurfacePlacement::DrapedFlat:
     return QStringLiteral("DrapedFlat");
-#endif // ACRGIS_VERSION
-
   }// switch
   Q_ASSERT(false);
   return QStringLiteral("Esri-SurfacePlacementERROR");