Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jb/oct24 #152

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Jb/oct24 #152

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15b5aa5
fix tiling for preds
PatBall1 Oct 22, 2024
50e6d7c
fix tiling for preds
PatBall1 Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 43 additions & 38 deletions detectree2/preprocessing/tiling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,12 @@ def process_tile(
geo = gpd.GeoDataFrame({"geometry": bbox}, index=[0], crs=data.crs)
coords = get_features(geo)

overlapping_crowns = None
if crowns is not None:
overlapping_crowns = gpd.clip(crowns, geo)
if overlapping_crowns.empty or (overlapping_crowns.dissolve().area[0] / geo.area[0]) < threshold:
return None
else:
overlapping_crowns = None

out_img, out_transform = mask(data, shapes=coords, crop=True)

Expand Down Expand Up @@ -231,11 +232,12 @@ def process_tile_ms(
geo = gpd.GeoDataFrame({"geometry": [bbox]}, index=[0], crs=data.crs)
coords = [geo.geometry[0].__geo_interface__]

overlapping_crowns = None
if crowns is not None:
overlapping_crowns = gpd.clip(crowns, geo)
if overlapping_crowns.empty or (overlapping_crowns.dissolve().area[0] / geo.area[0]) < threshold:
return None
else:
overlapping_crowns = None

out_img, out_transform = mask(data, shapes=coords, crop=True)

Expand Down Expand Up @@ -328,42 +330,45 @@ def process_tile_train(

data, out_path_root, overlapping_crowns, minx, miny, buffer = result

overlapping_crowns = overlapping_crowns.explode(index_parts=True)
moved = overlapping_crowns.translate(-minx + buffer, -miny + buffer)
scalingx = 1 / (data.transform[0])
scalingy = -1 / (data.transform[4])
moved_scaled = moved.scale(scalingx, scalingy, origin=(0, 0))

if mode == "rgb":
impath = {"imagePath": out_path_root.with_suffix(".png").as_posix()}
elif mode == "ms":
impath = {"imagePath": out_path_root.with_suffix(".tif").as_posix()}

try:
filename = out_path_root.with_suffix(".geojson")
moved_scaled = overlapping_crowns.set_geometry(moved_scaled)

if class_column is not None:
# Ensure we map the selected column to the 'status' field
moved_scaled['status'] = moved_scaled[class_column]
# Keep only 'status' and geometry
moved_scaled = moved_scaled[['geometry', 'status']]
else:
# Keep only geometry to reduce file size
moved_scaled = moved_scaled[['geometry']]

# Save the result as GeoJSON
moved_scaled.to_file(driver="GeoJSON", filename=filename)

# Add image path info to the GeoJSON file
with open(filename, "r") as f:
shp = json.load(f)
shp.update(impath)
with open(filename, "w") as f:
json.dump(shp, f)
except ValueError:
logger.warning("Cannot write empty DataFrame to file.")
return
if overlapping_crowns is not None and not overlapping_crowns.empty:
overlapping_crowns = overlapping_crowns.explode(index_parts=True)
moved = overlapping_crowns.translate(-minx + buffer, -miny + buffer)
scalingx = 1 / (data.transform[0])
scalingy = -1 / (data.transform[4])
moved_scaled = moved.scale(scalingx, scalingy, origin=(0, 0))

if mode == "rgb":
impath = {"imagePath": out_path_root.with_suffix(".png").as_posix()}
elif mode == "ms":
impath = {"imagePath": out_path_root.with_suffix(".tif").as_posix()}

try:
filename = out_path_root.with_suffix(".geojson")
moved_scaled = overlapping_crowns.set_geometry(moved_scaled)

if class_column is not None:
# Ensure we map the selected column to the 'status' field
moved_scaled['status'] = moved_scaled[class_column]
# Keep only 'status' and geometry
moved_scaled = moved_scaled[['geometry', 'status']]
else:
# Keep only geometry to reduce file size
moved_scaled = moved_scaled[['geometry']]

# Save the result as GeoJSON
moved_scaled.to_file(driver="GeoJSON", filename=filename)

# Add image path info to the GeoJSON file
with open(filename, "r") as f:
shp = json.load(f)
shp.update(impath)
with open(filename, "w") as f:
json.dump(shp, f)
except ValueError:
logger.warning("Cannot write empty DataFrame to file.")
return
else:
return None # Handle the case where there are no overlapping crowns


# Define a top-level helper function
Expand Down
Loading