Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

IFC4.3-dev property changes reconciliation #394

Open
wants to merge 29 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
524f8c8
Fixes to Road Property sets
AlexBrad1eyCT Dec 21, 2021
f008218
P&W Fixes
AlexBrad1eyCT Dec 21, 2021
eaf2839
Shared Infra fixes
AlexBrad1eyCT Dec 21, 2021
bef6cf6
Legacy-Fixes
AlexBrad1eyCT Dec 21, 2021
87a36c6
Merge remote-tracking branch 'upstream/develop' into feature/P&W-Fixes
AlexBrad1eyCT Jan 1, 2022
55679d5
Fixes #327 items
AlexBrad1eyCT Jan 1, 2022
9f9299f
Merge remote-tracking branch 'upstream/develop' into feature/Shared-I…
AlexBrad1eyCT Jan 1, 2022
d897634
Quantity set errors and a incorrect serialisation
AlexBrad1eyCT Jan 1, 2022
d5e58a9
Update DocPropertySet.xml
AlexBrad1eyCT Jan 1, 2022
fc645c6
Merge remote-tracking branch 'upstream/develop' into feature/Road-Fixes
AlexBrad1eyCT Jan 1, 2022
562d000
Merge remote-tracking branch 'upstream/develop' into feature/Legacy-F…
AlexBrad1eyCT Jan 1, 2022
c87cc6a
property types fix
AlexBrad1eyCT Jan 1, 2022
33415ef
last corrections for Issue
AlexBrad1eyCT Jan 3, 2022
9206553
Rail-Fixes
AlexBrad1eyCT Dec 21, 2021
9c44007
update from comments
AlexBrad1eyCT Jan 21, 2022
742e1ce
Merge branch 'develop' into feature/Rail-Fixes
AlexBrad1eyCT Jan 24, 2022
38d803a
Merge branch 'develop' into feature/Road-Fixes
AlexBrad1eyCT Jan 24, 2022
678dd9a
Merge branch 'develop' into feature/Shared-Infra-Fixes
AlexBrad1eyCT Jan 24, 2022
3b48bf3
Merge branch 'develop' into feature/P&W-Fixes
AlexBrad1eyCT Jan 24, 2022
25d91ec
fix: Pset_RoadMarkingCommon.MaterialColour
AlexBrad1eyCT Jan 24, 2022
df19e59
Merge remote-tracking branch 'alex/feature/Legacy-Fixes' into local
aothms Feb 12, 2022
02b2926
Merge remote-tracking branch 'alex/feature/P&W-Fixes' into local
aothms Feb 12, 2022
f08dddc
Merge remote-tracking branch 'alex/feature/Rail-Fixes' into local
aothms Feb 12, 2022
e3fda7b
Merge remote-tracking branch 'alex/feature/Road-Fixes' into local
aothms Feb 12, 2022
22046fa
Merge remote-tracking branch 'alex/feature/Shared-Infra-Fixes' into l…
aothms Feb 12, 2022
e5f32de
Merge remote-tracking branch 'origin/develop' into local
aothms Feb 24, 2022
41099f9
Delete existing pset data
aothms Apr 13, 2022
e838bd8
Delete existing pset data
aothms Apr 14, 2022
d768c48
Recreate prop data from 4.3 dev repo
aothms Apr 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="ACResistance_2dT1WHiH7Ge2PeqXa73Sp" Name="ACResistance" UniqueId="bf9dd060-46c4-4742-8099-a348641c3733" PrimaryDataType="IfcElectricResistanceMeasure" />

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="ACResistance_2dT1WHiH7Ge2PeqXa73Sp" Name="ACResistance" UniqueId="2$dT1WHiH7Ge2PeqXa73Sp" PrimaryDataType="IfcElectricResistanceMeasure"/>
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AbnormalBerthingFactor_3YCoiqGvvD0AA61M_rVW_n" Name="AbnormalBerthingFactor" UniqueId="e2332b34-439e-4d00-a286-056fb57e0fb1" PrimaryDataType="IfcPositiveRatioMeasure" />

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AbnormalBerthingFactor_3YCoiqGvvD0AA61M_rVW_n" Name="AbnormalBerthingFactor" UniqueId="3YCoiqGvvD0AA61M_rVW_n" PrimaryDataType="IfcPositiveRatioMeasure"/>
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AboveDeckProjectedWindEnd_2t7V67QC51PRcOCLDdpQcG" Name="AboveDeckProjectedWindEnd" UniqueId="b71df187-68c1-4165-b998-315367cda990" PrimaryDataType="IfcAreaMeasure" />

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AboveDeckProjectedWindEnd_2t7V67QC51PRcOCLDdpQcG" Name="AboveDeckProjectedWindEnd" UniqueId="2t7V67QC51PRcOCLDdpQcG" PrimaryDataType="IfcAreaMeasure"/>
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AboveDeckProjectedWindSide_27Fti2ntX0dgiVBd5Ek6wY" Name="AboveDeckProjectedWindSide" UniqueId="873f7b02-c778-409e-ab1f-2e714eb86ea2" PrimaryDataType="IfcAreaMeasure" />

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AboveDeckProjectedWindSide_27Fti2ntX0dgiVBd5Ek6wY" Name="AboveDeckProjectedWindSide" UniqueId="27Fti2ntX0dgiVBd5Ek6wY" PrimaryDataType="IfcAreaMeasure"/>
Original file line number Diff line number Diff line change
@@ -1,19 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AboveGround_29uzs0qSKHuO00025QrEV" Name="AboveGround" UniqueId="29uzs0qSKHuO00025QrE$V" PrimaryDataType="IfcLogical">
<Localization>
<DocLocalization Locale="de-DE" Name="Oberirdisches Geschoss">
<Documentation>Angabe, ob dieses Geschoss vollständig überhalb oberirdisch ist (WAHR), vollständig unterirdisch (FALSCH), oder teilweise unter- und überirdisch (UNKNOWN).</Documentation>
</DocLocalization>
<DocLocalization Locale="en" Name="Above Ground" />
<DocLocalization Locale="fr-FR" Name="AuDessusSol">
<Documentation>Indication si l&apos;étage est complètement au dessus du niveau du sol (VRAI), au dessous du niveau du sol (FAUX) ou partiellement enterré (INCONNU) comme dans le cas d&apos;un terrain en pente.</Documentation>
</DocLocalization>
<DocLocalization Locale="ja-JP" Name="地上判別">
<Documentation>この建物階が地上(TRUE)、地下(FALSE)、一部が地下部分(UNKOWN)かどうかを示すロジカル値。</Documentation>
</DocLocalization>
<DocLocalization Locale="ko-KR" Name="지상 여부">
<Documentation>이 건물 층이 지상 (TRUE), 지하 (FALSE), 일부 지하 부분 (UNKOWN) 여부를 나타내는 논리 값.</Documentation>
</DocLocalization>
</Localization>
</DocProperty>

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AboveGround_29uzs0qSKHuO00025QrEV" Name="AboveGround" UniqueId="29uzs0qSKHuO00025QrE$V" PrimaryDataType="IfcLogical"/>
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AcceptanceDate_12dHQ2H3D5Vw6e1UM1sbnF" Name="AcceptanceDate" UniqueId="429d1682-4433-457f-a1a8-05e581da5c4f" PrimaryDataType="IfcDate" />

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AcceptanceDate_12dHQ2H3D5Vw6e1UM1sbnF" Name="AcceptanceDate" UniqueId="12dHQ2H3D5Vw6e1UM1sbnF" PrimaryDataType="IfcDate"/>
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccessCoverLoadRating_0ocJc0qTGHuO00025QrEV" Name="AccessCoverLoadRating" UniqueId="0ocJc0qTGHuO00025QrE$V" PrimaryDataType="IfcText">
<Localization>
<DocLocalization Locale="en" Name="Access Cover Load Rating" />
<DocLocalization Locale="ja-JP" Name="アクセス(点検)カバーの耐荷重">
<Documentation>アクセス(点検)カバーの耐荷重(数字或いはアルファベットで定義する)。</Documentation>
</DocLocalization>
<DocLocalization Locale="ko-KR" Name="사용 (체크)커버 하중">
<Documentation>사용 (체크) 커버 하중 (숫자 혹은 알파벳에서 정의됨)</Documentation>
</DocLocalization>
</Localization>
</DocProperty>

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccessCoverLoadRating_0ocJc0qTGHuO00025QrEV" Name="AccessCoverLoadRating" UniqueId="0ocJc0qTGHuO00025QrE$V" PrimaryDataType="IfcText"/>

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,14 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccessCoverMaterial_0ZieS0qTGHuO00025QrEV" Name="AccessCoverMaterial" UniqueId="0ZieS0qTGHuO00025QrE$V" PropertyType="p_referencevalue" PrimaryDataType="IfcMaterialDefinition">
<Localization>
<DocLocalization Locale="en" Name="Access Cover Material" />
<DocLocalization Locale="ja-JP" Name="アクセス(点検)カバーの材質">
<Documentation>アクセス(点検)カバーの材質。
注:バイブスペースの壁は単層と仮定する</Documentation>
</DocLocalization>
<DocLocalization Locale="ko-KR" Name="사용(체크)커버의 재질">
<Documentation>액세스 (체크) 커버의 재질 주 : 챔퍼 공간의 벽은 단층 가정</Documentation>
</DocLocalization>
</Localization>
</DocProperty>

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccessCoverMaterial_0ZieS0qTGHuO00025QrEV" Name="AccessCoverMaterial" UniqueId="0ZieS0qTGHuO00025QrE$V" PropertyType="p_referencevalue" PrimaryDataType="IfcMaterialDefinition"/>
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
The material from which the access cover to the chamber is constructed.

