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

Jump to bottom

Fix coordinate saving #276

Merged
merged 3 commits into from
Oct 26, 2023
Merged

Fix coordinate saving #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f1f96d
only drop absolute duplicates
rwood-97 Oct 17, 2023
46e5688
fix coordinate saving
rwood-97 Oct 19, 2023
32cdc9e
Merge branch 'dev_download' of https://github.com/Living-with-machine…
rwood-97 Oct 19, 2023
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
21 changes: 16 additions & 5 deletions mapreader/download/downloader_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ def get_grid_bb_from_polygon(polygon: Polygon, zoom_level: int):
GridBoundingBox
"""
min_x, min_y, max_x, max_y = polygon.bounds
start = Coordinate(min_y, max_x) # (lat, lon)
end = Coordinate(max_y, min_x) # (lat, lon)
start = Coordinate(min_y, min_x) # (lat, lon), lower left
end = Coordinate(max_y, max_x) # (lat, lon), upper right
start_idx = get_index_from_coordinate(start, zoom_level)
end_idx = get_index_from_coordinate(end, zoom_level)
return GridBoundingBox(start_idx, end_idx)
Expand All @@ -94,9 +94,20 @@ def get_polygon_from_grid_bb(grid_bb: GridBoundingBox):
-------
shapely.Polygon
"""
lower_corner = get_coordinate_from_index(grid_bb.lower_corner)
upper_corner = get_coordinate_from_index(grid_bb.upper_corner)
polygon = create_polygon_from_latlons(lower_corner.lat, lower_corner.lon, upper_corner.lat, upper_corner.lon)
lower_corner = grid_bb.lower_corner # SW
upper_corner = grid_bb.upper_corner # SW

# for NE corner of upper right tile, do x+1 and y+1
upper_corner_NE = GridIndex(
upper_corner.x + 1,
upper_corner.y + 1,
upper_corner.z
)

SW_coord = get_coordinate_from_index(lower_corner)
NE_coord = get_coordinate_from_index(upper_corner_NE)

polygon = create_polygon_from_latlons(SW_coord.lat, SW_coord.lon, NE_coord.lat, NE_coord.lon)
return polygon


Expand Down
2 changes: 1 addition & 1 deletion mapreader/download/sheet_downloader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ def _save_metadata(
if os.path.exists(out_filepath):
existing_metadata_df = pd.read_csv(out_filepath, sep=",", index_col=0)
metadata_df = pd.concat([existing_metadata_df, new_metadata_df], ignore_index=True)
metadata_df.drop_duplicates(subset=["grid_bb"], keep="first", inplace=True)
metadata_df.drop_duplicates(keep="first", inplace=True)
else:
metadata_df = new_metadata_df

Expand Down
Loading