sync creation and assignment of ActiveCRS on send&receive (host&root …

…obj builder); assignment to Sent & Received GIS/nonGIS classes
specklesystems · Jun 29, 2024 · b2d59d8 · b2d59d8
1 parent 1f6191f
commit b2d59d8
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Receive/HostObjectBuilder.cs b/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Receive/HostObjectBuilder.cs
@@ -44,9 +44,10 @@ public HostObjectBuilderResult Build(
     CancellationToken cancellationToken
   )
   {
-    // get active CRS & offsets
+    // get active CRS & offsets on Receive
     SpatialReference activeSpatialRef = _contextStack.Current.Document.Map.SpatialReference;
     // Browse for any trace of geolocation in non-GIS apps (e.g. Revit: implemented, Blender: todo on Blender side, Civil3d: ?)
+    // ATM, GIS commit CRS is stored per layer, but should be moved to the Root level too
     CRSorigin? dataOrigin = null; // e.g. CRSorigin.FromRevitData(rootObject);
     if (dataOrigin is CRSorigin crsOrigin)
     {
@@ -56,7 +57,7 @@ CancellationToken cancellationToken
     double latOffset = 0;
     double lonOffset = 0;
     CRSoffsetRotation crsOffsetRotation = new(activeSpatialRef, latOffset, lonOffset, trueNorthRadians);
-    // set active CRS & offsets
+    // set active CRS & offsets on Receive
     _contextStack.Current.Document.ActiveCRSoffsetRotation = crsOffsetRotation;
 
     // Prompt the UI conversion started. Progress bar will swoosh.

diff --git a/...X/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Send/ArcGISRootObjectBuilder.cs b/...X/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Send/ArcGISRootObjectBuilder.cs
@@ -41,9 +41,12 @@ public RootObjectBuilderResult Build(
     CancellationToken ct = default
   )
   {
-    // set active CRS & offsets
+    // set active CRS & offsets on Send
     double trueNorth = 0;
-    CRSoffsetRotation crsOffsetRotation = new(_contextStack.Current.Document.Map.SpatialReference, trueNorth);
+    double latOffset = 0;
+    double lonOffset = 0;
+    CRSoffsetRotation crsOffsetRotation =
+      new(_contextStack.Current.Document.Map.SpatialReference, latOffset, lonOffset, trueNorth);
     _contextStack.Current.Document.ActiveCRSoffsetRotation = crsOffsetRotation;
 
     // POC: does this feel like the right place? I am wondering if this should be called from within send/rcv?

diff --git a/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ArcGISConversionContextStack.cs b/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ArcGISConversionContextStack.cs
@@ -21,6 +21,8 @@ public ArcGISDocument()
     Project = Project.Current;
     Map = MapView.Active.Map;
     SpeckleDatabasePath = EnsureOrAddSpeckleDatabase();
+    // CRS of either: incoming commit to be applied to all received objects, or CRS to convert all objects to, before sending
+    // created per Send/Receive operation, will be the same for all objects in the operation
     ActiveCRSoffsetRotation = new CRSoffsetRotation(MapView.Active.Map.SpatialReference);
   }
 

diff --git a/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Layers/FeatureClassToHostConverter.cs b/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Layers/FeatureClassToHostConverter.cs
@@ -87,6 +87,7 @@ public FeatureClass Convert(VectorLayer target)
     {
       wktString = target.crs.wkt.ToString();
     }
+    // ATM, GIS commit CRS is stored per layer, but should be moved to the Root level too, and created once per Receive
     ACG.SpatialReference spatialRef = ACG.SpatialReferenceBuilder.CreateSpatialReference(wktString);
     _contextStack.Current.Document.ActiveCRSoffsetRotation = new CRSoffsetRotation(spatialRef);
 

diff --git a/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Layers/VectorLayerToSpeckleConverter.cs b/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Layers/VectorLayerToSpeckleConverter.cs
@@ -54,18 +54,18 @@ public VectorLayer Convert(FeatureLayer target)
   {
     VectorLayer speckleLayer = new();
 
-    // get document CRS (for writing geometry coords)
-    var spatialRef = _contextStack.Current.Document.Map.SpatialReference;
+    // get Active CRS (for writing geometry coords)
+    var spatialRef = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpatialReference;
     speckleLayer.crs = new CRS
     {
       wkt = spatialRef.Wkt,
       name = spatialRef.Name,
-      units_native = spatialRef.Unit.ToString(),
+      units_native = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString,
     };
 
     // other properties
     speckleLayer.name = target.Name;
-    speckleLayer.units = _contextStack.Current.SpeckleUnits;
+    speckleLayer.units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString;
 
     // get feature class fields
     var allLayerAttributes = new Base();

diff --git a/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/NonNativeFeaturesUtils.cs b/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/NonNativeFeaturesUtils.cs
@@ -117,7 +117,7 @@ private void CreateDatasetInDatabase(
     Geodatabase geodatabase = new(fileGeodatabaseConnectionPath);
     SchemaBuilder schemaBuilder = new(geodatabase);
 
-    // get Spatial Reference from the document
+    // get Spatial Reference from the Active CRS for Receive
     ACG.SpatialReference spatialRef = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpatialReference;
 
     // create Fields