fix(civil3d): added units to civil classes missing them (#3591)

added units to civil classes missing them
specklesystems · Jul 25, 2024 · ffc35bf · ffc35bf
1 parent af53b70
commit ffc35bf
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 10 deletions.
diff --git a/...nverters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.Civil.cs b/...nverters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.Civil.cs
@@ -148,7 +148,8 @@ public CivilAlignment AlignmentToSpeckle(CivilDB.Alignment alignment)
       stationEquationDirections = directions,
       offset = alignment.IsOffsetAlignment ? alignment.OffsetAlignmentInfo.NominalOffset : 0,
       site = alignment.SiteName ?? "",
-      style = alignment.StyleName ?? ""
+      style = alignment.StyleName ?? "",
+      units = ModelUnits
     };
 
     AddNameAndDescriptionProperty(alignment.Name, alignment.Description, speckleAlignment);
@@ -542,7 +543,8 @@ public CivilProfile ProfileToSpeckle(CivilDB.Profile profile)
       offset = profile.Offset,
       style = profile.StyleName ?? "",
       startStation = profile.StartingStation,
-      endStation = profile.EndingStation
+      endStation = profile.EndingStation,
+      units = ModelUnits
     };
 
     AddNameAndDescriptionProperty(profile.Name, profile.Description, speckleProfile);
@@ -615,8 +617,6 @@ public CivilProfile ProfileToSpeckle(CivilDB.Profile profile)
       speckleProfile.displayValue = PolylineToSpeckle(pvis, profile.Closed);
     }
 
-    speckleProfile.units = ModelUnits;
-
     return speckleProfile;
   }
   private Line ProfileLineToSpeckle(ProfileTangent tangent)
@@ -1136,6 +1136,7 @@ public Pipe PipeToSpeckle(PressurePipe pipe)
   private CivilDataField AppliedSubassemblyParamToSpeckle(IAppliedSubassemblyParam param)
   {
     CivilDataField baseParam = new(param.KeyName, param.ValueType.Name, param.ValueAsObject, null, null, param.DisplayName);
+
     return baseParam;
   }
 
@@ -1155,7 +1156,11 @@ private CivilAppliedSubassembly AppliedSubassemblyToSpeckle(AppliedSubassembly a
     Point soePoint = PointToSpeckle(appliedSubassembly.OriginStationOffsetElevationToBaseline);
     List<CivilDataField> speckleParameters = appliedSubassembly.Parameters.Select(p => AppliedSubassemblyParamToSpeckle(p)).ToList();
 
-    CivilAppliedSubassembly speckleAppliedSubassembly = new(appliedSubassembly.SubassemblyId.ToString(), subassembly.Name, speckleShapes, soePoint, speckleParameters);
+    CivilAppliedSubassembly speckleAppliedSubassembly = new(appliedSubassembly.SubassemblyId.ToString(), subassembly.Name, speckleShapes, soePoint, speckleParameters)
+    {
+      units = ModelUnits
+    };
+
     return speckleAppliedSubassembly;
   }
 
@@ -1201,7 +1206,11 @@ private CivilBaselineRegion BaselineRegionToSpeckle(BaselineRegion region)
     }
 
     // create the speckle region
-    CivilBaselineRegion speckleRegion = new(region.Name, region.StartStation, region.EndStation, assembly.Id.ToString(), assembly.Name, speckleAppliedAssemblies);
+    CivilBaselineRegion speckleRegion = new(region.Name, region.StartStation, region.EndStation, assembly.Id.ToString(), assembly.Name, speckleAppliedAssemblies)
+    {
+      units = ModelUnits
+    };
+
     return speckleRegion;
   }
 
@@ -1229,7 +1238,11 @@ private CivilCalculatedLink CalculatedLinkToSpeckle(CalculatedLink link)
       specklePoints.Add(specklePoint);
     }
 
-    CivilCalculatedLink speckleLink = new(codes, specklePoints);
+    CivilCalculatedLink speckleLink = new(codes, specklePoints)
+    {
+      units = ModelUnits
+    };
+
     return speckleLink;
   }
 
