Merge pull request #188 from NREL/develop

NREL · Sep 13, 2024 · 1434e42 · 1434e42
2 parents eb48de7 + a7293ec
commit 1434e42
Show file tree

Hide file tree

Showing 11 changed files with 11,827 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [1.2.4] - 2024-09-13
+- ChangeBuildingLocation CSV encoding
+
 ## [1.2.3] - 2024-08-27
 - fix sim osw typo
 

diff --git a/aip/OpenStudio CLI For Revit 2022.aip b/aip/OpenStudio CLI For Revit 2022.aip
@@ -9,10 +9,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="os.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="NREL"/>
-    <ROW Property="ProductCode" Value="1033:{D7757BD5-132F-4FC0-8367-7FA0AE8F5E1B} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{433F5175-60F9-4855-B956-44CE8BE435AF} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="OpenStudio CLI For Revit 2022"/>
-    <ROW Property="ProductVersion" Value="1.2.3"/>
+    <ROW Property="ProductVersion" Value="1.2.4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{932084BD-2149-42E4-BBEF-F4DE50BC83DF}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -288,6 +288,9 @@
     <ROW File="another_weather_file.ddy" Component_="another_weather_file.ddy" FileName="ANOTHE~1.DDY|another_weather_file.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.ddy" SelfReg="false"/>
     <ROW File="another_weather_file.epw" Component_="another_weather_file.ddy" FileName="ANOTHE~1.EPW|another_weather_file.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.epw" SelfReg="false"/>
     <ROW File="another_weather_file.stat" Component_="another_weather_file.ddy" FileName="ANOTHE~1.STA|another_weather_file.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.stat" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.ddy" Component_="another_weather_file.ddy" FileName="BRA_SP~1.DDY|BRA_SP_Campinas.837210_INMET.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.ddy" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.epw" Component_="another_weather_file.ddy" FileName="BRA_SP~1.EPW|BRA_SP_Campinas.837210_INMET.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.epw" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.stat" Component_="another_weather_file.ddy" FileName="BRA_SP~1.STA|BRA_SP_Campinas.837210_INMET.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.stat" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.ddy" Component_="another_weather_file.ddy" FileName="CA_LOS~1.DDY|CA_LOS-ANGELES-IAP_722950S_12.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.ddy" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.epw" Component_="another_weather_file.ddy" FileName="CA_LOS~1.EPW|CA_LOS-ANGELES-IAP_722950S_12.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.epw" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.stat" Component_="another_weather_file.ddy" FileName="CA_LOS~1.STA|CA_LOS-ANGELES-IAP_722950S_12.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.stat" SelfReg="false"/>

diff --git a/aip/OpenStudio CLI For Revit 2023.aip b/aip/OpenStudio CLI For Revit 2023.aip
@@ -9,10 +9,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="os.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="NREL"/>
-    <ROW Property="ProductCode" Value="1033:{E42EDF00-B979-4055-83F2-7426E0469F53} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{13A226E9-D9E7-4B2D-B3E4-418754FE87DE} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="OpenStudio CLI For Revit 2023"/>
-    <ROW Property="ProductVersion" Value="1.2.3"/>
+    <ROW Property="ProductVersion" Value="1.2.4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{71BD412F-8A45-4B1F-831A-CDF14F4BFD92}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -288,6 +288,9 @@
     <ROW File="another_weather_file.ddy" Component_="another_weather_file.ddy" FileName="ANOTHE~1.DDY|another_weather_file.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.ddy" SelfReg="false"/>
     <ROW File="another_weather_file.epw" Component_="another_weather_file.ddy" FileName="ANOTHE~1.EPW|another_weather_file.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.epw" SelfReg="false"/>
     <ROW File="another_weather_file.stat" Component_="another_weather_file.ddy" FileName="ANOTHE~1.STA|another_weather_file.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.stat" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.ddy" Component_="another_weather_file.ddy" FileName="BRA_SP~1.DDY|BRA_SP_Campinas.837210_INMET.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.ddy" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.epw" Component_="another_weather_file.ddy" FileName="BRA_SP~1.EPW|BRA_SP_Campinas.837210_INMET.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.epw" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.stat" Component_="another_weather_file.ddy" FileName="BRA_SP~1.STA|BRA_SP_Campinas.837210_INMET.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.stat" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.ddy" Component_="another_weather_file.ddy" FileName="CA_LOS~1.DDY|CA_LOS-ANGELES-IAP_722950S_12.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.ddy" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.epw" Component_="another_weather_file.ddy" FileName="CA_LOS~1.EPW|CA_LOS-ANGELES-IAP_722950S_12.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.epw" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.stat" Component_="another_weather_file.ddy" FileName="CA_LOS~1.STA|CA_LOS-ANGELES-IAP_722950S_12.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.stat" SelfReg="false"/>

