removing catalog path

hypar-io · Jan 4, 2024 · 66b7516 · 66b7516
1 parent 0606b02
commit 66b7516
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/LayoutFunctions/LayoutFunctionCommon/LayoutGeneration.cs b/LayoutFunctions/LayoutFunctionCommon/LayoutGeneration.cs
@@ -30,8 +30,7 @@ public class LayoutGeneration<TLevelElements, TLevelVolume, TSpaceBoundary, TCir
                                               Dictionary<string, Model> inputModels,
                                               dynamic overrides,
                                               bool createWalls,
-                                              string configurationsPath,
-                                              string catalogPath = "catalog.json")
+                                              string configurationsPath)
         {
 
             var outputModel = new Model();

diff --git a/LayoutFunctions/MeetingRoomLayout/src/MeetingRoomLayout.cs b/LayoutFunctions/MeetingRoomLayout/src/MeetingRoomLayout.cs
@@ -40,11 +40,11 @@ protected override SeatsCount CountSeats(LayoutInstantiated layout)
                 return new SeatsCount(seatsCount, 0, 0, 0);
             }
 
-            public override LayoutGenerationResult StandardLayoutOnAllLevels(string programTypeName, Dictionary<string, Model> inputModels, dynamic overrides, bool createWalls, string configurationsPath, string catalogPath = "catalog.json")
+            public override LayoutGenerationResult StandardLayoutOnAllLevels(string programTypeName, Dictionary<string, Model> inputModels, dynamic overrides, bool createWalls, string configurationsPath)
             {
                 seatsTable = new Dictionary<string, RoomTally>();
 
-                var result = base.StandardLayoutOnAllLevels(programTypeName, inputModels, (object)overrides, createWalls, configurationsPath, catalogPath);
+                var result = base.StandardLayoutOnAllLevels(programTypeName, inputModels, (object)overrides, createWalls, configurationsPath);
 
 
                 result.OutputModel.AddElements(seatsTable.Select(kvp => kvp.Value).OrderByDescending(a => a.SeatsCount));

diff --git a/LayoutFunctions/OpenCollabLayout/src/OpenCollaborationLayout.cs b/LayoutFunctions/OpenCollabLayout/src/OpenCollaborationLayout.cs
@@ -87,9 +87,9 @@ protected override SpaceConfiguration DeserializeConfigJson(string configJson)
                 return spaceConfiguration;
             }
 
-            public override LayoutGenerationResult StandardLayoutOnAllLevels(string programTypeName, Dictionary<string, Model> inputModels, dynamic overrides, bool createWalls, string configurationsPath, string catalogPath = "catalog.json")
+            public override LayoutGenerationResult StandardLayoutOnAllLevels(string programTypeName, Dictionary<string, Model> inputModels, dynamic overrides, bool createWalls, string configurationsPath)
             {
-                var result = base.StandardLayoutOnAllLevels(programTypeName, inputModels, (object)overrides, createWalls, configurationsPath, catalogPath);
+                var result = base.StandardLayoutOnAllLevels(programTypeName, inputModels, (object)overrides, createWalls, configurationsPath);
                 return result;
             }
 

diff --git a/LayoutFunctions/PantryLayout/8115dd28-7ca9-4e91-9117-83f9d5e299da.zip b/LayoutFunctions/PantryLayout/8115dd28-7ca9-4e91-9117-83f9d5e299da.zip