Merge branch 'dev' into gis_objects_cleaning

src/Speckle.Objects/Data/ArcgisObject.cs

@@ -0,0 +1,22 @@
+using Speckle.Sdk.Models;
+
+namespace Speckle.Objects.Data;
+
+/// <summary>
+/// Represents a ArcGIS.Core.CoreObjectsBase object in ArcGIS
+/// </summary>
+[SpeckleType("Objects.Data.ArcgisObject")]
+public class ArcgisObject : Base, IGisObject
+{
+  public required string name { get; set; }
+  public required string type { get; set; }
+
+  [DetachProperty]
+  public required List<Base> displayValue { get; set; }
+
+  public required Dictionary<string, object?> properties { get; set; }
+
+  public required string units { get; set; }
+
+  IReadOnlyList<Base> IDisplayValue<IReadOnlyList<Base>>.displayValue => displayValue;
+}

src/Speckle.Objects/Data/CivilObject.cs → src/Speckle.Objects/Data/Civil3dObject.cs

@@ -5,8 +5,8 @@ namespace Speckle.Objects.Data;
 /// <summary>
 /// Represents an Autodesk.Civil.DatabaseServices.Entity object in Civil3d
 /// </summary>
-[SpeckleType("Objects.Data.CivilObject")]
-public class CivilObject : Base, ICivilObject
+[SpeckleType("Objects.Data.Civil3dObject")]
+public class Civil3dObject : Base, ICivilObject
 {
   public required string name { get; set; }
   public required string type { get; set; }
@@ -20,13 +20,16 @@ public class CivilObject : Base, ICivilObject
   /// Children objects, eg profiles, this civil entity may contain.
   /// </summary>
   [DetachProperty]
-  public required List<CivilObject> elements { get; set; }
+  public required List<Base> elements { get; set; }
 
+  [DetachProperty]
   public required List<Base> displayValue { get; set; }
 
+  public required Dictionary<string, object?> properties { get; set; }
+
   public required string units { get; set; }
 
-  IReadOnlyList<ICivilObject> ICivilObject.elements => elements;
+  IReadOnlyList<Base> ICivilObject.elements => elements;
 
-  IReadOnlyList<Base> IDataObject.displayValue => displayValue;
+  IReadOnlyList<Base> IDisplayValue<IReadOnlyList<Base>>.displayValue => displayValue;
 }

src/Speckle.Objects/Data/DataObject.cs

@@ -10,5 +10,7 @@ public class DataObject : Base, IDataObject
   [DetachProperty]
   public required List<Base> displayValue { get; set; }
 
-  IReadOnlyList<Base> IDataObject.displayValue => displayValue;
+  public required Dictionary<string, object?> properties { get; set; }
+
+  IReadOnlyList<Base> IDisplayValue<IReadOnlyList<Base>>.displayValue => displayValue;
 }

src/Speckle.Objects/Data/EtabsObject.cs

@@ -0,0 +1,30 @@
+using Speckle.Sdk.Models;
+
+namespace Speckle.Objects.Data;
+
+/// <summary>
+/// Represents a wrapper object in ETABS
+/// </summary>
+[SpeckleType("Objects.Data.EtabsObject")]
+public class EtabsObject : Base, ICsiObject
+{
+  public required string name { get; set; }
+  public required string type { get; set; }
+
+  /// <summary>
+  /// Children objects, eg joints, this etabs object may contain.
+  /// </summary>
+  [DetachProperty]
+  public required List<EtabsObject> elements { get; set; }
+
+  [DetachProperty]
+  public required List<Base> displayValue { get; set; }
+
+  public required Dictionary<string, object?> properties { get; set; }
+
+  public required string units { get; set; }
+
+  IReadOnlyList<ICsiObject> ICsiObject.elements => elements;
+
+  IReadOnlyList<Base> IDisplayValue<IReadOnlyList<Base>>.displayValue => displayValue;
+}

src/Speckle.Objects/Data/NavisworksObject.cs

@@ -0,0 +1,21 @@
+using Speckle.Sdk.Models;
+
+namespace Speckle.Objects.Data;
+
+/// <summary>
+/// Represents a "first selectable ancestor" Navisworks.ModelItem object in Navisworks
+/// </summary>
+[SpeckleType("Objects.Data.NavisworksObject")]
+public class NavisworksObject : Base, INavisworksObject
+{
+  public required string name { get; set; }
+
+  [DetachProperty]
+  public required List<Base> displayValue { get; set; }
+
+  public required Dictionary<string, object?> properties { get; set; }
+
+  public required string units { get; set; }
+
+  IReadOnlyList<Base> IDisplayValue<IReadOnlyList<Base>>.displayValue => displayValue;
+}

src/Speckle.Objects/Data/RevitObject.cs

@@ -25,11 +25,14 @@ public class RevitObject : Base, IRevitObject
   [DetachProperty]
   public required List<RevitObject> elements { get; set; }
 
+  [DetachProperty]
   public required List<Mesh> displayValue { get; set; }
 
+  public required Dictionary<string, object?> properties { get; set; }
+
   public required string units { get; set; }
 
   IReadOnlyList<IRevitObject> IRevitObject.elements => elements;
 
-  IReadOnlyList<Base> IDataObject.displayValue => displayValue;
+  IReadOnlyList<Base> IDisplayValue<IReadOnlyList<Base>>.displayValue => displayValue;
 }

src/Speckle.Objects/Data/TeklaObject.cs

@@ -17,11 +17,14 @@ public class TeklaObject : Base, ITeklaObject
   [DetachProperty]
   public required List<TeklaObject> elements { get; set; }
 
+  [DetachProperty]
   public required List<Base> displayValue { get; set; }
 
+  public required Dictionary<string, object?> properties { get; set; }
+
   public required string units { get; set; }
 
   IReadOnlyList<ITeklaObject> ITeklaObject.elements => elements;
 
-  IReadOnlyList<Base> IDataObject.displayValue => displayValue;
+  IReadOnlyList<Base> IDisplayValue<IReadOnlyList<Base>>.displayValue => displayValue;
 }

src/Speckle.Objects/Deprecated/LegacyV2.cs

@@ -6,11 +6,13 @@ namespace Speckle.Objects.Deprecated;
 [DeprecatedSpeckleType("Objects.Other.BlockInstance")]
 [DeprecatedSpeckleType("Objects.Other.Revit.RevitInstance")]
 [DeprecatedSpeckleType("Objects.BuiltElements.View")]
+[DeprecatedSpeckleType("Objects.BuiltElements.GridLine")]
 [DeprecatedSpeckleType("Objects.Other.BlockDefinition")]
 [DeprecatedSpeckleType("Objects.Other.DisplayStyle")]
 [DeprecatedSpeckleType("Objects.Other.Material")]
 [DeprecatedSpeckleType("Objects.Other.MaterialQuantity")]
 [DeprecatedSpeckleType("Objects.Other.Revit.RevitMaterial")]
 [DeprecatedSpeckleType("Objects.BuiltElements.Revit.Parameter")]
 [DeprecatedSpeckleType("Objects.BuiltElements.Revit.Curve.ModelCurve")]
+[DeprecatedSpeckleType("Objects.BuiltElements.Revit.DirectShape")]
 public class LegacyV2 : Base { }