urbanopt-geojson 0.3.0.pre1 → 0.5.1

data/lib/urbanopt/geojson/feature.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -47,9 +47,8 @@ module URBANopt
       # rubocop:disable Style/MethodMissing
       def method_missing(name, *args, &blk)
         # rubocop:enable Style/MethodMissing
-        # rubocop:disable Style/GuardClause
         if @feature_json[:properties].keys.map(&:to_sym).include? name.to_sym
-          # rubocop:enable Style/GuardClause
+
           return @feature_json[:properties][name.to_sym]
         else
           super
@@ -99,6 +98,89 @@ module URBANopt
         return @@feature_schema[feature_type]
       end
 
+      ##
+      # Used to calculate the aspect ratio for a given floor polygon.
+      #
+      def calculate_aspect_ratio
+        multi_polygons = get_multi_polygons(@feature_json)
+        rad_per_deg = 0.017453293
+
+        multi_polygons.each do |multi_polygon|
+          if multi_polygon.size > 1
+            runner.registerWarning('Ignoring holes in polygon')
+          end
+          multi_polygon.each do |polygon|
+            n = polygon.size
+            length = 0
+            north = 0
+            east = 0
+            south = 0
+            west = 0
+            aspect_ratio = 0
+
+            for i in (0..n - 2) do i
+                                   vertex_1 = nil
+                                   vertex_2 = nil
+                                   if i == n - 2
+                                     vertex_1 = polygon[n - 2]
+                                     vertex_2 = polygon[0]
+                                   else
+                                     vertex_1 = polygon[i]
+                                     vertex_2 = polygon[i + 1]
+                                   end
+                                   x_1 = vertex_1[0]
+                                   y_1 = vertex_1[1]
+                                   x_2 = vertex_2[0]
+                                   y_2 = vertex_2[1]
+
+                                   dist = (x_2 - x_1)**2 + (y_2 - y_1)**2
+
+                                   length = Math.sqrt(dist)
+
+                                   # delta latitude
+                                   dlat = x_2 - x_1
+                                   # delta longitude
+                                   dlon = y_2 - y_1
+
+                                   # convert radian to degree
+                                   sin_angle = Math.asin(dlon / length) * (1 / rad_per_deg)
+                                   sin_angle = sin_angle.round(4)
+
+                                   cos_angle = Math.acos(dlat / length) * (1 / rad_per_deg)
+                                   cos_angle = cos_angle.round(4)
+
+                                   if cos_angle >= 45 && cos_angle <= 135 && sin_angle >= 45 && sin_angle <= 90
+                                     north += length
+                                   elsif cos_angle >= 0 && cos_angle < 45 && sin_angle > -45 && sin_angle < 45
+                                     east += length
+                                   elsif  cos_angle >= 45 && cos_angle <= 135 && sin_angle >= -90 && sin_angle <= -45
+                                     south += length
+                                   elsif  cos_angle > 135 && cos_angle <= 180 && sin_angle > -45 && sin_angle < 45
+                                     west += length
+                                   end
+
+                                   if east + west != 0
+                                     aspect_ratio = (north + south) / (east + west)
+                                   else
+                                     aspect_ratio = 1
+                                   end
+
+            end
+
+            aspect_ratio = aspect_ratio.round(4)
+            return aspect_ratio
+          end
+        end
+      end
+
+      ##
+      # Used to calculate the perimeter multiplier given the aspect ratio, original perimeter and area.
+      def get_perimeter_multiplier(area, aspect_ratio, perimeter_original)
+        perimeter_new = 2 * (Math.sqrt(area * aspect_ratio) + Math.sqrt(area / aspect_ratio))
+        perimeter_ratio = perimeter_original / perimeter_new
+        return perimeter_ratio
+      end
+
       ##
       # Returns coordinate with the minimum longitute and latitude within a given +building_json+ .
       def get_min_lon_lat
@@ -168,6 +250,38 @@ module URBANopt
         return OpenStudio::PointLatLon.new(min_lat, min_lon, 0)
       end
 
