urbanopt-geojson 0.2.0.pre2 → 0.3.1

data/lib/urbanopt/geojson/feature.rb

@@ -44,8 +44,11 @@ module URBANopt
         @feature_json = validate_feat(feature)
       end
 
+      # rubocop:disable Style/MethodMissing
       def method_missing(name, *args, &blk)
+        # rubocop:enable Style/MethodMissing
         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
@@ -164,13 +167,46 @@ 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
 
       ##
       # Used to validate the feature by checking +feature_id+ , +geometry+, +properties+
       # and +geometry_type+ .
-
+      # rubocop:disable Style/CommentedKeyword
       def validate_feat(feature) #:doc:
+        # rubocop:enable Style/CommentedKeyword
         if feature.nil? || feature.empty?
           raise("Feature '#{feature_id}' could not be found")
           return false

data/lib/urbanopt/geojson/geo_file.rb

@@ -80,7 +80,7 @@ module URBANopt
 
         # initialize @@logger
         @@logger ||= URBANopt::GeoJSON.logger
-        
+
         # validate each feature against schema
         geojson_file[:features].each do |feature|
           properties = feature[:properties]
@@ -93,16 +93,16 @@ module URBANopt
             # Incase detailed_model_filename present check for fewer properties
             if feature[:properties][:detailed_model_filename]
               if feature[:properties][:id].nil?
-                raise("No id found for Building Feature")
+                raise('No id found for Building Feature')
               end
               if feature[:properties][:name].nil?
-                raise("No name found for Building Feature")
+                raise('No name found for Building Feature')
               end
               if feature[:properties][:number_of_stories].nil?
                 @@logger.warn("Number of stories is required to calculate shading using the UrbanGeometryCreation measure...ignoring #{feature[:properties][:id]} in shading calculations")
               end
               feature[:additionalProperties] = true
-            # Else validate for all required properties in the schema 
+            # Else validate for all required properties in the schema
             else
               errors = validate(@@building_schema, properties)
             end
@@ -114,16 +114,15 @@ module URBANopt
             errors = validate(@@electrical_junction_schema, properties)
           when 'ElectricalConnector'
             errors = validate(@@electrical_connector_schema, properties)
-          when 'ElectricalJunction'
+          when 'ThermalJunction'
             errors = validate(@@thermal_junction_schema, properties)
           when 'ThermalConnector'
             errors = validate(@@thermal_connector_schema, properties)
           end
-          
+
           unless errors.empty?
-            raise ("#{type} does not adhere to schema: \n #{errors.join('\n  ')}")
+            raise "#{type} does not adhere to schema: \n #{errors.join('\n  ')}"
           end
-        
         end
         return new(geojson_file, path)
       end
@@ -163,6 +162,7 @@ module URBANopt
             # merge site origin properties
             f = merge_site_properties(f)
             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)
@@ -172,47 +172,48 @@ module URBANopt
         return nil
       end
 
-      ## 
-      # Merge Site Properties in Feature.  Returns feature with site properties added to its properties section. Does not overwrite existing properties.
-      # 
+      ##
+      # Merge Site Properties in Feature. Returns feature with site properties added to its properties section. Does not overwrite existing properties.
+      #
       # [Parameters]
       # +feature+ - _Type:Hash_ - feature object.
       def merge_site_properties(feature)
-        site_origins = @geojson_file[:features].select {|f| f[:properties][:type] == 'Site Origin'}
-        if site_origins.size > 0
-          site_origin = site_origins[0]
-          # site origin found, do some merging
-          # this maps site properties to building/district system properties. 
-          add_props = [
-            {site: :surface_elevation, feature: :surface_elevation}, 
-            {site: :timesteps_per_hour, feature: :timesteps_per_hour},
-            {site: :begin_date, feature: :begin_date},
-            {site: :end_date, feature: :end_date},
-            {site: :cec_climate_zone, feature: :cec_climate_zone},
-            {site: :climate_zone, feature: :climate_zone},
-            {site: :default_template, feature: :template},
-            {site: :weather_filename, feature: :weather_filename},
-            {site: :tariff_filename, feature: :tariff_filename}
-          ]
+        project = {}
+        if @geojson_file.key?(:project)
+          project = @geojson_file[:project]
+        end
 
