diff --git a/LayoutFunctions/LayoutFunctionCommon/LayoutGeneration.cs b/LayoutFunctions/LayoutFunctionCommon/LayoutGeneration.cs index 754d9411..2ada9246 100644 --- a/LayoutFunctions/LayoutFunctionCommon/LayoutGeneration.cs +++ b/LayoutFunctions/LayoutFunctionCommon/LayoutGeneration.cs @@ -30,8 +30,7 @@ public class LayoutGeneration 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 index b5b8b58a..6e81a195 100644 --- 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 inputModels, dynamic overrides, bool createWalls, string configurationsPath, string catalogPath = "catalog.json") + public override LayoutGenerationResult StandardLayoutOnAllLevels(string programTypeName, Dictionary inputModels, dynamic overrides, bool createWalls, string configurationsPath) { seatsTable = new Dictionary(); - 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 index 302584d1..66b210a3 100644 --- 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 inputModels, dynamic overrides, bool createWalls, string configurationsPath, string catalogPath = "catalog.json") + public override LayoutGenerationResult StandardLayoutOnAllLevels(string programTypeName, Dictionary 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 deleted file mode 100644 index 81315b6c..00000000 Binary files a/LayoutFunctions/PantryLayout/8115dd28-7ca9-4e91-9117-83f9d5e299da.zip and /dev/null differ