+      ##
+      # Used to determine the centroid for the feature's coordinates.
+      #
+      # [Parameters]
+      # * +vertices+ - The first set polygon vertices in the array of feature coordinates.
+      def find_feature_center(vertices)
+        number_of_locations = vertices.length
+
+        return vertices.first if number_of_locations == 1
+
+        x = y = z = 0.0
+        vertices.each do |station|
+          latitude = station[0] * Math::PI / 180
+          longitude = station[1] * Math::PI / 180
+
+          x += Math.cos(latitude) * Math.cos(longitude)
+          y += Math.cos(latitude) * Math.sin(longitude)
+          z += Math.sin(latitude)
+        end
+
+        x /= number_of_locations
+        y /= number_of_locations
+        z /= number_of_locations
+
+        central_longitude = Math.atan2(y, x)
+        central_square_root = Math.sqrt(x * x + y * y)
+        central_latitude = Math.atan2(z, central_square_root)
+
+        [central_latitude * 180 / Math::PI,
+         central_longitude * 180 / Math::PI]
+      end
+
       private
 
       ##

data/lib/urbanopt/geojson/geo_file.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -161,9 +161,8 @@ module URBANopt
           if f[:properties] && f[:properties][:id] == feature_id
             # merge site origin properties
             f = merge_site_properties(f)
-            # rubocop:disable Style/GuardClause
             if f[:properties][:type] == 'Building'
-              # rubocop:enable Style/GuardClause
+
               return URBANopt::GeoJSON::Building.new(f)
             elsif f[:properties] && f[:properties][:type] == 'District System'
               return URBANopt::GeoJSON::DistrictSystem.new(f)
@@ -200,7 +199,7 @@ module URBANopt
         add_props.each do |prop|
           if project.key?(prop[:site]) && project[prop[:site]]
             # property exists in site
-            if !feature[:properties].key?(prop[:feature]) || feature[:properties][prop[:feature]].nil? || feature[:properties][prop[:feature]].empty?
+            if !feature[:properties].key?(prop[:feature]) || feature[:properties][prop[:feature]].nil? || feature[:properties][prop[:feature]].to_s.empty?
               # property does not exist in feature or is nil: add site property (don't overwrite)
               feature[:properties][prop[:feature]] = project[prop[:site]]
             end

data/lib/urbanopt/geojson/helper.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -154,7 +154,7 @@ module URBANopt
         stories.each_index do |i|
           space_type = nil
           space = stories[i].spaces.first
-          if space && space.spaceType.is_initialized
+          if space&.spaceType&.is_initialized
             space_type = space.spaceType.get
           else
             space_type = OpenStudio::Model::SpaceType.new(model)
@@ -183,7 +183,9 @@ module URBANopt
       # * +origin_lat_lon+ - _Type:Float_ - An instance of +OpenStudio::PointLatLon+ indicating the origin's latitude and longitude.
       # * +runner+ - _Type:String_ - The measure run's instance of +OpenStudio::Measure::OSRunner+ .
       # * +zoning+ - _Type:Boolean_ - Value is +True+ if utilizing detailed zoning, else +False+. Zoning is set to False by default.
-      def self.floor_print_from_polygon(polygon, elevation, origin_lat_lon, runner, zoning = false)
+      # * +scaled_footprint_area+ - Used to scale the footprint area using the floor area. 0 by
+      #   default (no scaling).
+      def self.floor_print_from_polygon(polygon, elevation, origin_lat_lon, runner, zoning = false, scaled_footprint_area = 0)
         floor_print = OpenStudio::Point3dVector.new
         all_points = OpenStudio::Point3dVector.new
         polygon.each do |p|
@@ -207,9 +209,42 @@ module URBANopt
           floor_print = OpenStudio.reverse(floor_print)
           runner.registerWarning('Reversing floor print')
         end
