From 8a7320dd135a669578ccbd2a8a93811cdfa8312f Mon Sep 17 00:00:00 2001 From: Rosie Date: Fri, 13 Oct 2023 10:12:04 +0000 Subject: [PATCH 1/2] ensure download doesn't fail if maps are not found --- mapreader/download/tile_merging.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mapreader/download/tile_merging.py b/mapreader/download/tile_merging.py index ebded0ce..5f850f92 100644 --- a/mapreader/download/tile_merging.py +++ b/mapreader/download/tile_merging.py @@ -159,7 +159,11 @@ def merge(self, grid_bb: GridBoundingBox, file_name: Union[str, None] = None) -> """ os.makedirs(self.output_folder, exist_ok=True) - tile_size = self._load_tile_size(grid_bb) + try: + tile_size = self._load_tile_size(grid_bb) + except FileNotFoundError: + return False # unsuccessful + merged_image = Image.new( "RGBA", (len(grid_bb.x_range) * tile_size, len(grid_bb.y_range) * tile_size) ) From 6f1f96dcb180838ee7839c5155ad55c18cba0574 Mon Sep 17 00:00:00 2001 From: Rosie Date: Tue, 17 Oct 2023 08:01:26 +0000 Subject: [PATCH 2/2] only drop absolute duplicates --- mapreader/download/sheet_downloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapreader/download/sheet_downloader.py b/mapreader/download/sheet_downloader.py index 6add1bb2..2722a603 100644 --- a/mapreader/download/sheet_downloader.py +++ b/mapreader/download/sheet_downloader.py @@ -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