Merge branch 'v0.8.0' into lint-pass

src/ifcopenshell-python/ifcopenshell/api/alignment/add_positioning_referent.py

@@ -51,11 +51,11 @@ def add_positioning_referent(
         ifcopenshell.api.alignment.add_positioning_referent(model,name="Pier 1 Sta 1+00",alignment=alignment,distance_along=0.0,station=100.0,positioned_product=pier)
     """
 
-    basis_curve = ifcopenshell.api.alignment.get_basis_curve(alignment)
+    curve = ifcopenshell.api.alignment.get_curve(alignment)
 
     object_placement = None
     representation = None
-    if basis_curve and basis_curve.is_a("IfcCompositeCurve") and 0 < len(basis_curve.Segments):
+    if curve and curve.is_a("IfcCompositeCurve") and 0 < len(curve.Segments):
         object_placement = file.createIfcLinearPlacement(
             RelativePlacement=file.createIfcAxis2PlacementLinear(
                 Location=file.createIfcPointByDistanceExpression(
@@ -63,7 +63,7 @@ def add_positioning_referent(
                     OffsetLateral=None,
                     OffsetVertical=None,
                     OffsetLongitudinal=None,
-                    BasisCurve=basis_curve,
+                    BasisCurve=curve,
                 )
             ),
         )

src/ifcopenshell-python/ifcopenshell/api/alignment/add_stationing_referent.py

@@ -34,6 +34,7 @@ def add_stationing_referent(
     distance_along: float,
     station: float,
     incoming_station: Optional[float] = None,
+    on_basis_curve: Optional[bool] = None,
 ) -> entity_instance:
     """
     Adds an IfcReferent to the alignment that defines the stationing system.
@@ -43,6 +44,7 @@ def add_stationing_referent(
     :param distance_along: distance along the alignment basis curve
     :param station: station value
     :param incoming_station: station value of the incoming segment, only set to specify a station equation
+    :param on_basis_curve: whether the referent is positioned on the basis curve or the alignment curve, if None the function will default to the basis curve
     :return: referent
 
     Example:
@@ -53,11 +55,14 @@ def add_stationing_referent(
         ifcopenshell.api.alignment.add_stationing_referent(model,name="1+00.0",alignment=alignment,distance_along=0.0,station=100.0)
     """
 
-    basis_curve = ifcopenshell.api.alignment.get_basis_curve(alignment)
+    if on_basis_curve is None:
+        on_basis_curve = True
+
+    curve = ifcopenshell.api.alignment.get_basis_curve(alignment) if on_basis_curve else ifcopenshell.api.alignment.get_curve(alignment)
 
     object_placement = None
     representation = None
-    if basis_curve and basis_curve.is_a("IfcCompositeCurve") and 0 < len(basis_curve.Segments):
+    if curve and curve.is_a("IfcCompositeCurve") and 0 < len(curve.Segments):
         object_placement = file.createIfcLinearPlacement(
             RelativePlacement=file.createIfcAxis2PlacementLinear(
                 Location=file.createIfcPointByDistanceExpression(
@@ -65,7 +70,7 @@ def add_stationing_referent(
                     OffsetLateral=None,
                     OffsetVertical=None,
                     OffsetLongitudinal=None,
-                    BasisCurve=basis_curve,
+                    BasisCurve=curve,
                 )
             ),
         )

src/ifcopenshell-python/ifcopenshell/api/alignment/update_fallback_position.py

@@ -36,11 +36,9 @@ def update_fallback_position(file: ifcopenshell.file, lp: entity_instance):
 
     p = ifcopenshell.util.placement.get_local_placement(lp)
 
-    unit_scale = ifcopenshell.util.unit.calculate_unit_scale(file)
-
-    x = float(p[0, 3]) * unit_scale
-    y = float(p[1, 3]) * unit_scale
-    z = float(p[2, 3]) * unit_scale
+    x = float(p[0, 3])
+    y = float(p[1, 3])
+    z = float(p[2, 3])
 
     rx = float(p[0, 0])
     ry = float(p[1, 0])