adds basecurves as display value when no display value exists (#321)

specklesystems · Oct 24, 2024 · 3088fae · 3088fae
1 parent 6d37531
commit 3088fae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs
@@ -31,7 +31,7 @@ IConverterSettingsStore<Civil3dConversionSettings> converterSettings
     _converterSettings = converterSettings;
   }
 
-  public List<Base> GetDisplayValue(CDB.Entity entity)
+  public List<Base>? GetDisplayValue(CDB.Entity entity)
   {
     switch (entity)
     {
@@ -56,7 +56,7 @@ public List<Base> GetDisplayValue(CDB.Entity entity)
         return new() { gridSurfaceMesh };
 
       default:
-        return new();
+        return null;
     }
   }
 }
diff --git a/...Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs b/...Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs
@@ -59,9 +59,10 @@ public Base Convert(CDB.Entity target)
       civilObject["baseCurves"] = baseCurves;
     }
 
-    // extract display value
-    List<Base> display = _displayValueExtractor.GetDisplayValue(target);
-    if (display.Count > 0)
+    // extract display value.
+    // If object has no display but has basecurves, use basecurves for display instead (for viewer selection)
+    List<Base>? display = _displayValueExtractor.GetDisplayValue(target) ?? baseCurves?.Select(o => (Base)o).ToList();
+    if (display is not null)
     {
       civilObject["displayValue"] = display;
     }

diff --git a/...vil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs b/...vil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs
@@ -292,7 +292,7 @@ CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.F
       };
       speedsCount++;
     }
-    designCriteriaDict["Design Speeds"] = designSpeedsDict;
+
     if (designSpeedsDict.Count > 0)
     {
       designCriteriaDict["Design Speeds"] = designSpeedsDict;