-          add_props.each do |prop|
-            if site_origin[:properties].key?(prop[:site]) and site_origin[:properties][prop[:site]]
-              # property exists in site
-              if !feature[:properties].key?(prop[:feature]) or feature[:properties][prop[:feature]].nil? or feature[:properties][prop[:feature]].empty?
-                # property does not exist in feature or is nil: add site property (don't overwrite)
-                feature[:properties][prop[:feature]] = site_origin[:properties][prop[:site]]
-              end
+        # this maps site properties to building/district system properties.
+        add_props = [
+          { site: :surface_elevation, feature: :surface_elevation },
+          { site: :timesteps_per_hour, feature: :timesteps_per_hour },
+          { site: :begin_date, feature: :begin_date },
+          { site: :end_date, feature: :end_date },
+          { site: :cec_climate_zone, feature: :cec_climate_zone },
+          { site: :climate_zone, feature: :climate_zone },
+          { site: :default_template, feature: :template },
+          { site: :weather_filename, feature: :weather_filename },
+          { site: :tariff_filename, feature: :tariff_filename }
+        ]
+
+        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?
+              # property does not exist in feature or is nil: add site property (don't overwrite)
+              feature[:properties][prop[:feature]] = project[prop[:site]]
             end
           end
         end
+
         return feature
       end
 
       ##
-      # Validate GeoJSON against schema
+      # Validate GeoJSON against schema.
       #
       # [Parameters]
-      # * +data+ - + - _Type:Hash_ - Input GeoJSON file 
+      # * +data+ - + - _Type:Hash_ - Input GeoJSON file
       def self.validate(schema_json, data)
         errors = JSON::Validator.fully_validate(schema_json, data, errors_as_objects: true)
         return errors
@@ -242,7 +243,7 @@ module URBANopt
         end
         return result
       end
-      
+
       def self.get_district_system_schema(strict)
         result = nil
         File.open(File.dirname(__FILE__) + '/schema/district_system_properties.json') do |f|
@@ -255,7 +256,7 @@ module URBANopt
         end
         return result
       end
-      
+
       def self.get_region_schema(strict)
         result = nil
         File.open(File.dirname(__FILE__) + '/schema/region_properties.json') do |f|
@@ -330,7 +331,6 @@ module URBANopt
       @@electrical_junction_schema = get_electrical_junction_schema(strict)
       @@thermal_connector_schema = get_thermal_connector_schema(strict)
       @@thermal_junction_schema = get_thermal_junction_schema(strict)
-
     end
   end
 end

data/lib/urbanopt/geojson/helper.rb

@@ -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)
@@ -216,13 +216,13 @@ module URBANopt
       #
       # [Parameters]
       # * +building+ - _Type:URBANopt::GeoJSON::Building_ - The core building that other buildings will be referenced.
-      # * +other_building_type+ - _Type:String_ - Describes the surrounding buildings. 
+      # * +other_building_type+ - _Type:String_ - Describes the surrounding buildings.
       # * +other_buildings+ - _Type:URBANopt::GeoJSON::FeatureCollection_ - List of surrounding buildings to include (self will be ignored if present in list).
       # * +model+ - _Type:OpenStudio::Model::Model_ - An instance of an OpenStudio Model.
       # * +origin_lat_lon+ - _Type:Float_ - An instance of +OpenStudio::PointLatLon+ indicating the latitude and longitude of the origin.
       # * +runner+ - _Type:String_ - An instance of +Openstudio::Measure::OSRunner+ for the measure run.
       # * +zoning+ - _Type:Boolean_ - Value is +true+ if utilizing detailed zoning, else
-      #   +false+. Zoning is set to false by default. 
+      #   +false+. Zoning is set to false by default.
       def self.process_other_buildings(building, other_building_type, other_buildings, model, origin_lat_lon, runner, zoning = false)
         # Empty array to store the new OpenStudio model spaces that need to be converted to shading objects
         feature_points = building.feature_points(origin_lat_lon, runner, zoning)
@@ -243,6 +243,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,11 +252,18 @@ 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)
             shadowed = URBANopt::GeoJSON::Helper.is_shadowed(feature_points, other_building_points, origin_lat_lon)
-            next unless shadowed 
+            next unless shadowed
             new_building = building.create_other_building(:space_per_building, model, origin_lat_lon, runner, zoning, other_building)
             if new_building.nil? || new_building.empty?
               runner.registerWarning("Failed to create spaces for other building '#{name}'")
@@ -264,7 +272,6 @@ module URBANopt
 
           elsif other_building_type == 'None'
           end
-
         end
         return other_spaces
       end

data/lib/urbanopt/geojson/mapper_classes.rb

@@ -32,54 +32,54 @@ require 'urbanopt/scenario'
 require 'json'
 
 module URBANopt
