AGIS: put methods under the native struct

DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Layers/FeatureClassToHostConverter.cs

@@ -74,7 +74,7 @@ private List<GisFeature> RecoverOutdatedGisFeatures(VectorLayer target)
 
   public FeatureClass Convert(VectorLayer target)
   {
-    ACG.GeometryType geomType = _featureClassUtils.GetLayerGeometryType(target);
+    ACG.GeometryType geomType = GISLayerGeometryType.GetNativeLayerGeometryType(target);
 
     FileGeodatabaseConnectionPath fileGeodatabaseConnectionPath =
       new(_contextStack.Current.Document.SpeckleDatabasePath);

DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Layers/VectorLayerToHostConverter.cs

@@ -34,15 +34,15 @@ IFeatureClassUtils featureClassUtils
   public string Convert(VectorLayer target)
   {
     // pointcloud layers need to be checked separately, because there is no ArcGIS Geometry type
-    // for Pointcloud. In ArcGIS it's a completely different layer class, so "GetLayerGeometryType"
+    // for Pointcloud. In ArcGIS it's a completely different layer class, so "GetNativeLayerGeometryType"
     // will return "Invalid" type
     if (target.geomType == GISLayerGeometryType.POINTCLOUD)
     {
       return _pointcloudLayerConverter.Convert(target).Name;
     }
 
     // check if Speckle VectorLayer should become a FeatureClass, StandaloneTable or PointcloudLayer
-    ACG.GeometryType geomType = _featureClassUtils.GetLayerGeometryType(target);
+    ACG.GeometryType geomType = GISLayerGeometryType.GetNativeLayerGeometryType(target);
     if (geomType != ACG.GeometryType.Unknown) // feature class
     {
       return _featureClassConverter.Convert(target).GetName();

DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Layers/VectorLayerToSpeckleConverter.cs

@@ -6,7 +6,6 @@
 using ArcGIS.Core.Data;
 using ArcGIS.Core.Geometry;
 using Speckle.Converters.ArcGIS3.Utils;
-using ArcGIS.Core.CIM;
 
 namespace Speckle.Converters.ArcGIS3.Layers;
 
@@ -36,20 +35,6 @@ public Base Convert(object target)
     return Convert((FeatureLayer)target);
   }
 
-  private string AssignSpeckleGeometryType(esriGeometryType nativeGeometryType)
-  {
-    return nativeGeometryType switch
-    {
-      esriGeometryType.esriGeometryMultipoint => GISLayerGeometryType.POINT,
-      esriGeometryType.esriGeometryPoint => GISLayerGeometryType.POINT,
-      esriGeometryType.esriGeometryLine => GISLayerGeometryType.POLYLINE,
-      esriGeometryType.esriGeometryPolyline => GISLayerGeometryType.POLYLINE,
-      esriGeometryType.esriGeometryPolygon => GISLayerGeometryType.POLYGON,
-      esriGeometryType.esriGeometryMultiPatch => GISLayerGeometryType.MULTIPATCH,
-      _ => GISLayerGeometryType.NONE,
-    };
-  }
-
   public VectorLayer Convert(FeatureLayer target)
   {
     VectorLayer speckleLayer = new();
@@ -93,7 +78,7 @@ public VectorLayer Convert(FeatureLayer target)
     speckleLayer.attributes = allLayerAttributes;
 
     // get a simple geometry type
-    string spekleGeometryType = AssignSpeckleGeometryType(target.ShapeType);
+    string spekleGeometryType = GISLayerGeometryType.LayerGeometryTypeToSpeckle(target.ShapeType);
     speckleLayer.geomType = spekleGeometryType;
 
     // search the rows

DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/FeatureClassUtils.cs

@@ -110,19 +110,4 @@ public void AddFeaturesToTable(Table newFeatureClass, List<GisFeature> gisFeatur
       }
     }
   }
-
-  public ACG.GeometryType GetLayerGeometryType(VectorLayer target)
-  {
-    string? originalGeomType = target.geomType != null ? target.geomType : target.nativeGeomType;
-    return originalGeomType switch
-    {
-      GISLayerGeometryType.NONE => ACG.GeometryType.Unknown,
-      GISLayerGeometryType.POINT => ACG.GeometryType.Multipoint,
-      GISLayerGeometryType.POLYGON => ACG.GeometryType.Polygon,
-      GISLayerGeometryType.POLYLINE => ACG.GeometryType.Polyline,
-      GISLayerGeometryType.MULTIPATCH => ACG.GeometryType.Multipatch,
-      GISLayerGeometryType.POLYGON3D => ACG.GeometryType.Multipatch,
-      _ => throw new ArgumentOutOfRangeException(nameof(target)),
-    };
-  }
 }

DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/GISAttributeFieldType.cs

@@ -16,6 +16,7 @@ public static class GISAttributeFieldType
   public const string DATEONLY = "DateOnly";
   public const string TIMEONLY = "TimeOnly";
   public const string TIMESTAMPOFFSET = "TimeStampOffset";
+  public const string BOOL = "Bool"; // not supported in ArcGIS, only in QGIS
 
   public static string FieldTypeToSpeckle(FieldType fieldType)
   {
@@ -55,6 +56,7 @@ public static FieldType FieldTypeToNative(object fieldType)
         DATEONLY => FieldType.DateOnly,
         TIMEONLY => FieldType.TimeOnly,
         TIMESTAMPOFFSET => FieldType.String, // sending and receiving as stings
+        BOOL => FieldType.String, // not supported in ArcGIS, converting to string
         _ => throw new ArgumentOutOfRangeException(nameof(fieldType)),
       };
     }

DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/GISLayerGeometryType.cs

@@ -1,3 +1,5 @@
+using ArcGIS.Core.CIM;
+
 namespace Speckle.Converters.ArcGIS3.Utils;
 
 public static class GISLayerGeometryType
@@ -9,4 +11,33 @@ public static class GISLayerGeometryType
   public const string POLYGON3D = "Polygon3d";
   public const string MULTIPATCH = "Multipatch";
   public const string POINTCLOUD = "Pointcloud";
+
+  public static string LayerGeometryTypeToSpeckle(esriGeometryType nativeGeometryType)
+  {
+    return nativeGeometryType switch
+    {
+      esriGeometryType.esriGeometryMultipoint => GISLayerGeometryType.POINT,
+      esriGeometryType.esriGeometryPoint => GISLayerGeometryType.POINT,
+      esriGeometryType.esriGeometryLine => GISLayerGeometryType.POLYLINE,
+      esriGeometryType.esriGeometryPolyline => GISLayerGeometryType.POLYLINE,
+      esriGeometryType.esriGeometryPolygon => GISLayerGeometryType.POLYGON,
+      esriGeometryType.esriGeometryMultiPatch => GISLayerGeometryType.MULTIPATCH,
+      _ => GISLayerGeometryType.NONE,
+    };
+  }
+
+  public static ACG.GeometryType GetNativeLayerGeometryType(Objects.GIS.VectorLayer target)
+  {
+    string? originalGeomType = target.geomType != null ? target.geomType : target.nativeGeomType;
+    return originalGeomType switch
+    {
+      GISLayerGeometryType.NONE => ACG.GeometryType.Unknown,
+      GISLayerGeometryType.POINT => ACG.GeometryType.Multipoint,
+      GISLayerGeometryType.POLYGON => ACG.GeometryType.Polygon,
+      GISLayerGeometryType.POLYLINE => ACG.GeometryType.Polyline,
+      GISLayerGeometryType.MULTIPATCH => ACG.GeometryType.Multipatch,
+      GISLayerGeometryType.POLYGON3D => ACG.GeometryType.Multipatch,
+      _ => throw new ArgumentOutOfRangeException(nameof(target)),
+    };
+  }
 }

DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/IFeatureClassUtils.cs

@@ -20,5 +20,4 @@ public interface IFeatureClassUtils
     List<(FieldDescription, Func<Base, object?>)> fieldsAndFunctions
   );
   void AddFeaturesToTable(Table newFeatureClass, List<GisFeature> gisFeatures, List<FieldDescription> fields);
-  public ACG.GeometryType GetLayerGeometryType(VectorLayer target);
 }