refactor to reduce duplication and update layout functions

LayoutFunctions/ClassroomLayout/hypar.json

@@ -11,6 +11,11 @@
       "name": "Space Planning Zones",
       "optional": false
     },
+    {
+      "autohide": false,
+      "name": "Program Requirements",
+      "optional": true
+    },
     {
       "autohide": false,
       "name": "Circulation",
@@ -77,6 +82,5 @@
   ],
   "repository_url": "https://github.com/hypar-io/function",
   "source_file_key": null,
-  "preview_image": null,
-  "stream_model": true
+  "preview_image": null
 }

LayoutFunctions/ClassroomLayout/src/ClassroomLayout.cs

@@ -39,8 +39,12 @@ public static ClassroomLayoutOutputs Execute(Dictionary<string, Model> inputMode
             }
             var levelVolumes = LayoutStrategies.GetLevelVolumes<LevelVolume>(inputModels);
             var output = new ClassroomLayoutOutputs();
-            var configJson = File.ReadAllText("./ClassroomConfigurations.json");
-            var configs = JsonConvert.DeserializeObject<SpaceConfiguration>(configJson);
+
+            string configJsonPath = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "ClassroomConfigurations.json");
+            SpaceConfiguration configs = ContentManagement.GetSpaceConfiguration(inputModels, configJsonPath, "Classroom");
+
+            // var configJson = File.ReadAllText("./ClassroomConfigurations.json");
+            // var configs = JsonConvert.DeserializeObject<SpaceConfiguration>(configJson);
 
             int totalCountableSeats = 0;
             int seatsAtDesk = 0;

LayoutFunctions/ClassroomLayout/src/Function.g.cs

@@ -63,7 +63,7 @@ public async Task<ClassroomLayoutOutputs> Handler(ClassroomLayoutInputs args)
             {
                 this.store = new UrlModelStore<ClassroomLayoutInputs>();
             }
-            args.StreamModel = true;
+
 
             var l = new InvocationWrapper<ClassroomLayoutInputs,ClassroomLayoutOutputs> (store, ClassroomLayout.Execute);
             var output = await l.InvokeAsync(args);

LayoutFunctions/LayoutFunctionCommon/ContentManagement.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using Elements;
+using Elements.Components;
 using Newtonsoft.Json;
 
 namespace LayoutFunctionCommon
@@ -13,8 +14,7 @@ public static class ContentManagement
             Dictionary<string, Model> inputModels,
             string programName,
             out string configPath,
-            out string catalogPath,
-            Guid? programId = null
+            out string catalogPath
             ) where TProgramRequirement : Element, IProgramRequirement
         {
             configPath = null;
@@ -26,7 +26,7 @@ public static class ContentManagement
             }
             var programReqs = programReqModel.AllElementsAssignableFromType<TProgramRequirement>();
             var req = programReqs?.FirstOrDefault(r => r.HyparSpaceType == programName);
-            if(req == null)
+            if (req == null)
             {
                 Console.WriteLine($"No Program Requirement found for {programName}.");
                 return false;
@@ -42,7 +42,7 @@ public static class ContentManagement
             return true;
         }
 
-        private static (string catalogPath, string configPath) WriteLayoutConfigs(IProgramRequirement req, Model programReqModel)
+        public static (string catalogPath, string configPath) WriteLayoutConfigs(IProgramRequirement req, Model programReqModel)
         {
             if (!req.SpaceConfig.HasValue || !req.Catalog.HasValue)
             {
@@ -69,5 +69,18 @@ private static (string catalogPath, string configPath) WriteLayoutConfigs(IProgr
             File.WriteAllText(configPath, JsonConvert.SerializeObject(config));
             return (catalogPath, configPath);
         }
+
+        public static SpaceConfiguration GetSpaceConfiguration(Dictionary<string, Model> inputModels, string configJsonPath, string programName)
+        {
+            if (LoadConfigAndCatalog<ProgramRequirement>(inputModels, programName, out var configPath, out var catPath))
+            {
+                configJsonPath = configPath;
+                ContentCatalogRetrieval.SetCatalogFilePath(catPath);
+            }
+
+            var configJson = File.ReadAllText(configJsonPath);
+            var configs = JsonConvert.DeserializeObject<SpaceConfiguration>(configJson);
+            return configs;
+        }
     }
 }

LayoutFunctions/LayoutFunctionCommon/IProgramRequirement.cs