-    module GeoJSON
-        class Mapper < MapperBase
-            @@instance_lock = Mutex.new
-            @@osw = nil
+  module GeoJSON
+    class Mapper < MapperBase
+      @@instance_lock = Mutex.new
+      @@osw = nil
 
-            ##
-            # This class inherits from the +MapperBase+ . 
-            # Used to perform initializing functions, used to define the osw_path for
-            # baseline.osw for the URBANopt GeoJSON example project and the weather file. 
+      ##
+      # This class inherits from the +MapperBase+ .
+      # Used to perform initializing functions, used to define the osw_path for
+      # baseline.osw for the URBANopt GeoJSON example project and the weather file.
 
-            def initialize()
-                @@instance_lock.synchronize do
-                if @@osw.nil?
-                    osw_path = File.join(File.dirname(__FILE__), 'baseline.osw')
-                    File.open(osw_path, 'r') do |file|
-                    @@osw = JSON.parse(file.read, symbolize_names: true)
-                    end
-                    @@osw[:file_paths] << File.join(File.dirname(__FILE__), '../weather/')
-                    @@osw = OpenStudio::Extension.configure_osw(@@osw)
-                end
-            end
-
-            ##
-            # Creates an OpenStudio Workflow file for a given ScenarioBase object,
-            # feature id and feature name.
-            #
-            # [Parameters]
-            # * +scenario+ - _Type:String_ - Used to define the Scenario for the osw. 
-
-            # * +feature_id+ - _Type:String/Number_ - Used to define the feature_id for
-            #   which the osw is implemented.
-            # 
-            # * +feature_name+ - _Type:String_ - The name of the feature. 
-            def create_osw(scenario, feature_id, feature_name)
-                # get the feature from the scenario's feature_file #:nodoc:
-                feature_file = scenario.feature_file
-                feature = feature_file.get_feature_by_id(feature_id)
-
-                raise "Cannot find feature '#{feature_id}' in '#{scenario.geometry_file}'" if feature.nil?
-
-                # deep clone of @@osw before we configure it #:nodoc:
-                osw = Marshal.load(Marshal.dump(@@osw))
-
-                osw[:name] = feature_name
-                osw[:description] = feature_name
-
-                return osw
+      def initialize
+        @@instance_lock.synchronize do
+          if @@osw.nil?
+            osw_path = File.join(File.dirname(__FILE__), 'baseline.osw')
+            File.open(osw_path, 'r') do |file|
+              @@osw = JSON.parse(file.read, symbolize_names: true)
             end
+            @@osw[:file_paths] << File.join(File.dirname(__FILE__), '../weather/')
+            @@osw = OpenStudio::Extension.configure_osw(@@osw)
+          end
         end
+
+        ##
+        # Creates an OpenStudio Workflow file for a given ScenarioBase object,
+        # feature id and feature name.
+        #
+        # [Parameters]
+        # * +scenario+ - _Type:String_ - Used to define the Scenario for the osw.
+        # * +feature_id+ - _Type:String/Number_ - Used to define the feature_id for
+        #   which the osw is implemented.
+        #
+        # * +feature_name+ - _Type:String_ - The name of the feature.
+        # rubocop:disable Lint/NestedMethodDefinition
+        def create_osw(scenario, feature_id, feature_name)
+          # rubocop:enable Lint/NestedMethodDefinition
+          # get the feature from the scenario's feature_file #:nodoc:
+          feature_file = scenario.feature_file
+          feature = feature_file.get_feature_by_id(feature_id)
+          raise "Cannot find feature '#{feature_id}' in '#{scenario.geometry_file}'" if feature.nil?
+          # deep clone of @@osw before we configure it #:nodoc:
+          osw = Marshal.load(Marshal.dump(@@osw))
+          osw[:name] = feature_name
+          osw[:description] = feature_name
+          end
+        # rubocop:disable Lint/ReturnInVoidContext
+        return osw
+       # rubocop:enable Lint/ReturnInVoidContext
+     end
     end
-end
+  end
+end

data/lib/urbanopt/geojson/model.rb

@@ -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/schema/building_properties.json

@@ -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 or 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",
+        "footprint_area",
+        "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",
+        "footprint_area",
+        "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",
+        "footprint_area",
+        "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,85 +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 electric baseboard 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 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",
-        "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 VRF",
+        "VRF",
+        "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",
-        "PVAV with reheat",
-        "PVAV with reheat with central air source heat pump",
+        "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 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": {
@@ -376,6 +521,28 @@
         "DEER 2070",
         "DEER 2075"
       ]
+    },
+    "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"
+      ]
     }
   }
-}
+}