diff --git a/aip/OpenStudio CLI For Revit 2024.aip b/aip/OpenStudio CLI For Revit 2024.aip
@@ -9,10 +9,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="os.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="NREL"/>
-    <ROW Property="ProductCode" Value="1033:{D7A8091E-46A0-405C-840F-D6B5C5EEE440} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{749C3991-7E20-469F-A65E-4D6B8AFC0160} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="OpenStudio CLI For Revit 2024"/>
-    <ROW Property="ProductVersion" Value="1.2.3"/>
+    <ROW Property="ProductVersion" Value="1.2.4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{89E88DC9-8FB5-499D-B18D-9809F02C5407}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -288,6 +288,9 @@
     <ROW File="another_weather_file.ddy" Component_="another_weather_file.ddy" FileName="ANOTHE~1.DDY|another_weather_file.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.ddy" SelfReg="false"/>
     <ROW File="another_weather_file.epw" Component_="another_weather_file.ddy" FileName="ANOTHE~1.EPW|another_weather_file.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.epw" SelfReg="false"/>
     <ROW File="another_weather_file.stat" Component_="another_weather_file.ddy" FileName="ANOTHE~1.STA|another_weather_file.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.stat" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.ddy" Component_="another_weather_file.ddy" FileName="BRA_SP~1.DDY|BRA_SP_Campinas.837210_INMET.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.ddy" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.epw" Component_="another_weather_file.ddy" FileName="BRA_SP~1.EPW|BRA_SP_Campinas.837210_INMET.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.epw" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.stat" Component_="another_weather_file.ddy" FileName="BRA_SP~1.STA|BRA_SP_Campinas.837210_INMET.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.stat" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.ddy" Component_="another_weather_file.ddy" FileName="CA_LOS~1.DDY|CA_LOS-ANGELES-IAP_722950S_12.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.ddy" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.epw" Component_="another_weather_file.ddy" FileName="CA_LOS~1.EPW|CA_LOS-ANGELES-IAP_722950S_12.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.epw" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.stat" Component_="another_weather_file.ddy" FileName="CA_LOS~1.STA|CA_LOS-ANGELES-IAP_722950S_12.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.stat" SelfReg="false"/>

diff --git a/aip/OpenStudio CLI For Revit 2025.aip b/aip/OpenStudio CLI For Revit 2025.aip
@@ -9,10 +9,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="os.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="NREL"/>
-    <ROW Property="ProductCode" Value="1033:{CB043CDE-FD37-4AD6-8CB1-23FB7754B0B6} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{BB40CAAF-D490-4095-9917-F418C507F12B} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="OpenStudio CLI For Revit 2025"/>
-    <ROW Property="ProductVersion" Value="1.2.3"/>
+    <ROW Property="ProductVersion" Value="1.2.4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{0AAD0845-2DF8-489C-8FCD-C65CF5F147E7}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -288,6 +288,9 @@
     <ROW File="another_weather_file.ddy" Component_="another_weather_file.ddy" FileName="ANOTHE~1.DDY|another_weather_file.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.ddy" SelfReg="false"/>
     <ROW File="another_weather_file.epw" Component_="another_weather_file.ddy" FileName="ANOTHE~1.EPW|another_weather_file.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.epw" SelfReg="false"/>
     <ROW File="another_weather_file.stat" Component_="another_weather_file.ddy" FileName="ANOTHE~1.STA|another_weather_file.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.stat" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.ddy" Component_="another_weather_file.ddy" FileName="BRA_SP~1.DDY|BRA_SP_Campinas.837210_INMET.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.ddy" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.epw" Component_="another_weather_file.ddy" FileName="BRA_SP~1.EPW|BRA_SP_Campinas.837210_INMET.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.epw" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.stat" Component_="another_weather_file.ddy" FileName="BRA_SP~1.STA|BRA_SP_Campinas.837210_INMET.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.stat" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.ddy" Component_="another_weather_file.ddy" FileName="CA_LOS~1.DDY|CA_LOS-ANGELES-IAP_722950S_12.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.ddy" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.epw" Component_="another_weather_file.ddy" FileName="CA_LOS~1.EPW|CA_LOS-ANGELES-IAP_722950S_12.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.epw" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.stat" Component_="another_weather_file.ddy" FileName="CA_LOS~1.STA|CA_LOS-ANGELES-IAP_722950S_12.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.stat" SelfReg="false"/>

