Skip to content

Commit faa402e

Browse files
cardernefrandorr
authored andcommitted
Make bbox_size always single int
1 parent c75aa5f commit faa402e

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

src/satextractor/scheduler/scheduler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def cluster_tiles_in_utm(tiles: List[Tile], split_m: int) -> gpd.GeoDataFrame:
160160
splits = split_region_in_utm_tiles(
161161
tiles_geom_multi,
162162
crs=CRS.WGS84,
163-
bbox_size=(split_m, split_m),
163+
bbox_size=split_m,
164164
)
165165

166166
tiles_gdf = gpd.GeoDataFrame({"geometry": tiles_geom})

src/satextractor/tiler/tiler.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from typing import List
2-
from typing import Tuple
32
from typing import Union
43

54
import shapely
@@ -11,15 +10,15 @@
1110
def split_region_in_utm_tiles(
1211
region: Union[shapely.geometry.Polygon, shapely.geometry.MultiPolygon],
1312
crs: CRS = CRS.WGS84,
14-
bbox_size: Tuple[int, int] = (10000, 10000),
13+
bbox_size: int = 10000,
1514
**kwargs,
1615
) -> List[Tile]:
1716
"""Split a given geometry in squares measured in meters.
1817
It splits the region in utm grid and the convert back to given crs.
1918
2019
Args:
2120
region (UnionList[shapely.geometry.Polygon, shapely.geometry.MultiPolygon]): The region to split from
22-
bbox_size (Tuple[int, int]): square bbox in meters
21+
bbox_size (int): bbox size in meters
2322
2423
Returns:
2524
[List[Tile]]: The Tiles representing each of the boxes
@@ -28,20 +27,15 @@ def split_region_in_utm_tiles(
2827
crs_bboxes = utm_splitter.get_bbox_list()
2928
info_bboxes = utm_splitter.get_info_list()
3029

31-
assert (
32-
bbox_size[0] == bbox_size[1]
33-
), "bbox_size sides should be equal size, i.e. square"
34-
size = bbox_size[0]
35-
3630
tiles = []
3731
for info, box in zip(info_bboxes, crs_bboxes):
3832
# tile ids are globally unique and take the format shown below
3933
zone = info["utm_zone"]
4034
row = info["utm_row"]
41-
x, y = (int(v / size) for v in box.lower_left)
35+
x, y = (int(v / bbox_size) for v in box.lower_left)
4236
tiles.append(
4337
Tile(
44-
id=f"{zone}_{row}_{size}_{x}_{y}",
38+
id=f"{zone}_{row}_{bbox_size}_{x}_{y}",
4539
epsg=box.crs.epsg,
4640
bbox=(box.min_x, box.min_y, box.max_x, box.max_y),
4741
),

0 commit comments

Comments
 (0)