@@ -1240,7 +1253,11 @@ private CivilCalculatedPoint CalculatedPointToSpeckle(CalculatedPoint point)
     Vector normalBaseline = VectorToSpeckle(point.NormalToBaseline);
     Vector normalSubAssembly = VectorToSpeckle(point.NormalToSubassembly);
     Point soePoint = PointToSpeckle(point.StationOffsetElevationToBaseline);
-    CivilCalculatedPoint speckleCalculatedPoint = new(specklePoint, codes, normalBaseline, normalSubAssembly, soePoint);
+    CivilCalculatedPoint speckleCalculatedPoint = new(specklePoint, codes, normalBaseline, normalSubAssembly, soePoint)
+    {
+      units = ModelUnits
+    };
+
     return speckleCalculatedPoint;
   }
 
@@ -1269,15 +1286,21 @@ private CivilBaseline BaselineToSpeckle(CivilDB.Baseline baseline)
       var profile = Trans.GetObject(baseline.ProfileId, OpenMode.ForRead) as CivilDB.Profile;
       CivilProfile speckleProfile = ProfileToSpeckle(profile);
 
-      speckleBaseline = new(baseline.Name, speckleRegions, baseline.SortedStations().ToList(), baseline.StartStation, baseline.EndStation, speckleAlignment, speckleProfile);
+      speckleBaseline = new(baseline.Name, speckleRegions, baseline.SortedStations().ToList(), baseline.StartStation, baseline.EndStation, speckleAlignment, speckleProfile)
+      {
+        units = ModelUnits
+      };
     }
     else
     {
       // get the baseline featureline
       var featureline = Trans.GetObject(baseline.FeatureLineId, OpenMode.ForRead) as CivilDB.FeatureLine;
       Featureline speckleFeatureline = FeaturelineToSpeckle(featureline);
 
-      speckleBaseline = new(baseline.Name, speckleRegions, baseline.SortedStations().ToList(), baseline.StartStation, baseline.EndStation, speckleFeatureline);
+      speckleBaseline = new(baseline.Name, speckleRegions, baseline.SortedStations().ToList(), baseline.StartStation, baseline.EndStation, speckleFeatureline)
+      {
+        units = ModelUnits
+      };
     }
 
     return speckleBaseline;

diff --git a/Objects/Objects/BuiltElements/Baseline.cs b/Objects/Objects/BuiltElements/Baseline.cs
@@ -32,6 +32,8 @@ protected Baseline(string name, bool isFeaturelineBased)
   public Featureline? featureline { get; internal set; }
 
   public bool isFeaturelineBased { get; set; }
+
+  public string units { get; set; }
 }
 
 /// <summary>

diff --git a/Objects/Objects/BuiltElements/Civil/CivilAppliedSubassembly.cs b/Objects/Objects/BuiltElements/Civil/CivilAppliedSubassembly.cs
@@ -34,4 +34,6 @@ List<CivilDataField> parameters
 
   [DetachProperty]
   public List<CivilDataField> parameters { get; set; }
+
+  public string units { get; set; }
 }
diff --git a/Objects/Objects/BuiltElements/Civil/CivilBaselineRegion.cs b/Objects/Objects/BuiltElements/Civil/CivilBaselineRegion.cs
@@ -42,4 +42,6 @@ List<CivilAppliedAssembly> appliedAssemblies
 
   [DetachProperty]
   public List<CivilAppliedAssembly> appliedAssemblies { get; set; }
+
+  public string units { get; set; }
 }
diff --git a/Objects/Objects/BuiltElements/Civil/CivilCalculatedLink.cs b/Objects/Objects/BuiltElements/Civil/CivilCalculatedLink.cs
@@ -17,4 +17,6 @@ public CivilCalculatedLink(List<string> codes, List<CivilCalculatedPoint> points
 
   [DetachProperty]
   public List<CivilCalculatedPoint> points { get; set; }
+
+  public string units { get; set; }
 }
diff --git a/Objects/Objects/BuiltElements/Civil/CivilCalculatedPoint.cs b/Objects/Objects/BuiltElements/Civil/CivilCalculatedPoint.cs
@@ -32,4 +32,6 @@ Point stationOffsetElevationToBaseline
   public Vector normalToSubassembly { get; set; }
 
   public Point stationOffsetElevationToBaseline { get; set; }
+
+  public string units { get; set; }
 }