diff --git a/aip/OpenStudio CLI For Revit 2026.aip b/aip/OpenStudio CLI For Revit 2026.aip
@@ -9,10 +9,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="os.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="NREL"/>
-    <ROW Property="ProductCode" Value="1033:{528161E9-D140-4A6D-B883-E8CF676B614E} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{EA0B0CD5-0756-43D3-A1D4-D51AAD42D6C2} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="OpenStudio CLI For Revit 2026"/>
-    <ROW Property="ProductVersion" Value="1.2.3"/>
+    <ROW Property="ProductVersion" Value="1.2.4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{C045639B-9AC7-4770-9CF2-6DAD8A702EBC}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -288,6 +288,9 @@
     <ROW File="another_weather_file.ddy" Component_="another_weather_file.ddy" FileName="ANOTHE~1.DDY|another_weather_file.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.ddy" SelfReg="false"/>
     <ROW File="another_weather_file.epw" Component_="another_weather_file.ddy" FileName="ANOTHE~1.EPW|another_weather_file.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.epw" SelfReg="false"/>
     <ROW File="another_weather_file.stat" Component_="another_weather_file.ddy" FileName="ANOTHE~1.STA|another_weather_file.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\another_weather_file.stat" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.ddy" Component_="another_weather_file.ddy" FileName="BRA_SP~1.DDY|BRA_SP_Campinas.837210_INMET.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.ddy" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.epw" Component_="another_weather_file.ddy" FileName="BRA_SP~1.EPW|BRA_SP_Campinas.837210_INMET.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.epw" SelfReg="false"/>
+    <ROW File="BRA_SP_Campinas.837210_INMET.stat" Component_="another_weather_file.ddy" FileName="BRA_SP~1.STA|BRA_SP_Campinas.837210_INMET.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\BRA_SP_Campinas.837210_INMET.stat" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.ddy" Component_="another_weather_file.ddy" FileName="CA_LOS~1.DDY|CA_LOS-ANGELES-IAP_722950S_12.ddy" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.ddy" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.epw" Component_="another_weather_file.ddy" FileName="CA_LOS~1.EPW|CA_LOS-ANGELES-IAP_722950S_12.epw" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.epw" SelfReg="false"/>
     <ROW File="CA_LOSANGELESIAP_722950S_12.stat" Component_="another_weather_file.ddy" FileName="CA_LOS~1.STA|CA_LOS-ANGELES-IAP_722950S_12.stat" Attributes="0" SourcePath="..\build.signed\build\measures\ChangeBuildingLocation\tests\CA_LOS-ANGELES-IAP_722950S_12.stat" SelfReg="false"/>

diff --git a/measures/ChangeBuildingLocation/resources/epw.rb b/measures/ChangeBuildingLocation/resources/epw.rb
@@ -126,8 +126,13 @@ def process_header
         header_section = true
         row_count = 0
 
-        # this breaks in Ruby 2.5.x
-        CSV.foreach(@filename) do |row|
+        begin
+          rows = CSV.read(@filename)
+        rescue CSV::MalformedCSVError
+          rows = CSV.read(@filename, encoding: 'ISO-8859-1')
+        end
+
+        rows.each do |row|
           row_count += 1
 
           if header_section