Merge pull request #15 from hypar-io/library-versions

Upgrade Elements and Functions packages to support Design Options
hypar-io · Feb 20, 2025 · f802a50 · f802a50
2 parents 5e58895 + f9b598c
commit f802a50
Show file tree

Hide file tree

Showing 8 changed files with 153 additions and 8 deletions.
diff --git a/dependencies/ConceptualMass.g.cs b/dependencies/ConceptualMass.g.cs
@@ -27,14 +27,15 @@ namespace Elements
     public partial class ConceptualMass : Envelope
     {
         [JsonConstructor]
-        public ConceptualMass(IList<Line> @skeleton, string @primaryUseCategory, System.Guid? @building, IList<System.Guid> @levelIds, Transform @localCoordinateSystem, Profile @profile, double @elevation, double @height, Vector3 @direction, double @rotation, IList<double> @floorToFloorHeights, Transform @transform, Material @material, Representation @representation, bool @isElementDefinition, System.Guid @id, string @name)
+        public ConceptualMass(IList<Line> @skeleton, string @primaryUseCategory, System.Guid? @building, IList<System.Guid> @levelIds, Transform @localCoordinateSystem, Profile @boundary, Profile @profile, double @elevation, double @height, Vector3 @direction, double @rotation, IList<double> @floorToFloorHeights, Transform @transform, Material @material, Representation @representation, bool @isElementDefinition, System.Guid @id, string @name)
             : base(profile, elevation, height, direction, rotation, floorToFloorHeights, transform, material, representation, isElementDefinition, id, name)
         {
             this.Skeleton = @skeleton;
             this.PrimaryUseCategory = @primaryUseCategory;
             this.Building = @building;
             this.LevelIds = @levelIds;
             this.LocalCoordinateSystem = @localCoordinateSystem;
+            this.Boundary = @boundary;
             }
 
 
@@ -64,6 +65,9 @@ public ConceptualMass()
         [JsonProperty("Local Coordinate System", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public Transform LocalCoordinateSystem { get; set; }
 
+        [JsonProperty("Boundary", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public Profile Boundary { get; set; }
+
 
     }
 }
diff --git a/dependencies/InitialDimensions.g.cs b/dependencies/InitialDimensions.g.cs
@@ -0,0 +1,57 @@
+//----------------------
+// <auto-generated>
+//     Generated using the NJsonSchema v10.1.21.0 (Newtonsoft.Json v13.0.0.0) (http://NJsonSchema.org)
+// </auto-generated>
+//----------------------
+using Elements;
+using Elements.GeoJSON;
+using Elements.Geometry;
+using Elements.Geometry.Solids;
+using Elements.Spatial;
+using Elements.Validators;
+using Elements.Serialization.JSON;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Line = Elements.Geometry.Line;
+using Polygon = Elements.Geometry.Polygon;
+
+namespace Elements
+{
+    #pragma warning disable // Disable all warnings
+
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")]
+    public partial class InitialDimensions 
+    {
+        [JsonConstructor]
+        public InitialDimensions(double @width, double @depth)
+        {
+            this.Width = @width;
+            this.Depth = @depth;
+            }
+
+
+        // Empty constructor
+        public InitialDimensions()
+        {
+        }
+
+        [JsonProperty("width", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public double Width { get; set; }
+
+        [JsonProperty("depth", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public double Depth { get; set; }
+
+        private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
+
+        [JsonExtensionData]
+        public System.Collections.Generic.IDictionary<string, object> AdditionalProperties
+        {
+            get { return _additionalProperties; }
+            set { _additionalProperties = value; }
+        }
+
+
+    }
+}
diff --git a/dependencies/SpaceBoundary.g.cs b/dependencies/SpaceBoundary.g.cs
@@ -27,7 +27,7 @@ namespace Elements
     public partial class SpaceBoundary : GeometricElement
     {
         [JsonConstructor]
-        public SpaceBoundary(Profile @boundary, IList<Polygon> @cells, double @area, double? @length, double? @depth, double @height, string @programGroup, string @programType, System.Guid? @programRequirement, System.Guid? @level, System.Guid? @levelLayout, string @hyparSpaceType, string @defaultWallType, Transform @transform = null, Material @material = null, Representation @representation = null, bool @isElementDefinition = false, System.Guid @id = default, string @name = null)
+        public SpaceBoundary(Profile @boundary, IList<Polygon> @cells, double @area, double? @length, double? @depth, double @height, string @programGroup, string @programType, Type @type, System.Guid? @programRequirement, System.Guid? @level, System.Guid? @levelLayout, string @hyparSpaceType, string @defaultWallType, 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.Boundary = @boundary;
@@ -38,6 +38,7 @@ public SpaceBoundary(Profile @boundary, IList<Polygon> @cells, double @area, dou
             this.Height = @height;
             this.ProgramGroup = @programGroup;
             this.ProgramType = @programType;
+            this.Type = @type;
             this.ProgramRequirement = @programRequirement;
             this.Level = @level;
             this.LevelLayout = @levelLayout;
@@ -84,6 +85,9 @@ public SpaceBoundary()
         [JsonProperty("Program Type", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string ProgramType { get; set; }
 
+        [JsonProperty("Type", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public Type Type { get; set; }
+
         [JsonProperty("Program Requirement", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public System.Guid? ProgramRequirement { get; set; }
 

diff --git a/dependencies/SpacePlanning.Dependencies.csproj b/dependencies/SpacePlanning.Dependencies.csproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Hypar.Elements" Version="2.2.0-alpha.21" />
-    <PackageReference Include="Hypar.Functions" Version="1.11.0-alpha.13" />
+    <PackageReference Include="Hypar.Elements" Version="2.3.0-alpha.5" />
+    <PackageReference Include="Hypar.Functions" Version="1.13.1-alpha.21" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>

diff --git a/dependencies/Type.g.cs b/dependencies/Type.g.cs
@@ -0,0 +1,69 @@
+//----------------------
+// <auto-generated>
+//     Generated using the NJsonSchema v10.1.21.0 (Newtonsoft.Json v13.0.0.0) (http://NJsonSchema.org)
+// </auto-generated>
+//----------------------
+using Elements;
+using Elements.GeoJSON;
+using Elements.Geometry;
+using Elements.Geometry.Solids;
+using Elements.Spatial;
+using Elements.Validators;
+using Elements.Serialization.JSON;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Line = Elements.Geometry.Line;
+using Polygon = Elements.Geometry.Polygon;
+
+namespace Elements
+{
+    #pragma warning disable // Disable all warnings
+
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")]
+    public partial class Type 
+    {
+        [JsonConstructor]
+        public Type(string @configurationSource, string @name, System.Guid @id, bool @profileLinkedToType, InitialDimensions @initialDimensions)
+        {
+            this.ConfigurationSource = @configurationSource;
+            this.Name = @name;
+            this.Id = @id;
+            this.ProfileLinkedToType = @profileLinkedToType;
+            this.InitialDimensions = @initialDimensions;
+            }
+
+
+        // Empty constructor
+        public Type()
+        {
+        }
+
+        [JsonProperty("configurationSource", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public string ConfigurationSource { get; set; }
+
+        [JsonProperty("name", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public string Name { get; set; }
+
+        [JsonProperty("id", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public System.Guid Id { get; set; }
+
+        [JsonProperty("profileLinkedToType", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public bool ProfileLinkedToType { get; set; }
+
+        [JsonProperty("initialDimensions", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public InitialDimensions InitialDimensions { get; set; }
+
+        private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
+
+        [JsonExtensionData]
+        public System.Collections.Generic.IDictionary<string, object> AdditionalProperties
+        {
+            get { return _additionalProperties; }
+            set { _additionalProperties = value; }
+        }
+
+
+    }
+}
diff --git a/dependencies/ViewScope.g.cs b/dependencies/ViewScope.g.cs
@@ -27,12 +27,14 @@ namespace Elements
     public partial class ViewScope : Element
     {
         [JsonConstructor]
-        public ViewScope(BBox3 @boundingBox, Camera @camera, bool? @lockRotation, bool? @clipWithBoundingBox, ViewScopeClippingBehavior? @clippingBehavior, bool? @modal, System.Collections.Generic.IDictionary<string, string> @functionVisibility, IList<object> @actions, System.Guid @id = default, string @name = null)
+        public ViewScope(BBox3 @boundingBox, Camera @camera, bool? @lockRotation, bool? @lockPosition, bool? @lockZoom, bool? @clipWithBoundingBox, ViewScopeClippingBehavior? @clippingBehavior, bool? @modal, System.Collections.Generic.IDictionary<string, string> @functionVisibility, IList<object> @actions, System.Guid @id = default, string @name = null)
             : base(id, name)
         {
             this.BoundingBox = @boundingBox;
             this.Camera = @camera;
             this.LockRotation = @lockRotation;
+            this.LockPosition = @lockPosition;
+            this.LockZoom = @lockZoom;
             this.ClipWithBoundingBox = @clipWithBoundingBox;
             this.ClippingBehavior = @clippingBehavior;
             this.Modal = @modal;
@@ -59,6 +61,14 @@ public ViewScope()
         [JsonProperty("Lock Rotation", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public bool? LockRotation { get; set; }
 
+        /// <summary>Whether this scope should lock view position. True to lock, False to unlock, and null to leave unchanged.</summary>
+        [JsonProperty("Lock Position", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public bool? LockPosition { get; set; }
+
+        /// <summary>Whether this scope should lock view zoom. True to lock, False to unlock, and null to leave unchanged.</summary>
+        [JsonProperty("Lock Zoom", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public bool? LockZoom { get; set; }
+
         /// <summary>Whether this scope should clip to the specified bounding box. If false, it only zooms to the bounding box without clipping.</summary>
         [JsonProperty("Clip With Bounding Box", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public bool? ClipWithBoundingBox { get; set; }

diff --git a/src/SpacePlanning.csproj b/src/SpacePlanning.csproj
@@ -4,6 +4,6 @@
     <ProjectReference Include="..\dependencies\SpacePlanning.Dependencies.csproj" />
   </ItemGroup>
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/test/SpacePlanning.Tests.csproj b/test/SpacePlanning.Tests.csproj
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>