@@ -9,20 +9,8 @@ public interface IProgramRequirement
     {
         [JsonProperty("Hypar Space Type")]
         public string HyparSpaceType { get; set; }
-
         public Guid? SpaceConfig { get; set; }
-
         public Guid? Catalog { get; set; }
-
-        public Guid Id { get; set; }
-
-        [JsonProperty("Layout Type")]
-        public LayoutType LayoutType { get; set; }
-    }
-
-    public class LayoutType
-    {
         public Guid Id { get; set; }
-        public string Name { get; set; }
     }
 }

LayoutFunctions/LayoutFunctionCommon/LayoutGeneration.cs

@@ -36,12 +36,21 @@ public class LayoutGeneration<TLevelElements, TLevelVolume, TSpaceBoundary, TCir
 
             var outputModel = new Model();
             var totalSeats = 0;
-            ContentCatalogRetrieval.SetCatalogFilePath(catalogPath);
+
+            // ContentCatalogRetrieval.SetCatalogFilePath(catalogPath);
+            // var configJson = configurationsPath != null ? File.ReadAllText(configurationsPath) : "{}";
+            // var configs = DeserializeConfigJson(configJson);
+
+            string configJsonPath = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), catalogPath);
+            SpaceConfiguration configs = ContentManagement.GetSpaceConfiguration(inputModels, configJsonPath, programTypeName);
+
+
             var spacePlanningZones = inputModels["Space Planning Zones"];
             var levels = GetLevels(inputModels, spacePlanningZones);
             var levelVolumes = LayoutStrategies.GetLevelVolumes<TLevelVolume>(inputModels);
-            var configJson = configurationsPath != null ? File.ReadAllText(configurationsPath) : "{}";
-            var configs = DeserializeConfigJson(configJson);
+
+
+
             var allSpaceBoundaries = spacePlanningZones.AllElementsAssignableFromType<TSpaceBoundary>().Where(z => (z.HyparSpaceType ?? z.Name) == programTypeName).ToList();
             foreach (var lvl in levels)
             {

LayoutFunctions/LayoutFunctionCommon/LayoutStrategies.cs

@@ -172,7 +172,6 @@ public static bool IsNearlyARectangle(IEnumerable<Polygon> polygons)
             dynamic overrides, Model outputModel,
             bool createWalls,
             string configurationsPath,
-            string catalogPath = "catalog.json",
             Func<LayoutInstantiated, int> countSeats = null
              )
              where TLevelElements : Element, ILevelElements
@@ -181,7 +180,14 @@ public static bool IsNearlyARectangle(IEnumerable<Polygon> polygons)
              where TCirculationSegment : Floor, ICirculationSegment
         {
             var processedSpaces = new HashSet<Guid>();
-            ContentCatalogRetrieval.SetCatalogFilePath(catalogPath);
+
+            // ContentCatalogRetrieval.SetCatalogFilePath(catalogPath);
+            // var configJson = configurationsPath != null ? File.ReadAllText(configurationsPath) : "{}";
+            // var configs = JsonConvert.DeserializeObject<SpaceConfiguration>(configJson);
+
+            string configJsonPath = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), configurationsPath);
+            SpaceConfiguration configs = ContentManagement.GetSpaceConfiguration(inputModels, configJsonPath, programTypeName);
+
             var spacePlanningZones = inputModels["Space Planning Zones"];
             var levels = spacePlanningZones.AllElementsAssignableFromType<TLevelElements>();
 
@@ -195,8 +201,6 @@ public static bool IsNearlyARectangle(IEnumerable<Polygon> polygons)
                 }
             }
             var levelVolumes = GetLevelVolumes<TLevelVolume>(inputModels);
