From 1f992667a2f9e2e7961b37c7269874f7e94e6281 Mon Sep 17 00:00:00 2001
From: Gonzalo Casas <casas@arch.ethz.ch>
Date: Tue, 15 Oct 2024 02:03:57 +0200
Subject: [PATCH] Fix scaled

---
 CHANGELOG.md                      |   1 +
 src/compas/geometry/shapes/box.py |  22 ++++++
 tests/compas/geometry/test_box.py | 116 ++++++++++++++++++++++++++++++
 3 files changed, 139 insertions(+)
 create mode 100644 tests/compas/geometry/test_box.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a775e41122..1486ba4f5f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 * Fixed `RuntimeError` when using `compas_rhino.unload_modules` in CPython`. 
+* Fixed `scaled` in `Box`.
 
 ### Removed
 
diff --git a/src/compas/geometry/shapes/box.py b/src/compas/geometry/shapes/box.py
index f59ac32dee3..68be9fcd4cc 100644
--- a/src/compas/geometry/shapes/box.py
+++ b/src/compas/geometry/shapes/box.py
@@ -575,6 +575,28 @@ def scale(self, factor):
         self.ysize *= factor
         self.zsize *= factor
 
+    def scaled(self, x, y=None, z=None):
+        """Returns a scaled copy of the box.
+
+        Parameters
+        ----------
+        x : float
+            The scaling factor in the x-direction.
+        y : float, optional
+            The scaling factor in the y-direction.
+            Defaults to ``x``.
+        z : float, optional
+            The scaling factor in the z-direction.
+            Defaults to ``x``.
+
+        """
+        box = self.copy()
+        box.xsize *= x
+        box.ysize *= y
+        box.zsize *= z
+
+        return box
+
     # ==========================================================================
     # Methods
     # ==========================================================================
diff --git a/tests/compas/geometry/test_box.py b/tests/compas/geometry/test_box.py
new file mode 100644
index 00000000000..86db9324713
--- /dev/null
+++ b/tests/compas/geometry/test_box.py
@@ -0,0 +1,116 @@
+import pytest
+from compas.geometry import Box
+from compas.geometry import Point
+
+
+@pytest.fixture
+def default_box():
+    return Box(1.0, 2.0, 3.0)
+
+
+@pytest.fixture
+def unit_box():
+    return Box(1.0)
+
+
+def test_box_constructor(default_box):
+    assert default_box.xsize == 1.0
+    assert default_box.ysize == 2.0
+    assert default_box.zsize == 3.0
+
+
+def test_box_volume(default_box):
+    assert default_box.volume == 6.0
+
+
+def test_box_area(default_box):
+    assert default_box.area == 22.0
+
+
+def test_box_dimensions(default_box):
+    assert default_box.dimensions == [1.0, 2.0, 3.0]
+
+
+def test_box_corners(default_box):
+    assert len(default_box.points) == 8
+
+
+@pytest.mark.parametrize(
+    "index, expected",
+    [
+        (0, Point(-0.5, -1.0, -1.5)),
+        (1, Point(-0.5, 1.0, -1.5)),
+        (2, Point(0.5, 1.0, -1.5)),
+        (3, Point(0.5, -1.0, -1.5)),
+        (4, Point(-0.5, -1.0, 1.5)),
+        (5, Point(-0.5, 1.0, 1.5)),
+        (6, Point(0.5, 1.0, 1.5)),
+        (7, Point(0.5, -1.0, 1.5)),
+    ],
+)
+def test_box_corner(default_box, index, expected):
+    assert default_box.corner(index) == expected
+
+
+def test_box_contains_point(default_box):
+    assert default_box.contains_point(Point(0.0, 0.0, 0.0))
+    assert not default_box.contains_point(Point(2.0, 2.0, 2.0))
+
+
+def test_box_contains_points(default_box):
+    points = [Point(0.0, 0.0, 0.0), Point(2.0, 2.0, 2.0)]
+    results = default_box.contains_points(points)
+    assert results == [True, False]
+
+
+def test_box_from_width_height_depth():
+    box = Box.from_width_height_depth(1.0, 2.0, 3.0)
+    assert box.xsize == 1.0
+    assert box.ysize == 3.0
+    assert box.zsize == 2.0
+
+
+def test_box_from_bounding_box():
+    bbox = [
+        Point(0.0, 0.0, 0.0),
+        Point(1.0, 0.0, 0.0),
+        Point(1.0, 1.0, 0.0),
+        Point(0.0, 1.0, 0.0),
+        Point(0.0, 0.0, 1.0),
+        Point(1.0, 0.0, 1.0),
+        Point(1.0, 1.0, 1.0),
+        Point(0.0, 1.0, 1.0),
+    ]
+    box = Box.from_bounding_box(bbox)
+    assert box.xsize == 1.0
+    assert box.ysize == 1.0
+    assert box.zsize == 1.0
+
+
+def test_box_from_corner_corner_height():
+    box = Box.from_corner_corner_height([0.0, 0.0, 0.0], [1.0, 1.0, 0.0], 1.0)
+    assert box.xsize == 1.0
+    assert box.ysize == 1.0
+    assert box.zsize == 1.0
+
+
+def test_box_from_diagonal():
+    diagonal = [Point(0.0, 0.0, 0.0), Point(1.0, 1.0, 1.0)]
+    box = Box.from_diagonal(diagonal)
+    assert box.xsize == 1.0
+    assert box.ysize == 1.0
+    assert box.zsize == 1.0
+
+
+def test_box_scale(default_box):
+    default_box.scale(2.0)
+    assert default_box.xsize == 2.0
+    assert default_box.ysize == 4.0
+    assert default_box.zsize == 6.0
+
+
+def test_box_scaled(default_box):
+    new_box = default_box.scaled(2.0, 4.0, 2.0)
+    assert new_box.xsize == 2.0
+    assert new_box.ysize == 8.0
+    assert new_box.zsize == 6.0