+
+        # check for scaling
+        if scaled_footprint_area > 0
+
+          # check that the scaled_footprint_area desired is no less than X % of the original
+          original_floor_print_area = OpenStudio.getArea(floor_print).get
+          if scaled_footprint_area / original_floor_print_area <= 0.5 || scaled_footprint_area / original_floor_print_area >= 2
+            # TOO MUCH SCALING...using original footprint when scaled is 2x bigger or smaller than the original
+            runner.registerWarning('Desired scaled_footprint_area is a factor of 2 of the original footprint...keeping original footprint (no scaling!)')
+          else
+            new_floor_print = adjust_vertices_to_area(floor_print, scaled_footprint_area, runner)
+            new_footprint_area = OpenStudio.getArea(new_floor_print).get
+            runner.registerInfo("New floor area: #{new_footprint_area}, compared to scaled area desired: #{scaled_footprint_area}")
+            floor_print = new_floor_print
+          end
+        end
+
         return floor_print
       end
 
+      ##
+      # Used to scale footprint to desired area while keeping the original shape.
+      #
+      # [Parameters]
+      # * +vertices+ - _Type:Array_ - An array of vertices for the original floorprint 
+      # * +desired_area+ - _Type:String_ - Area to which you want to scale the vertices to
+      # * +runner+ - _Type:String_ - An instance of +Openstudio::Measure::OSRunner+ for the measure run.
+      # 
+      def self.adjust_vertices_to_area(vertices, desired_area, runner, eps = 0.1)
+        ar = ScaleArea.new(vertices, desired_area, runner, eps)
+
+        n = Newton.nlsolve(ar, [0])
+
+        return ar.new_vertices
+      end
+
       ##
       # Calculate which other buildings are shading the current feature and return as an array of
       # +OpenStudio::Model::Space+.
@@ -243,6 +278,7 @@ module URBANopt
             if number_of_stories_above_ground.nil?
               number_of_stories_above_ground = number_of_stories
               number_of_stories_below_ground = 0
+
             else
               number_of_stories_below_ground = number_of_stories - number_of_stories_above_ground
             end
@@ -251,6 +287,13 @@ module URBANopt
             if number_of_stories_above_ground && number_of_stories_above_ground > 0 && maximum_roof_height
               floor_to_floor_height = maximum_roof_height / number_of_stories_above_ground
             end
+
+            # check that feature has a # stories
+            if number_of_stories_above_ground.nil?
+              runner.registerWarning("[geojson process_other_buildings] Unable to include feature #{other_building[:properties][:id]} in shading calculations: no 'number of stories' data")
+            end
+            next if number_of_stories_above_ground.nil?
+
             other_height = number_of_stories_above_ground * floor_to_floor_height
             # find the polygon of the other_building by passing it to the get_multi_polygons method
             other_building_points = building.other_points(other_building, other_height, origin_lat_lon, runner, zoning)

data/lib/urbanopt/geojson/logging.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/geojson/mapper_classes.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/geojson/model.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -65,17 +65,16 @@ module URBANopt
       # * +runner+ - _Type:String_ - Measure run's instance of +OpenStudio::Measure::OSRunner+ .
       def self.change_adjacent_surfaces_to_adiabatic(model, runner)
         runner.registerInfo('Changing adjacent surfaces to adiabatic')
-        model.getSurfaces.each do |surface|
+        model.getSurfaces.sort.each do |surface|
           adjacent_surface = surface.adjacentSurface
           if !adjacent_surface.empty?
             surface_construction = surface.construction
             if !surface_construction.empty?
               surface.setConstruction(surface_construction.get)
             end
-            surface.setOutsideBoundaryCondition('Adiabatic')
-
             adjacent_surface_construction = adjacent_surface.get.construction
             if !adjacent_surface_construction.empty?
+              surface.setOutsideBoundaryCondition('Adiabatic')
               adjacent_surface.get.setConstruction(adjacent_surface_construction.get)
             end
             adjacent_surface.get.setOutsideBoundaryCondition('Adiabatic')

data/lib/urbanopt/geojson/region.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/geojson/scale_area.rb