-            var configJson = configurationsPath != null ? File.ReadAllText(configurationsPath) : "{}";
-            var configs = JsonConvert.DeserializeObject<SpaceConfiguration>(configJson);
             var allSpaceBoundaries = spacePlanningZones.AllElementsAssignableFromType<TSpaceBoundary>().Where(z => (z.HyparSpaceType ?? z.Name) == programTypeName).ToList();
             foreach (var lvl in levels)
             {

LayoutFunctions/LayoutFunctionCommon/ProgramRequirement.cs

@@ -0,0 +1,12 @@
+using System;
+using Newtonsoft.Json;
+
+namespace Elements
+{
+    public partial class ProgramRequirement : IProgramRequirement
+    {
+        [JsonProperty("Qualified Program Name")]
+        public string QualifiedProgramName => String.IsNullOrWhiteSpace(this.ProgramGroup) ? this.ProgramName : $"{this.ProgramGroup} - {this.ProgramName}";
+        public int CountPlaced { get; set; }
+    }
+}

LayoutFunctions/OpenOfficeLayout/dependencies/ProgramRequirement.g.cs → LayoutFunctions/LayoutFunctionCommon/ProgramRequirement.g.cs

@@ -27,7 +27,7 @@ namespace Elements
     public partial class ProgramRequirement : Element
     {
         [JsonConstructor]
-        public ProgramRequirement(string @programGroup, string @programName, Color? @color, double @areaPerSpace, int @spaceCount, double? @width, double? @depth, string @hyparSpaceType, ProgramRequirementCountType @countType, double @totalArea, System.Guid @id = default, string @name = null)
+        public ProgramRequirement(string @programGroup, string @programName, Color? @color, double @areaPerSpace, int @spaceCount, double? @width, double? @depth, string @hyparSpaceType, ProgramRequirementCountType @countType, double @totalArea, System.Guid? @spaceConfig, System.Guid? @layoutTypeId, System.Guid? @catalog, System.Guid @id = default, string @name = null)
             : base(id, name)
         {
             this.ProgramGroup = @programGroup;
@@ -40,6 +40,9 @@ public ProgramRequirement(string @programGroup, string @programName, Color? @col
             this.HyparSpaceType = @hyparSpaceType;
             this.CountType = @countType;
             this.TotalArea = @totalArea;
+            this.SpaceConfig = @spaceConfig;
+            this.LayoutTypeId = @layoutTypeId;
+            this.Catalog = @catalog;
             }
 
 
@@ -96,6 +99,18 @@ public ProgramRequirement()
         [JsonProperty("Total Area", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public double TotalArea { get; set; }
 
+        /// <summary>The guid of the space configuration</summary>
+        [JsonProperty("SpaceConfig", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public System.Guid? SpaceConfig { get; set; }
+
+        /// <summary>The guid of the layout type</summary>
+        [JsonProperty("Layout Type Id", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public System.Guid? LayoutTypeId { get; set; }
+
+        /// <summary>The guid of the catalog</summary>
+        [JsonProperty("Catalog", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public System.Guid? Catalog { get; set; }
+
 
     }
 }

LayoutFunctions/OpenOfficeLayout/dependencies/ProgramRequirementCountType.g.cs → LayoutFunctions/LayoutFunctionCommon/ProgramRequirementCountType.g.cs

@@ -19,16 +19,16 @@
 
 namespace Elements
 {
-    #pragma warning disable // Disable all warnings
+#pragma warning disable // Disable all warnings
 
     [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")]
     public enum ProgramRequirementCountType
     {
         [System.Runtime.Serialization.EnumMember(Value = @"Item")]
         Item = 0,
-    
+
         [System.Runtime.Serialization.EnumMember(Value = @"Area Total")]
         Area_Total = 1,
-    
+
     }
 }

LayoutFunctions/LoungeLayout/.vscode/launch.json

@@ -1,26 +1,45 @@
 {
-    "version": "0.2.0",
-    "configurations": [
-        {
-            // Use IntelliSense to find out which attributes exist for C# debugging
-            // Use hover for the description of the existing attributes
-            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
-            "name": ".NET Core Launch (console)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/test/bin/Debug/netcoreapp3.1/LoungeLayout.Tests.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/test",
-            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
-            "console": "internalConsole",
-            "stopAtEntry": false
-        },
-        {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach"
-        }
-    ]
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": ".NET Core Launch (console)",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build",
+      "program": "${workspaceFolder}/test/bin/Debug/netcoreapp3.1/LoungeLayout.Tests.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/test",
+      "console": "internalConsole",
+      "stopAtEntry": false
+    },
+    {
+      "name": ".NET Core Attach",
+      "type": "coreclr",
+      "request": "attach"
+    },
+    {
+      "name": "Attach to Hypar Run",
+      "type": "coreclr",
+      "request": "attach",
+      "processName": "LoungeLayout.Server"
+    },
+    {
+      "name": "Launch Hypar Run (Run once only)",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "${workspaceFolder}/server/bin/Debug/net6.0/LoungeLayout.Server.dll",
+      "args": [
+        "--workflow-id",
+        "${input:workflowId}"
+      ],
+      "preLaunchTask": "server-build"
+    }
+  ],
+  "inputs": [
+    {
+      "id": "workflowId",
+      "type": "promptString",
+      "description": "Enter the workflow id to run."
+    }
+  ]
 }