NOTE: It is assumed that chamber walls will be constructed of a single material.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccessLengthOrRadius_0chNU0qTGHuO00025QrEV" Name="AccessLengthOrRadius" UniqueId="0chNU0qTGHuO00025QrE$V" PrimaryDataType="IfcPositiveLengthMeasure">
<Localization>
<DocLocalization Locale="en" Name="Access Length Or Radius" />
<DocLocalization Locale="ja-JP" Name="アクセス(点検)カバーの長さ或いは半径">
<Documentation>アクセス(点検)カバーの長さ、或いは円形カバーの半径。</Documentation>
</DocLocalization>
<DocLocalization Locale="ko-KR" Name="사용(체크)덮개 길이 혹은 반경">
<Documentation>사용 (체크) 덮개 길이, 혹은 원형 커버 반경</Documentation>
</DocLocalization>
</Localization>
</DocProperty>

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccessLengthOrRadius_0chNU0qTGHuO00025QrEV" Name="AccessLengthOrRadius" UniqueId="0chNU0qTGHuO00025QrE$V" PrimaryDataType="IfcPositiveLengthMeasure"/>

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccessType_3Im8G0qWyHuO00025QrEV" Name="AccessType" UniqueId="3Im8G0qWyHuO00025QrE$V" PropertyType="p_enumeratedvalue" PrimaryDataType="IfcLabel">
<Localization>
<DocLocalization Locale="en" Name="Access Type" />
<DocLocalization Locale="ja-JP" Name="点検タイプ">
<Documentation>タンクの点検口(又はカバー)のタイプの定義は明示される。カバーは一般的に矩形タンクについて明示されていることに注意。円筒形タンクの点検は通常のマンホールを通る</Documentation>
</DocLocalization>
</Localization>
<Enumeration xsi:type="DocPropertyEnumeration" xsi:nil="true" href="PEnum_TankAccessType" />
<Enumeration xsi:type="DocPropertyEnumeration" xsi:nil="true" href="PEnum_TankAccessType"/>
</DocProperty>

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Defines the types of access (or cover) to a tank that may be specified.



