From 43fc2da0720970218c52cdaadb4ef0130f386eb0 Mon Sep 17 00:00:00 2001 From: Katherine Fleming <2205659+kflemin@users.noreply.github.com> Date: Tue, 10 Nov 2026 12:53:24 -0700 Subject: [PATCH 1/4] Prefer Building floor area over Site get_total_floor_area checked Site FloorAreas before Building, so a Site value overrode the Building's own value. Check the more specific Building first and fall back to Site, matching the method comment. Add specs for Building only, Site only, and both present. Co-Authored-By: Claude Opus 5.5 --- README.md | 2 +- .../buildingsync_reader.rb | 15 +++---- spec/tests/unit/buildingsync_reader_spec.rb | 42 +++++++++++++++++++ 3 files changed, 51 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3e81579..cf1855b 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ The table below maps in detail the BuildingSync XML data to measure inputs. Note | | climate_zone | get_climate_zone | either `.../Site/ClimateZoneType/ASHRAE/ClimateZone` or `.../Site/ClimateZoneType/CaliforniaTitle24/ClimateZone` depending on standard | | [create_bar_from_building_type_ratios] | | | | | | bldg_type_a | get_building_type_and_bar_division_method | `.../Building/OccupancyClassification` + requirements for `get_total_floor_area` (+ requirements for `get_floor_above_grade` lest defaulted to 1 + requirements for `get_floor_below_grade` lest defaulted to 0) | -| | total_bldg_floor_area | get_total_floor_area | at least one entry of `/FloorArea` in either `.../Site/FloorAreas/` or `.../Building/FloorAreas/`, with `FloorAreaType` of "Gross", "Conditioned", "Common", "Heated and Cooled", "Heated Only", "Cooled Only", "Conditioned above grade", or "Conditioned below grade" | +| | total_bldg_floor_area | get_total_floor_area | at least one entry of `/FloorArea` in either `.../Building/FloorAreas/` or `.../Site/FloorAreas/` (Building is used when both have one), with `FloorAreaType` of "Gross", "Conditioned", "Common", "Heated and Cooled", "Heated Only", "Cooled Only", "Conditioned above grade", or "Conditioned below grade" | | | floor_height | get_floor_to_floor_height | at least on entry of `.../Building/Sections/Section` with entry `/FloorToFloorHeight` | | | num_stories_above_grade | get_floor_above_grade | either `.../Building/FloorsAboveGrade` or `.../Building/ConditionedFloorsAboveGrade` and `.../Building/UnconditionedFloorsAboveGrade` | | | num_stories_below_grade | get_floor_below_grade | either `.../Building/FloorsBelowGrade` or `.../Building/ConditionedFloorsBelowGrade` and `.../Building/UnconditionedFloorsBelowGrade` | diff --git a/lib/BOSS/buildingsync_reader/buildingsync_reader.rb b/lib/BOSS/buildingsync_reader/buildingsync_reader.rb index 299ef12..5edb804 100644 --- a/lib/BOSS/buildingsync_reader/buildingsync_reader.rb +++ b/lib/BOSS/buildingsync_reader/buildingsync_reader.rb @@ -176,14 +176,8 @@ def get_building_type_and_bar_division_method # tries to get total floor area from: # 1. /FloorAreas of building # 2. /FloorAreas of site + # The building is more specific than the site, so its value wins when both are present. def get_total_floor_area(num_indent=2) - # check site floor area - BOSS.BOSS_logger.info("#{"|\t"*num_indent}- checking site for total floor area...") - site_floor_areas_xml = @site_xml.elements["#{@ns}FloorAreas"] - site_area = !site_floor_areas_xml.nil? ? _get_total_floor_area_from_floor_areas_xml(site_floor_areas_xml, num_indent+1) : 0 - BOSS.BOSS_logger.info("#{"|\t"*num_indent} site floor area is #{site_area}") - return site_area if site_area > 0 - # check building floor area BOSS.BOSS_logger.info("#{"|\t"*num_indent}- checking building for total floor area...") building_floor_areas_xml = @building_xml.elements["#{@ns}FloorAreas"] @@ -191,6 +185,13 @@ def get_total_floor_area(num_indent=2) BOSS.BOSS_logger.info("#{"|\t"*num_indent} building floor area is #{building_area}") return building_area if building_area > 0 + # check site floor area + BOSS.BOSS_logger.info("#{"|\t"*num_indent}- checking site for total floor area...") + site_floor_areas_xml = @site_xml.elements["#{@ns}FloorAreas"] + site_area = !site_floor_areas_xml.nil? ? _get_total_floor_area_from_floor_areas_xml(site_floor_areas_xml, num_indent+1) : 0 + BOSS.BOSS_logger.info("#{"|\t"*num_indent} site floor area is #{site_area}") + return site_area if site_area > 0 + # TODO: read sections end diff --git a/spec/tests/unit/buildingsync_reader_spec.rb b/spec/tests/unit/buildingsync_reader_spec.rb index 91d9d2a..b06ba48 100644 --- a/spec/tests/unit/buildingsync_reader_spec.rb +++ b/spec/tests/unit/buildingsync_reader_spec.rb @@ -234,6 +234,48 @@ def wrap_in_systems(xml) end describe 'get_total_floor_area should' do + def floor_areas(gross) + <<~XML + + + Gross + #{gross} + + + XML + end + + def site_with_building(site_xml, building_xml) + wrap_in_site(<<~XML) + #{site_xml} + + + #{building_xml} + + + XML + end + + it "prefer building over site when both have floor area" do + doc = REXML::Document.new site_with_building(floor_areas(20000), floor_areas(15000)) + buidingsync_reader = BOSS::BuildingSyncReader.new(doc, nil, ASHRAE90_1) + + expect(buidingsync_reader.get_total_floor_area).to eq 15000 + end + + it "get from building" do + doc = REXML::Document.new site_with_building('', floor_areas(15000)) + buidingsync_reader = BOSS::BuildingSyncReader.new(doc, nil, ASHRAE90_1) + + expect(buidingsync_reader.get_total_floor_area).to eq 15000 + end + + it "fall back to site when building has no floor area" do + doc = REXML::Document.new site_with_building(floor_areas(20000), '') + buidingsync_reader = BOSS::BuildingSyncReader.new(doc, nil, ASHRAE90_1) + + expect(buidingsync_reader.get_total_floor_area).to eq 20000 + end end describe 'get_floor_above_grade should' do From 35abcbf617b63bcf90f7eca222d2cfe2d9e58bc9 Mon Sep 17 00:00:00 2001 From: Katherine Fleming <2205659+kflemin@users.noreply.github.com> Date: Tue, 10 Nov 2026 12:57:19 -0700 Subject: [PATCH 2/4] Require logger and constants in BuildingSyncReader The reader calls BOSS.BOSS_logger and uses ASHRAE90_1 and other constants, but relied on other files to load them. Running buildingsync_reader_spec.rb on its own failed with "undefined method `BOSS_logger' for BOSS:Module". Require both directly. Co-Authored-By: Claude Opus 5.5 --- lib/BOSS/buildingsync_reader/buildingsync_reader.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/BOSS/buildingsync_reader/buildingsync_reader.rb b/lib/BOSS/buildingsync_reader/buildingsync_reader.rb index 5edb804..01530eb 100644 --- a/lib/BOSS/buildingsync_reader/buildingsync_reader.rb +++ b/lib/BOSS/buildingsync_reader/buildingsync_reader.rb @@ -6,6 +6,8 @@ require 'json' require 'openstudio-standards' +require 'BOSS/boss_logger' +require 'BOSS/constants' require_relative 'systems_map' require_relative 'bcl_weather_file_downloader' include Math From bcf2317df8055734cc5ea2b07c6311d85bea46ed Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Nov 2026 22:21:50 +0000 Subject: [PATCH 3/4] Handle missing Building in floor area fallback Co-authored-by: kflemin <2205659+kflemin@users.noreply.github.com> --- lib/BOSS/buildingsync_reader/buildingsync_reader.rb | 2 +- spec/tests/unit/buildingsync_reader_spec.rb | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/BOSS/buildingsync_reader/buildingsync_reader.rb b/lib/BOSS/buildingsync_reader/buildingsync_reader.rb index 01530eb..912946c 100644 --- a/lib/BOSS/buildingsync_reader/buildingsync_reader.rb +++ b/lib/BOSS/buildingsync_reader/buildingsync_reader.rb @@ -182,7 +182,7 @@ def get_building_type_and_bar_division_method def get_total_floor_area(num_indent=2) # check building floor area BOSS.BOSS_logger.info("#{"|\t"*num_indent}- checking building for total floor area...") - building_floor_areas_xml = @building_xml.elements["#{@ns}FloorAreas"] + building_floor_areas_xml = @building_xml&.elements["#{@ns}FloorAreas"] building_area = !building_floor_areas_xml.nil? ? _get_total_floor_area_from_floor_areas_xml(building_floor_areas_xml, num_indent+1) : 0 BOSS.BOSS_logger.info("#{"|\t"*num_indent} building floor area is #{building_area}") return building_area if building_area > 0 diff --git a/spec/tests/unit/buildingsync_reader_spec.rb b/spec/tests/unit/buildingsync_reader_spec.rb index b06ba48..9b61fee 100644 --- a/spec/tests/unit/buildingsync_reader_spec.rb +++ b/spec/tests/unit/buildingsync_reader_spec.rb @@ -276,6 +276,13 @@ def site_with_building(site_xml, building_xml) expect(buidingsync_reader.get_total_floor_area).to eq 20000 end + + it "get from site when building is missing" do + doc = REXML::Document.new wrap_in_site(floor_areas(20000)) + buidingsync_reader = BOSS::BuildingSyncReader.new(doc, nil, ASHRAE90_1) + + expect(buidingsync_reader.get_total_floor_area).to eq 20000 + end end describe 'get_floor_above_grade should' do From 711e45f12b949d1d64efdd621f10a9d48bd7ef44 Mon Sep 17 00:00:00 2001 From: Katherine Fleming <2205659+kflemin@users.noreply.github.com> Date: Wed, 11 Nov 2026 12:29:18 -0700 Subject: [PATCH 4/4] fix test --- lib/BOSS/buildingsync_reader/buildingsync_reader.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/BOSS/buildingsync_reader/buildingsync_reader.rb b/lib/BOSS/buildingsync_reader/buildingsync_reader.rb index 912946c..085fdf5 100644 --- a/lib/BOSS/buildingsync_reader/buildingsync_reader.rb +++ b/lib/BOSS/buildingsync_reader/buildingsync_reader.rb @@ -182,7 +182,7 @@ def get_building_type_and_bar_division_method def get_total_floor_area(num_indent=2) # check building floor area BOSS.BOSS_logger.info("#{"|\t"*num_indent}- checking building for total floor area...") - building_floor_areas_xml = @building_xml&.elements["#{@ns}FloorAreas"] + building_floor_areas_xml = @building_xml.nil? ? nil : @building_xml.elements["#{@ns}FloorAreas"] building_area = !building_floor_areas_xml.nil? ? _get_total_floor_area_from_floor_areas_xml(building_floor_areas_xml, num_indent+1) : 0 BOSS.BOSS_logger.info("#{"|\t"*num_indent} building floor area is #{building_area}") return building_area if building_area > 0