This commit is contained in:
Will McGugan
2023-02-21 09:58:05 +00:00
parent ae498d49c8
commit e4b38f2341
2 changed files with 4 additions and 4 deletions

View File

@@ -36,7 +36,7 @@ class SpatialMap(Generic[ValueType]):
self._map: defaultdict[GridCoordinate, list[ValueType]] = defaultdict(list) self._map: defaultdict[GridCoordinate, list[ValueType]] = defaultdict(list)
self._fixed: list[ValueType] = [] self._fixed: list[ValueType] = []
def _region_to_grid_coordinate(self, region: Region) -> Iterable[GridCoordinate]: def _region_to_grid_coordinates(self, region: Region) -> Iterable[GridCoordinate]:
"""Get the grid squares under a region. """Get the grid squares under a region.
Args: Args:
@@ -70,7 +70,7 @@ class SpatialMap(Generic[ValueType]):
""" """
append_fixed = self._fixed.append append_fixed = self._fixed.append
get_grid_list = self._map.__getitem__ get_grid_list = self._map.__getitem__
_region_to_grid = self._region_to_grid_coordinate _region_to_grid = self._region_to_grid_coordinates
total_region = self.total_region total_region = self.total_region
for region, fixed, value in regions_and_values: for region, fixed, value in regions_and_values:
total_region = total_region.union(region) total_region = total_region.union(region)
@@ -95,7 +95,7 @@ class SpatialMap(Generic[ValueType]):
results: list[ValueType] = self._fixed.copy() results: list[ValueType] = self._fixed.copy()
add_results = results.extend add_results = results.extend
get_grid_values = self._map.get get_grid_values = self._map.get
for grid_coordinate in self._region_to_grid_coordinate(region): for grid_coordinate in self._region_to_grid_coordinates(region):
grid_values = get_grid_values(grid_coordinate) grid_values = get_grid_values(grid_coordinate)
if grid_values is not None: if grid_values is not None:
add_results(grid_values) add_results(grid_values)

View File

@@ -36,7 +36,7 @@ from textual.geometry import Region
def test_region_to_grid(region, grid): def test_region_to_grid(region, grid):
spatial_map = SpatialMap(10, 10) spatial_map = SpatialMap(10, 10)
assert list(spatial_map._region_to_grid_coordinate(region)) == grid assert list(spatial_map._region_to_grid_coordinates(region)) == grid
def test_get_values_in_region() -> None: def test_get_values_in_region() -> None: