Update spade

Author: stefmolin

src/data_morph/shapes/points/spade.py

@@ -30,8 +30,9 @@ class Spade(PointCollection):
     """
 
     def __init__(self, dataset: Dataset) -> None:
-        _, xmax = dataset.data_bounds.x_bounds
-        x_shift, y_shift = dataset.data_bounds.center
+        data_bounds = dataset.data_bounds
+        (_, xmax) = data_bounds.x_bounds
+        x_shift, y_shift = data_bounds.center
 
         # upside-down heart
         heart_points = self._get_inverted_heart(dataset, y_shift)
@@ -43,7 +44,7 @@ def __init__(self, dataset: Dataset) -> None:
         x = np.concatenate((heart_points[:, 0], base_x), axis=0)
         y = np.concatenate((heart_points[:, 1], base_y), axis=0)
 
-        super().__init__(*np.stack([x, y], axis=1))
+        super().__init__(*self._center(np.stack([x, y], axis=1), data_bounds))
 
     @staticmethod
     def _get_inverted_heart(dataset: Dataset, y_shift: Number) -> np.ndarray:

tests/shapes/points/test_spade.py

@@ -12,10 +12,11 @@ class TestSpade(PointsModuleTestBase):
 
     shape_name = 'spade'
     distance_test_cases = (
-        ((19.97189615, 75.43271708), 0),
-        ((23.75, 55), 0),
-        ((11.42685318, 59.11304904), 0),
-        ((20, 75), 0.2037185),
-        ((0, 0), 57.350348),
-        ((10, 80), 10.968080),
+        ((19.818701, 60.065370), 0),
+        ((23.750000, 55.532859), 0),
+        ((20.067229, 60.463689), 0),
+        ((18.935968, 58.467606), 0),
+        ((20, 75), 0.5335993101603015),
+        ((0, 0), 57.861566654807596),
+        ((10, 80), 11.404000978114487),
     )