Wall thickness

LayoutFunctions/ClassroomLayout/dependencies/ClassroomLayout.Dependencies.csproj

@@ -8,7 +8,7 @@
     <ProjectReference Include="..\..\LayoutFunctionCommon\LayoutFunctionCommon.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Hypar.Elements" Version="2.0.0" />
-    <PackageReference Include="Hypar.Functions" Version="1.8.0" />
+    <PackageReference Include="Hypar.Elements" Version="2.1.0-alpha.12" />
+    <PackageReference Include="Hypar.Functions" Version="1.9.0-alpha.3" />
   </ItemGroup>
 </Project>

LayoutFunctions/ClassroomLayout/src/ClassroomLayout.cs

@@ -67,16 +67,16 @@ public static ClassroomLayoutOutputs Execute(Dictionary<string, Model> inputMode
                     (lvl.AdditionalProperties.TryGetValue("LevelVolumeId", out var levelVolumeId) &&
                         levelVolumeId as string == l.Id.ToString())) ??
                         levelVolumes.FirstOrDefault(l => l.Name == lvl.Name);
-                var wallCandidateLines = new List<(Line line, string type)>();
+                var wallCandidateLines = new List<RoomEdge>();
                 foreach (var room in meetingRmBoundaries)
                 {
                     var seatsCount = 0;
                     var spaceBoundary = room.Boundary;
                     var levelInvertedTransform = levelVolume?.Transform.Inverted() ?? new Transform();
-                    var roomWallCandidatesLines = WallGeneration.FindWallCandidates(room, levelVolume?.Profile, corridorSegments, out Line orientationGuideEdge)
-                        .Select(c => (c.line.TransformedLine(levelInvertedTransform), c.type));
+                    var roomWallCandidatesLines = WallGeneration.FindWallCandidates(room, levelVolume?.Profile, corridorSegments, out RoomEdge orientationGuideEdge)
+                        .Select(c => new RoomEdge { Line = c.Line.TransformedLine(levelInvertedTransform), Type = c.Type, Thickness = c.Thickness });
                     wallCandidateLines.AddRange(roomWallCandidatesLines);
-                    var orientationTransform = new Transform(Vector3.Origin, orientationGuideEdge.Direction(), Vector3.ZAxis);
+                    var orientationTransform = new Transform(Vector3.Origin, orientationGuideEdge.Direction, Vector3.ZAxis);
                     var boundaryCurves = new List<Polygon>();
                     boundaryCurves.Add(spaceBoundary.Perimeter);
                     boundaryCurves.AddRange(spaceBoundary.Voids ?? new List<Polygon>());

LayoutFunctions/InteriorPartitions/.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/InteriorPartitions.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/InteriorPartitions.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": "InteriorPartitions.Server"
+    },
+    {
+      "name": "Launch Hypar Run (Run once only)",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "${workspaceFolder}/server/bin/Debug/net6.0/InteriorPartitions.Server.dll",
+      "args": [
+        "--workflow-id",
+        "${input:workflowId}"
+      ],
+      "preLaunchTask": "server-build"
+    }
+  ],
+  "inputs": [
+    {
+      "id": "workflowId",
+      "type": "promptString",
+      "description": "Enter the workflow id to run."
+    }
+  ]
 }

LayoutFunctions/InteriorPartitions/.vscode/tasks.json

@@ -1,41 +1,51 @@
 {
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/test/InteriorPartitions.Tests.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "publish",
-                "${workspaceFolder}/test/InteriorPartitions.Tests.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "watch",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "watch",
-                "run",
-                "--project",
-                "${workspaceFolder}/test/InteriorPartitions.Tests.csproj"
-            ],
-            "problemMatcher": "$msCompile"
-        }
-    ]
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/test/InteriorPartitions.Tests.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "publish",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "publish",
+        "${workspaceFolder}/test/InteriorPartitions.Tests.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "watch",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "watch",
+        "run",
+        "--project",
+        "${workspaceFolder}/test/InteriorPartitions.Tests.csproj"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "server-build",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/server/InteriorPartitions.Server.csproj"
+      ],
+      "problemMatcher": "$msCompile"
+    }
+  ]
 }

