From 66e71a3a2cfaf141bed6e18ac42e24896a0ad86f Mon Sep 17 00:00:00 2001 From: SergejMuhic Date: Mon, 22 Jul 2024 18:27:36 +0200 Subject: [PATCH 1/5] undo change in IfcCorrectLocalPlacement --- .../Functions/IfcCorrectLocalPlacement/Expression.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometricConstraintResource/Functions/IfcCorrectLocalPlacement/Expression.txt b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometricConstraintResource/Functions/IfcCorrectLocalPlacement/Expression.txt index 2d57b795f..59696f232 100644 --- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometricConstraintResource/Functions/IfcCorrectLocalPlacement/Expression.txt +++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometricConstraintResource/Functions/IfcCorrectLocalPlacement/Expression.txt @@ -3,7 +3,7 @@ IF (EXISTS(RelPlacement)) THEN IF ('IFCGEOMETRICCONSTRAINTRESOURCE.IFCGRIDPLACEMENT' IN TYPEOF(RelPlacement)) THEN - RETURN(TRUE); + RETURN(?); END_IF; IF ('IFCGEOMETRICCONSTRAINTRESOURCE.IFCLOCALPLACEMENT' IN TYPEOF(RelPlacement)) THEN IF ('IFCGEOMETRYRESOURCE.IFCAXIS2PLACEMENT2D' IN TYPEOF(AxisPlacement)) THEN From ef0df2160c5f2f1a2306abf06a0bcb33201931a6 Mon Sep 17 00:00:00 2001 From: SergejMuhic Date: Mon, 22 Jul 2024 18:38:06 +0200 Subject: [PATCH 2/5] typos in type checks --- .../Functions/IfcAlignmentRepresentation/Expression.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt index 130ebd296..1f5df8743 100644 --- a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt +++ b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt @@ -25,7 +25,7 @@ CASE TRUE OF 'IFCGEOMETRYRESOURCE.IFCCOMPOSITECURVE' IN TYPEOF(AlignmentRepresentations[1].Items[1]): RETURN(TRUE); - 'IFCGEOMETRYRESOURCE.IFCOFFSETCURVEBYDISTANCE' IN TYPEOF(AlignmentRepresentations[1].Items[1]): + 'IFCGEOMETRYRESOURCE.IFCOFFSETCURVEBYDISTANCES' IN TYPEOF(AlignmentRepresentations[1].Items[1]): RETURN(TRUE); 'IFCGEOMETRYRESOURCE.IFCPOLYLINE' IN TYPEOF(AlignmentRepresentations[1].Items[1]): RETURN(TRUE); @@ -35,7 +35,7 @@ CASE TRUE OF 'IFCGEOMETRYRESOURCE.IFCGRADIENTCURVE' IN TYPEOF(AlignmentRepresentations[1].Items[1]): RETURN(TRUE); - 'IFCGEOMETRYRESOURCE.IFCOFFSETCURVEBYDISTANCE' IN TYPEOF(AlignmentRepresentations[1].Items[1]): + 'IFCGEOMETRYRESOURCE.IFCOFFSETCURVEBYDISTANCES' IN TYPEOF(AlignmentRepresentations[1].Items[1]): RETURN(TRUE); 'IFCGEOMETRYRESOURCE.IFCSEGMENTEDREFERENCECURVE' IN TYPEOF(AlignmentRepresentations[1].Items[1]): RETURN(TRUE); From 4f55023c4247943199f6d2eabf7407975776e9b9 Mon Sep 17 00:00:00 2001 From: SergejMuhic Date: Mon, 22 Jul 2024 18:41:20 +0200 Subject: [PATCH 3/5] correct query for counting representation items in IfcAlignmentRepresentation --- .../Functions/IfcAlignmentRepresentation/Expression.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt index 1f5df8743..056ef85c1 100644 --- a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt +++ b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt @@ -18,7 +18,7 @@ (* one representation is either Curve2D or 3D *) IF SIZEOF(AlignmentRepresentations) = 1 THEN - IF SIZEOF(AlignmentRepresentations.Items) <> 1 THEN + IF SIZEOF(QUERY(rep <* AlignmentRepresentations | SIZEOF(rep.Items) <> 1)) = 0 THEN RETURN (FALSE); END_IF; IF SIZEOF(QUERY(twoDee <* AlignmentRepresentations | twoDee.RepresentationType = 'Curve2D')) = 1 THEN From 94c74729bf82a5f56b72b5fbfe60997f11603116 Mon Sep 17 00:00:00 2001 From: SergejMuhic Date: Wed, 24 Jul 2024 12:36:22 +0200 Subject: [PATCH 4/5] =?UTF-8?q?=C3=ADnverting=20SIZEOF(Items)=20check=20in?= =?UTF-8?q?=20IfcAlignmentRepresentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to return false where it is supposed to --- .../Functions/IfcAlignmentRepresentation/Expression.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt index 056ef85c1..ba4811f60 100644 --- a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt +++ b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt @@ -18,7 +18,7 @@ (* one representation is either Curve2D or 3D *) IF SIZEOF(AlignmentRepresentations) = 1 THEN - IF SIZEOF(QUERY(rep <* AlignmentRepresentations | SIZEOF(rep.Items) <> 1)) = 0 THEN + IF SIZEOF(AlignmentRepresentations[1].Items) <> 1 = 0 THEN RETURN (FALSE); END_IF; IF SIZEOF(QUERY(twoDee <* AlignmentRepresentations | twoDee.RepresentationType = 'Curve2D')) = 1 THEN From 6875e64680fdfd9ea7734d91954cefbb61996d06 Mon Sep 17 00:00:00 2001 From: SergejMuhic Date: Wed, 24 Jul 2024 13:15:11 +0200 Subject: [PATCH 5/5] removing check too many --- .../Functions/IfcAlignmentRepresentation/Expression.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt index ba4811f60..f21b01540 100644 --- a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt +++ b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Functions/IfcAlignmentRepresentation/Expression.txt @@ -18,7 +18,7 @@ (* one representation is either Curve2D or 3D *) IF SIZEOF(AlignmentRepresentations) = 1 THEN - IF SIZEOF(AlignmentRepresentations[1].Items) <> 1 = 0 THEN + IF SIZEOF(AlignmentRepresentations[1].Items) <> 1 THEN RETURN (FALSE); END_IF; IF SIZEOF(QUERY(twoDee <* AlignmentRepresentations | twoDee.RepresentationType = 'Curve2D')) = 1 THEN