diff --git a/Grids/Grid/dependencies/Grid.Dependencies.csproj b/Grids/Grid/dependencies/Grid.Dependencies.csproj index 7c10e5a7..3ccd295e 100644 --- a/Grids/Grid/dependencies/Grid.Dependencies.csproj +++ b/Grids/Grid/dependencies/Grid.Dependencies.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/Grids/Grid/dependencies/GridInputs.g.cs b/Grids/Grid/dependencies/GridInputs.g.cs index f00a6311..800b2cdb 100644 --- a/Grids/Grid/dependencies/GridInputs.g.cs +++ b/Grids/Grid/dependencies/GridInputs.g.cs @@ -70,13 +70,13 @@ public Grid1dInput(Polyline @curve, IList @splitPoints, Grid1dInputSubd [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")] - public class GridInputs : S3Args + public class GridInputs : ArgsBase { [Newtonsoft.Json.JsonConstructor] - public GridInputs(GridInputsMode @mode, double @bubbleRadius, IList @gridAreas, bool @showDebugGeometry, Overrides @overrides, string bucketName, string uploadsBucket, Dictionary modelInputKeys, string gltfKey, string elementsKey, string ifcKey): - base(bucketName, uploadsBucket, modelInputKeys, gltfKey, elementsKey, ifcKey) + public GridInputs(GridInputsMode @mode, double @bubbleRadius, IList @gridAreas, bool @showDebugGeometry, Overrides @overrides, Dictionary modelInputKeys, string gltfKey, string elementsKey, string ifcKey): + base(modelInputKeys, gltfKey, elementsKey, ifcKey) { var validator = Validator.Instance.GetFirstValidatorForType(); if(validator != null) diff --git a/Grids/Grid/dependencies/LevelVolume.g.cs b/Grids/Grid/dependencies/LevelVolume.g.cs index d3164fe8..d437122c 100644 --- a/Grids/Grid/dependencies/LevelVolume.g.cs +++ b/Grids/Grid/dependencies/LevelVolume.g.cs @@ -27,7 +27,7 @@ namespace Elements public partial class LevelVolume : GeometricElement { [JsonConstructor] - public LevelVolume(Profile @profile, double @height, double @area, string @buildingName, System.Guid? @level, System.Guid? @mass, System.Guid? @planView, Transform @transform = null, Material @material = null, Representation @representation = null, bool @isElementDefinition = false, System.Guid @id = default, string @name = null) + public LevelVolume(Profile @profile, double @height, double @area, string @buildingName, System.Guid? @level, System.Guid? @mass, System.Guid? @planView, IList @profiles, Transform @transform = null, Material @material = null, Representation @representation = null, bool @isElementDefinition = false, System.Guid @id = default, string @name = null) : base(transform, material, representation, isElementDefinition, id, name) { this.Profile = @profile; @@ -37,8 +37,10 @@ public LevelVolume(Profile @profile, double @height, double @area, string @build this.Level = @level; this.Mass = @mass; this.PlanView = @planView; + this.Profiles = @profiles; } + // Empty constructor public LevelVolume() : base() @@ -73,6 +75,10 @@ public LevelVolume() [JsonProperty("Plan View", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public System.Guid? PlanView { get; set; } + /// Multiple profiles used for a collection of volumes + [JsonProperty("Profiles", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public IList Profiles { get; set; } + } } \ No newline at end of file diff --git a/Grids/Grid/src/Function.g.cs b/Grids/Grid/src/Function.g.cs index ddcecc76..e6ce4796 100644 --- a/Grids/Grid/src/Function.g.cs +++ b/Grids/Grid/src/Function.g.cs @@ -2,7 +2,6 @@ // Edits to this code will be overwritten the next time you run 'hypar init'. // DO NOT EDIT THIS FILE. -using Amazon; using Amazon.Lambda.Core; using Hypar.Functions.Execution; using Hypar.Functions.Execution.AWS; @@ -19,9 +18,9 @@ public class Function { // Cache the model store for use by subsequent // executions of this lambda. - private IModelStore store; + private UrlModelStore store; - public async Task Handler(GridInputs args, ILambdaContext context) + public async Task Handler(GridInputs args) { // Preload dependencies (if they exist), // so that they are available during model deserialization. @@ -62,10 +61,11 @@ public async Task Handler(GridInputs args, ILambdaContext context) if(this.store == null) { - this.store = new S3ModelStore(RegionEndpoint.GetBySystemName("us-west-1")); + this.store = new UrlModelStore(); } + - var l = new InvocationWrapper(store, Grid.Execute); + var l = new InvocationWrapper (store, Grid.Execute); var output = await l.InvokeAsync(args); return output; }