Note that covers are generally specified for rectangular tanks. For cylindrical tanks, access will normally be via a manhole.
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccessWidth_0ierY0qTGHuO00025QrEV" Name="AccessWidth" UniqueId="0ierY0qTGHuO00025QrE$V" PrimaryDataType="IfcPositiveLengthMeasure">
<Localization>
<DocLocalization Locale="en" Name="Access Width" />
<DocLocalization Locale="ja-JP" Name="アクセス(点検)カバーの幅">
<Documentation>アクセス(点検)カバーの幅。</Documentation>
</DocLocalization>
<DocLocalization Locale="ko-KR" Name="사용 (체크)커버 폭">
<Documentation>사용 (체크) 커버 폭</Documentation>
</DocLocalization>
</Localization>
</DocProperty>

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccessWidth_0ierY0qTGHuO00025QrEV" Name="AccessWidth" UniqueId="0ierY0qTGHuO00025QrE$V" PrimaryDataType="IfcPositiveLengthMeasure"/>

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccidentResponse_1CQaLudWX1ogX8LOMOUW_1" Name="AccidentResponse" UniqueId="4c6a4578-9e08-41ca-a848-5585987a0f81" PropertyType="p_enumeratedvalue" PrimaryDataType="IfcLabel">
<Enumeration xsi:type="DocPropertyEnumeration" xsi:nil="true" href="PEnum_AccidentResponse" />
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccidentResponse_1CQaLudWX1ogX8LOMOUW_1" Name="AccidentResponse" UniqueId="1CQaLudWX1ogX8LOMOUW_1" PropertyType="p_enumeratedvalue" PrimaryDataType="IfcLabel">
<Enumeration xsi:type="DocPropertyEnumeration" xsi:nil="true" href="PEnum_AccidentResponse"/>
</DocProperty>

Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccuracyClass_32YEer4tP9EB633g5FK49p" Name="AccuracyClass" UniqueId="c288ea35-1376-4938-b183-0ea14f504273" PrimaryDataType="IfcRatioMeasure" />

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccuracyClass_32YEer4tP9EB633g5FK49p" Name="AccuracyClass" UniqueId="32YEer4tP9EB633g5FK49p" PrimaryDataType="IfcRatioMeasure"/>
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccuracyGrade_3y6bNc8F56Hexr9vdk2L" Name="AccuracyGrade" UniqueId="fc1a55e6-20f1-4646-8ef5-279fe7bbf095" PrimaryDataType="IfcLabel" />

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccuracyGrade_3y6bNc8F56Hexr9vdk2L" Name="AccuracyGrade" UniqueId="3y6bNc8F56Hexr9v$dk$2L" PrimaryDataType="IfcLabel"/>
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccuracyOfFireSensor_0cUQ00qWKHuO00025QrEV" Name="AccuracyOfFireSensor" UniqueId="0cUQ00qWKHuO00025QrE$V" PrimaryDataType="IfcThermodynamicTemperatureMeasure">
<Localization>
<DocLocalization Locale="en" Name="Accuracy Of Fire Sensor" />
<DocLocalization Locale="ja-JP" Name="精度">
<Documentation>センサの精度。</Documentation>
</DocLocalization>
<DocLocalization Locale="ko-KR" Name="정확도">
<Documentation>센서의 정밀도.</Documentation>
</DocLocalization>
</Localization>
</DocProperty>

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccuracyOfFireSensor_0cUQ00qWKHuO00025QrEV" Name="AccuracyOfFireSensor" UniqueId="0cUQ00qWKHuO00025QrE$V" PrimaryDataType="IfcThermodynamicTemperatureMeasure"/>
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccuracyQualityExpected_1ynE_0qS4HuO00025QrEV" Name="AccuracyQualityExpected" UniqueId="1ynE_0qS4HuO00025QrE$V" PrimaryDataType="IfcRatioMeasure">
<Localization>
<DocLocalization Locale="en" Name="Accuracy Quality Expected" />
<DocLocalization Locale="fr-FR" Name="PrecisionAttendue">
<Documentation>Mesure de la précision attendue des points de relevé, exprimée en pourcentage.</Documentation>
</DocLocalization>
</Localization>
</DocProperty>

<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="AccuracyQualityExpected_1ynE_0qS4HuO00025QrEV" Name="AccuracyQualityExpected" UniqueId="1ynE_0qS4HuO00025QrE$V" PrimaryDataType="IfcRatioMeasure"/>
Loading