LayoutFunctions/InteriorPartitions/dependencies/InteriorPartitions.Dependencies.csproj

@@ -7,7 +7,7 @@
     <ProjectReference Include="..\..\LayoutFunctionCommon\LayoutFunctionCommon.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Hypar.Elements" Version="2.0.0" />
-    <PackageReference Include="Hypar.Functions" Version="1.6.0" />
+    <PackageReference Include="Hypar.Elements" Version="2.1.0-alpha.12" />
+    <PackageReference Include="Hypar.Functions" Version="1.9.0-alpha.3" />
   </ItemGroup>
 </Project>

LayoutFunctions/InteriorPartitions/dependencies/SpaceBoundary.g.cs

@@ -43,6 +43,7 @@ public SpaceBoundary(Profile @boundary, IList<Polygon> @cells, double @area, dou
             this.HyparSpaceType = @hyparSpaceType;
             }
 
+
         // Empty constructor
         public SpaceBoundary()
             : base()

LayoutFunctions/InteriorPartitions/dependencies/WallCandidate.cs

@@ -0,0 +1,12 @@
+using Elements;
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using Elements.Geometry;
+namespace Elements
+{
+    public partial class WallCandidate
+    {
+        public (double innerWidth, double outerWidth)? Thickness { get; set; }
+    }
+}

LayoutFunctions/InteriorPartitions/dependencies/WallCandidate.g.cs

@@ -35,6 +35,7 @@ public WallCandidate(Line @line, string @type, IList<SpaceBoundary> @spaceAdjace
             this.SpaceAdjacencies = @spaceAdjacencies;
             }
 
+
         // Empty constructor
         public WallCandidate()
             : base()

LayoutFunctions/InteriorPartitions/hypar.json

@@ -80,6 +80,11 @@
       "autohide": false,
       "name": "Room Layout",
       "optional": true
+    },
+    {
+      "autohide": false,
+      "name": "Furniture and Equipment",
+      "optional": true
     }
   ],
   "outputs": [],

LayoutFunctions/InteriorPartitions/server/InteriorPartitions.Server.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <ItemGroup>
+    <ProjectReference Include="..\src\InteriorPartitions.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Hypar.Server" Version="1.9.0-alpha.3" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

LayoutFunctions/InteriorPartitions/server/Program.cs

@@ -0,0 +1,26 @@
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Threading.Tasks;
+using System.Linq;
+
+namespace Hypar.Server
+{
+    public class Program
+    {
+        public static async Task Main(string[] args)
+        {
+            await HyparServer.StartAsync(
+                args,
+                Path.GetFullPath(Path.Combine(Assembly.GetExecutingAssembly().Location, "../../../../..")),
+                async (executionRequest) =>
+                {
+                    var input = executionRequest.Args.ToObject<InteriorPartitions.InteriorPartitionsInputs>();
+                    var function = new InteriorPartitions.Function();
+                    Directory.SetCurrentDirectory(Path.GetDirectoryName(typeof(InteriorPartitions.Function).Assembly.Location)!);
+                    return await function.Handler(input, null);
+                });
+        }
+    }
+}

LayoutFunctions/InteriorPartitions/src/Function.g.cs

@@ -62,7 +62,14 @@ public async Task<InteriorPartitionsOutputs> Handler(InteriorPartitionsInputs ar
 
             if(this.store == null)
             { 
-                this.store = new S3ModelStore<InteriorPartitionsInputs>(RegionEndpoint.GetBySystemName("us-west-1"));
+                if (args.SignedResourceUrls == null)
+                {
+                    this.store = new S3ModelStore<InteriorPartitionsInputs>(RegionEndpoint.GetBySystemName("us-west-1"));
+                }
+                else
+                {
+                    this.store = new UrlModelStore<InteriorPartitionsInputs>();
+                }
             }
 
             var l = new InvocationWrapper<InteriorPartitionsInputs,InteriorPartitionsOutputs> (store, InteriorPartitions.Execute);