Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Deprecate DoorID and WindowID as direct Child under Side #364

Merged
merged 4 commits into from
Jun 10, 2021
Merged

Deprecate DoorID and WindowID as direct Child under Side #364

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cee17ac
Initial implementation
JieXiong9119 Jun 9, 2021
8890a20
Update examples
JieXiong9119 Jun 9, 2021
5b35cdf
test: add data to test window and door id transformations
macintoshpie Jun 10, 2021
3047fc7
Merge branch 'develop-v3' into deprecate/doorid-windowid
macintoshpie Jun 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 14 additions & 20 deletions BuildingSync.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,26 +1083,20 @@
</xs:complexType>
</xs:element>
</xs:choice>
<xs:choice>
<xs:element ref="auc:WindowID" minOccurs="0"/>
<xs:element name="WindowIDs" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element ref="auc:WindowID" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
<xs:choice>
<xs:element ref="auc:DoorID" minOccurs="0"/>
<xs:element name="DoorIDs" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element ref="auc:DoorID" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
<xs:element name="WindowIDs" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:sequence>
<xs:element ref="auc:WindowID" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="DoorIDs" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:sequence>
<xs:element ref="auc:DoorID" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element ref="auc:ThermalZoneIDs" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
Expand Down
4 changes: 2 additions & 2 deletions examples/ASHRAE 211 Export.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
<WallID IDref="AllWall1">
<WallArea>5000</WallArea>
</WallID>
<WindowID IDref="Window1">
<auc:WindowIDs xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019"><WindowID IDref="Window1">
<WindowToWallRatio>0.5</WindowToWallRatio>
</WindowID>
</WindowID></auc:WindowIDs>
</Side>
</Sides>
<Roofs>
Expand Down
6 changes: 3 additions & 3 deletions examples/AT_example_AS_conversion_audit_report.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 https://raw.githubusercontent.com/BuildingSync/schema/v2.2.0/BuildingSync.xsd" version="2.2.0">
<auc:Facilities>
<auc:Facility ID="Facility-69928597156380">
Expand Down Expand Up @@ -64,13 +64,13 @@
<auc:FootprintShape>Rectangular</auc:FootprintShape>
<auc:Sides>
<auc:Side>
<auc:DoorID IDref="FenestrationSystemType-69928594726400"/>
<auc:DoorIDs><auc:DoorID IDref="FenestrationSystemType-69928594726400"/></auc:DoorIDs>
</auc:Side>
<auc:Side>
<auc:WallID IDref="WallSystemType-44312400"/>
</auc:Side>
<auc:Side>
<auc:WindowID IDref="FenestrationSystemType-69928425281420"/>
<auc:WindowIDs><auc:WindowID IDref="FenestrationSystemType-69928425281420"/></auc:WindowIDs>
</auc:Side>
</auc:Sides>
<auc:Roofs>
Expand Down
10 changes: 5 additions & 5 deletions examples/AT_example_NYC_audit_report_property.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 https://raw.githubusercontent.com/BuildingSync/schema/v2.2.0/BuildingSync.xsd" version="2.2.0">
<auc:Facilities>
<auc:Facility ID="Facility-69928476009540">
Expand Down Expand Up @@ -100,13 +100,13 @@
<auc:FootprintShape>Rectangular</auc:FootprintShape>
<auc:Sides>
<auc:Side>
<auc:DoorID IDref="FenestrationSystemType-69928473804180"/>
<auc:DoorIDs><auc:DoorID IDref="FenestrationSystemType-69928473804180"/></auc:DoorIDs>
</auc:Side>
<auc:Side>
<auc:WallID IDref="WallSystemType-69928452529520"/>
</auc:Side>
<auc:Side>
<auc:WindowID IDref="FenestrationSystemType-69928452430420"/>
<auc:WindowIDs><auc:WindowID IDref="FenestrationSystemType-69928452430420"/></auc:WindowIDs>
</auc:Side>
</auc:Sides>
<auc:Roofs>
Expand Down Expand Up @@ -745,13 +745,13 @@
<auc:FootprintShape>L-Shape</auc:FootprintShape>
<auc:Sides>
<auc:Side>
<auc:DoorID IDref="FenestrationSystemType-69928459032760"/>
<auc:DoorIDs><auc:DoorID IDref="FenestrationSystemType-69928459032760"/></auc:DoorIDs>
</auc:Side>
<auc:Side>
<auc:WallID IDref="WallSystemType-69928607123000"/>
</auc:Side>
<auc:Side>
<auc:WindowID IDref="FenestrationSystemType-69928606739240"/>
<auc:WindowIDs><auc:WindowID IDref="FenestrationSystemType-69928606739240"/></auc:WindowIDs>
</auc:Side>
</auc:Sides>
<auc:Roofs>
Expand Down
6 changes: 3 additions & 3 deletions examples/AT_example_SF_audit_report.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 https://raw.githubusercontent.com/BuildingSync/schema/v2.2.0/BuildingSync.xsd" version="2.2.0">
<auc:Facilities>
<auc:Facility ID="Facility-69928597382680">
Expand Down Expand Up @@ -73,13 +73,13 @@ This example is configured to import and export with BuildingSync version 2.2.0.
<auc:FootprintShape>L-Shape</auc:FootprintShape>
<auc:Sides>
<auc:Side>
<auc:DoorID IDref="FenestrationSystemType-99179560"/>
<auc:DoorIDs><auc:DoorID IDref="FenestrationSystemType-99179560"/></auc:DoorIDs>
</auc:Side>
<auc:Side>
<auc:WallID IDref="WallSystemType-69928423734500"/>
</auc:Side>
<auc:Side>
<auc:WindowID IDref="FenestrationSystemType-69928414143620"/>
<auc:WindowIDs><auc:WindowID IDref="FenestrationSystemType-69928414143620"/></auc:WindowIDs>
</auc:Side>
</auc:Sides>
<auc:Roofs>
Expand Down
2 changes: 1 addition & 1 deletion examples/BuildingSync Website Invalid Schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 ../BuildingSync.xsd" version="2.0.0">
<auc:Facilities>
<auc:Facility ID="Facility-1">
Expand Down
2 changes: 1 addition & 1 deletion examples/BuildingSync Website Valid Schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 ../BuildingSync.xsd" version="2.0.0">
<auc:Facilities>
<auc:Facility ID="Facility-2836a9a5-95fd-4d1d-ab8f-a852dc4cba00">
Expand Down
2 changes: 1 addition & 1 deletion examples/Multi_building_gbxml_externalreference_geometry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<BuildingSync xmlns="http://buildingsync.net/schemas/bedes-auc/2019" xmlns:gbxml="http://www.gbxml.org/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 ../BuildingSync.xsd" version="2.0.0">
<Facilities>
<Facility ID="Facility-09ddd9cc-0100-4d9b-b2f5-e535f5e34743">
Expand Down
2 changes: 1 addition & 1 deletion examples/MultitenantBySubsections.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- "High-level" approach separating out floor areas by tenant -->
<!-- Missing Data That We Still Want: Ownership of building -->
<BuildingSync xmlns="http://buildingsync.net/schemas/bedes-auc/2019" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 ../BuildingSync.xsd" version="2.0.0">
Expand Down
Loading