@@ -0,0 +1,95 @@
+# *********************************************************************************
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# contributors. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this list
+# of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice, this
+# list of conditions and the following disclaimer in the documentation and/or other
+# materials provided with the distribution.
+#
+# Neither the name of the copyright holder nor the names of its contributors may be
+# used to endorse or promote products derived from this software without specific
+# prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+# *********************************************************************************
+
+require 'json'
+require 'net/http'
+require 'uri'
+require 'openssl'
+require 'bigdecimal/newton'
+
+module Newton
+  def self.jacobian(f, fx, x)
+    Jacobian.jacobian(f, fx, x)
+  end
+
+  def self.ludecomp(a, n, zero = 0, one = 1)
+    LUSolve.ludecomp(a, n, zero, one)
+  end
+
+  def self.lusolve(a, b, ps, zero = 0.0)
+    LUSolve.lusolve(a, b, ps, zero)
+  end
+end
+
+module URBANopt
+  module GeoJSON
+    class ScaleArea
+      def initialize(vertices, desired_area, runner, eps)
+        @vertices = vertices
+        @centroid = OpenStudio.getCentroid(vertices)
+        raise "Cannot compute centroid for '#{vertices}'" if @centroid.empty?
+        @centroid = @centroid.get
+        @desired_area = desired_area
+        @new_vertices = vertices
+        @runner = runner
+        @zero = BigDecimal('0.0')
+        @one  = BigDecimal('1.0')
+        @two  = BigDecimal('2.0')
+        @ten  = BigDecimal('10.0')
+        @eps  = eps
+      end
+
+      attr_reader :zero
+
+      attr_reader :one
+
+      attr_reader :two
+
+      attr_reader :ten
+
+      attr_reader :eps
+
+      ##
+      # Used to determine new scaled vertices, by iteratively passing in the perimeter distance to
+      # minimise the difference of the new and scaled area. Returns the difference of the new area and desired area.
+      #
+      def values(x)
+        @new_vertices = URBANopt::GeoJSON::Zoning.divide_floor_print(@vertices, x[0].to_f, @runner, scale = true)
+        new_area = OpenStudio.getArea(@new_vertices)
+        raise "Cannot compute area for '#{@new_vertices}'" if new_area.empty?
+        new_area = new_area.get
+
+        return [new_area - @desired_area]
+      end
+
+      attr_reader :new_vertices
+    end # ScaleArea
+  end # GeoJSON
+end # URBANopt

data/lib/urbanopt/geojson/schema/building_properties.json

@@ -87,7 +87,7 @@
       "type": "string"
     },
     "floor_area": {
-      "description": "Usable floor area (ft^2).",
+      "description": "Usable floor area (ft^2). Required for residential buildings, this represents conditioned floor area.",
       "type": "number"
     },
     "number_of_stories": {
@@ -95,7 +95,7 @@
       "type": "integer"
     },
     "number_of_stories_above_ground": {
-      "description": "The number of building stories above ground. Defaults to number_of_stories.",
+      "description": "The number of building stories above ground. Defaults to number_of_stories. Required for residential buildings.",
       "type": "integer"
     },
     "maximum_roof_height": {
@@ -111,6 +111,12 @@
         "Hip"
       ]
     },
+    "foundation_type": {
+      "$ref": "#/definitions/foundationType"
+    },
+    "attic_type": {
+      "$ref": "#/definitions/atticType"
+    },
     "footprint_area": {
       "description": "Area of the footprint (ft^2).  Calculated on export.",
       "type": "number"
@@ -132,6 +138,9 @@
     "system_type": {
       "$ref": "#/definitions/systemType"
     },
+    "heating_system_fuel_type": {
+      "$ref": "#/definitions/heatingSystemFuelType"
+    },
     "weekday_start_time": {
       "description": "Weekday operating hours start time in 08:30 format, using 24-hr clock. Leave blank to use default. Should this be part of a mixed type struct?",
       "type": "string"
@@ -185,7 +194,11 @@
       "maximum": 100
     },
     "number_of_residential_units": {
-      "description": "Total number of residential units in the building. Required for residential buildings or mixed-use buildings with residential use types.",
+      "description": "Total number of residential units in the building. Required for single-family attached and multifamily residential buildings.",
+      "type": "integer"
+    },
+    "number_of_bedrooms": {
+      "description": "Total number of bedrooms in the building. Required for residential buildings. Must be divisible by the number of residential units.",
       "type": "integer"
     },
     "exterior_lighting_zone": {
@@ -214,14 +227,113 @@
       "description": "Arbitrary user data"
     }
   },
-  "required": [
-    "id",
-    "type",
-    "name",
-    "floor_area",
-    "number_of_stories",
-    "footprint_area",
-    "building_type"
+  "oneOf": [
+    {
+      "properties": {
+        "building_type": {
+          "enum": [
+            "Single-Family Detached"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "name",
+        "floor_area",
+        "number_of_stories_above_ground",
+        "number_of_stories",
+        "building_type",
+        "number_of_bedrooms",
+        "foundation_type",
+        "attic_type"
+      ]
+    },
+    {
+      "properties": {
+        "building_type": {
+          "enum": [
+            "Single-Family Attached"
+           ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "name",
+        "floor_area",
+        "number_of_stories_above_ground",
+        "number_of_stories",
+        "building_type",
+        "number_of_residential_units",
+        "number_of_bedrooms",
+        "foundation_type",
+        "attic_type"
+      ]
+    },
+    {
+      "properties": {
+        "building_type": {
+          "enum": [
+            "Multifamily"
+           ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "name",
+        "floor_area",
+        "number_of_stories_above_ground",
+        "number_of_stories",
+        "building_type",
+        "number_of_residential_units",
+        "number_of_bedrooms",
+        "foundation_type"
+      ]
+    },
+    {
+      "properties": {
+        "building_type": {
+          "enum": [
+            "Single-Family",
+            "Multifamily (2 to 4 units)",
+            "Multifamily (5 or more units)",
+            "Vacant",
+            "Office",
+            "Laboratory",
+            "Nonrefrigerated warehouse",
+            "Food sales",
+            "Public order and safety",
+            "Outpatient health care",
+            "Refrigerated warehouse",
+            "Religious worship",
+            "Public assembly",
+            "Education",
+            "Food service",
+            "Inpatient health care",
+            "Nursing",
+            "Lodging",
+            "Strip shopping mall",
+            "Enclosed mall",
+            "Retail other than mall",
+            "Service",
+            "Mixed use",
+            "Uncovered Parking",
+            "Covered Parking"
+          ]
+        }
+      },
+      "required": [
+        "id",
+        "type",
+        "name",
+        "floor_area",
+        "number_of_stories",
+        "footprint_area",
+        "building_type"
+      ]
+    }
   ],
   "additionalProperties": true,
   "definitions": {
@@ -229,10 +341,12 @@
       "description": "Primary building space type.",
       "type": "string",
       "enum": [
+        "Single-Family Detached",
+        "Single-Family Attached",
+        "Multifamily",
         "Single-Family",
         "Multifamily (2 to 4 units)",
         "Multifamily (5 or more units)",
-        "Mobile Home",
         "Vacant",
         "Office",
         "Laboratory",
@@ -262,89 +376,116 @@
       "description": "Building HVAC system type. Should this be part of a mixed type struct?",
       "type": "string",
       "enum": [
-        "Ideal Air Loads",
-        "PTAC with hot water heat",
-        "PTAC with hot water heat with central air source heat pump",
-        "PTAC with gas coil heat",
+        "PTAC with baseboard electric",
+        "PTAC with baseboard gas boiler",
+        "PTAC with baseboard district hot water",
+        "PTAC with gas unit heaters",
+        "PTAC with electric coil",
+        "PTAC with gas coil",
         "PTAC with gas boiler",
-        "PTAC with electric baseboard heat",
         "PTAC with no heat",
-        "PTAC with district hot water heat",
-        "PTAC with central air source heat pump heat",
+        "PTAC with district hot water",
+        "PTAC with central air source heat pump",
         "PTHP",
-        "PSZ-AC with gas coil heat",
-        "PSZ-AC with electric baseboard heat",
+        "PSZ-AC with gas coil",
+        "PSZ-AC with baseboard electric",
         "PSZ-AC with no heat",
-        "PSZ-AC with district hot water heat",
-        "PSZ-AC with central air source heat pump heat",
+        "PSZ-AC with district hot water",
+        "PSZ-AC with central air source heat pump",
         "PSZ-HP",
         "Fan coil district chilled water with no heat",
-        "Fan coil district chilled water and boiler",
-        "Fan coil district chilled water and central air source heat pump",
-        "Fan coil district chilled water unit heaters",
-        "Fan coil district chilled water electric baseboard heat",
-        "Fan coil district hot and chilled water",
-        "Fan coil district hot water and chiller",
-        "Fan coil district hot water and air-cooled chiller",
-        "Fan coil chiller and boiler",
-        "Fan coil air-cooled chiller and boiler",
-        "Fan coil chiller and central air source heat pump",
-        "Fan coil air-cooled chiller and central air source heat pump",
+        "Fan coil district chilled water with boiler",
+        "Fan coil district chilled water with central air source heat pump",
+        "Fan coil district chilled water with gas unit heaters",
+        "Fan coil district chilled water with baseboard electric",
+        "Fan coil district chilled water with district hot water",
+        "Fan coil chiller with district hot water",
+        "Fan coil air-cooled chiller with district hot water",
+        "Fan coil chiller with boiler",
+        "Fan coil air-cooled chiller with boiler",
+        "Fan coil chiller with central air source heat pump",
+        "Fan coil air-cooled chiller with central air source heat pump",
         "Fan coil chiller with no heat",
         "DOAS with fan coil district chilled water with no heat",
         "DOAS with fan coil district chilled water and boiler",
-        "DOAS with fan coil district chilled water and central air source heat pump",
-        "DOAS with fan coil district chilled water unit heaters",
-        "DOAS with fan coil district chilled water electric baseboard heat",
-        "DOAS with fan coil district hot and chilled water",
-        "DOAS with fan coil district hot water and chiller",
-        "DOAS with fan coil district hot water and air-cooled chiller",
-        "DOAS with fan coil chiller and boiler",
-        "DOAS with fan coil air-cooled chiller and boiler",
-        "DOAS with fan coil chiller and central air source heat pump",
-        "DOAS with fan coil air-cooled chiller and central air source heat pump",
+        "DOAS with fan coil district chilled water with central air source heat pump",
+        "DOAS with fan coil district chilled water with gas unit heaters",
+        "DOAS with fan coil district chilled water with baseboard electric",
+        "DOAS with fan coil district chilled water with district hot water",
+        "DOAS with fan coil chiller with district hot water",
+        "DOAS with fan coil air-cooled chiller with district hot water",
+        "DOAS with fan coil air-cooled chiller with boiler",
+        "DOAS with fan coil chiller with central air source heat pump",
+        "DOAS with fan coil air-cooled chiller with central air source heat pump",
         "DOAS with fan coil chiller with no heat",
-        "VRF with DOAS",
+        "DOAS with VRF",
         "VRF",
-        "Ground Source Heat Pumps with DOAS",
-        "Baseboard district hot water heat",
-        "Baseboard district hot water heat with direct evap coolers",
-        "Baseboard electric heat",
-        "Baseboard electric heat with direct evap coolers",
-        "Baseboard hot water heat",
-        "Baseboard hot water heat with direct evap coolers",
+        "DOAS with water source heat pumps with ground source heat pump",
+        "Forced air furnace",
+        "Baseboard district hot water",
+        "Baseboard electric",
+        "Baseboard gas boiler",
+        "Baseboard central air source heat pump",
         "Window AC with no heat",
         "Window AC with forced air furnace",
-        "Window AC with district hot water baseboard heat",
-        "Window AC with hot water baseboard heat",
-        "Window AC with electric baseboard heat",
+        "Window AC with baseboard district hot water",
+        "Window AC with baseboard electric",
         "Window AC with unit heaters",
-        "Direct evap coolers",
-        "Direct evap coolers with unit heaters",
-        "Unit heaters",
-        "Heat pump heat with no cooling",
-        "Heat pump heat with direct evap cooler",
-        "VAV with reheat",
-        "VAV with reheat central air source heat pump",
-        "VAV with PFP boxes",
-        "VAV with gas reheat",
-        "VAV with zone unit heaters",
-        "VAV with electric baseboard heat",
-        "VAV cool with zone heat pump heat",
+        "Window AC with baseboard gas boiler",
+        "Window AC with baseboard central air source heat pump",
+        "Direct evap coolers with baseboard district hot water",
+        "Direct evap coolers with baseboard electric",
+        "Direct evap coolers with baseboard gas boiler",
+        "Direct evap coolers with baseboard central air source heat pump",
+        "Direct evap coolers with no heat",  
+        "Direct evap coolers with gas unit heaters",
+        "Direct evap coolers with forced air furnace",
+        "Gas unit heaters",
+        "VAV chiller with gas boiler reheat",
+        "VAV chiller with gas coil reheat",
+        "VAV chiller with central air source heat pump reheat",
+        "VAV chiller with PFP boxes",
+        "VAV air-cooled chiller with gas boiler reheat",
+        "VAV air-cooled chiller with central air source heat pump reheat",
+        "VAV air-cooled chiller with district hot water reheat",
+        "VAV air-cooled chiller with gas coil reheat",
+        "VAV air-cooled chiller with no reheat with gas unit heaters",
+        "VAV district chilled water with gas boiler reheat",
+        "VAV district chilled water with central air source heat pump reheat",
+        "VAV district chilled water with no reheat with zone heat pump",
+        "VAV chiller with no reheat with baseboard electric",
+        "VAV air-cooled chiller with no reheat with zone heat pump",
         "VAV district chilled water with district hot water reheat",
         "VAV district chilled water with gas coil reheat",
-        "PVAV with reheat",
-        "PVAV with reheat with central air source heat pump",
+        "PVAV with gas heat with electric reheat",
+        "PVAV with central air source heat pump reheat",
         "PVAV with PFP boxes",
-        "Residential forced air",
-        "Residential forced air cooling hot water baseboard heat",
-        "Residential forced air with district hot water",
-        "Residential heat pump",
-        "Forced air furnace",
-        "Forced air furnace district chilled water fan coil",
-        "Forced air furnace direct evap cooler",
-        "Residential AC with no heat",
-        "Residential AC with electric baseboard heat"
+        "Residential - electric resistance and no cooling",
+        "Residential - electric resistance and central air conditioner",
+        "Residential - electric resistance and room air conditioner",
+        "Residential - electric resistance and evaporative cooler",
+        "Residential - furnace and no cooling",
+        "Residential - furnace and central air conditioner",
+        "Residential - furnace and room air conditioner",
+        "Residential - furnace and evaporative cooler",
+        "Residential - boiler and no cooling",
+        "Residential - boiler and central air conditioner",
+        "Residential - boiler and room air conditioner",
+        "Residential - boiler and evaporative cooler",
+        "Residential - air-to-air heat pump",
+        "Residential - mini-split heat pump",
+        "Residential - ground-to-air heat pump"
+      ]
+    },
+    "heatingSystemFuelType": {
+      "description": "The fuel type of the heating system. This does not apply for certain system types (e.g., electric resistance or heat pumps).",
+      "type": "string",
+      "enum": [
+        "electricity",
+        "natural gas",
+        "fuel oil",
+        "propane",
+        "wood"
       ]
     },
     "templateType": {
@@ -378,8 +519,35 @@
         "DEER 2060",
         "DEER 2065",
         "DEER 2070",
-        "DEER 2075"
+        "DEER 2075",
+        "Residential IECC 2006 - Customizable Template Sep 2020",
+        "Residential IECC 2009 - Customizable Template Sep 2020",
+        "Residential IECC 2012 - Customizable Template Sep 2020",
+        "Residential IECC 2015 - Customizable Template Sep 2020",
+        "Residential IECC 2018 - Customizable Template Sep 2020"
+      ]
+    },
+    "foundationType": {
+      "description": "The foundation type of the building. Required for residential buildings.",
+      "type": "string",
+      "enum": [
+        "slab",
+        "crawlspace - vented",
+        "crawlspace - unvented",
+        "basement - unconditioned",
+        "basement - conditioned",
+        "ambient"
+      ]
+    },
+    "atticType": {
+      "description": "The attic type of the building. Required for single-family residential buildings.",
+      "type": "string",
+      "enum": [
+        "attic - vented",
+        "attic - unvented",
+        "attic - conditioned",
+        "flat roof"
       ]
     }
   }
-}
+}