mapreader 1.6.2.post0.dev8__tar.gz → 1.6.2.post0.dev29__tar.gz

{mapreader-1.6.2.post0.dev8 → mapreader-1.6.2.post0.dev29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mapreader
-Version: 1.6.2.post0.dev8
+Version: 1.6.2.post0.dev29
 Summary: A computer vision pipeline for the semantic exploration of maps/images at scale
 Home-page: https://github.com/Living-with-machines/MapReader
 Download-URL: https://github.com/Living-with-machines/MapReader/archive/refs/heads/main.zip
@@ -58,7 +58,7 @@ Requires-Dist: geopandas<1.0.0
 Requires-Dist: pyogrio>=0.7.2
 Requires-Dist: cartopy>=0.22.0
 Requires-Dist: joblib>=1.4.0
-Requires-Dist: opencv-python<5.0.0.0
+Requires-Dist: opencv-python<5.0.0.0,>=4.8.1.78
 Requires-Dist: folium<1.0.0,>=0.12
 Requires-Dist: mapclassify<3.0.0,>=2.0.0
 Requires-Dist: xyzservices==2024.9.0

{mapreader-1.6.2.post0.dev8 → mapreader-1.6.2.post0.dev29}/mapreader/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-02-06T16:52:53+0000",
+ "date": "2025-02-11T10:07:41+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "e9b81da2a2fe110cb4567f25d95e429e8e3cf517",
- "version": "1.6.2.post0.dev8"
+ "full-revisionid": "7e01b6b44e16bf3f2e487452daa3024d9b0f53f3",
+ "version": "1.6.2.post0.dev29"
 }
 '''  # END VERSION_JSON
 

{mapreader-1.6.2.post0.dev8 → mapreader-1.6.2.post0.dev29}/mapreader/download/sheet_downloader.py

@@ -530,7 +530,7 @@ class SheetDownloader:
         existing_id: str | bool,
         download_in_parallel: bool = True,
         overwrite: bool = False,
-        force: bool = False,
+        error_on_missing_map=True,
     ) -> str | bool:
         """
         Downloads a single map sheet and saves as png file.
@@ -545,8 +545,8 @@ class SheetDownloader:
             Whether to download tiles in parallel, by default ``True``.
         overwrite : bool, optional
             Whether to overwrite existing maps, by default ``False``.
-        force : bool, optional
-            Whether to force the download or ask for confirmation, by default ``False``.
+        error_on_missing_map : bool, optional
+            Whether to raise an error if a map sheet is missing, by default True.
 
         Returns
         -------
@@ -563,13 +563,16 @@ class SheetDownloader:
             map_name = existing_id[:-4]  # remove file extension (assuming .png)
 
         img_path, success = self.merger.merge(
-            feature["grid_bb"], file_name=map_name, overwrite=overwrite
+            feature["grid_bb"],
+            file_name=map_name,
+            overwrite=overwrite,
+            error_on_missing_map=error_on_missing_map,
         )
 
         if success:
             print(f'[INFO] Downloaded "{img_path}"')
         else:
-            print(f'[WARNING] Download of "{img_path}" was unsuccessful.')
+            print("[WARNING] Download unsuccessful.")
 
         # Try to remove the temporary folder
         try:
@@ -686,6 +689,7 @@ class SheetDownloader:
         overwrite: bool | None = False,
         download_in_parallel: bool = True,
         force: bool = False,
+        error_on_missing_map: bool = True,
         **kwargs: dict | None,
     ):
         """Download map sheets from features.
@@ -704,6 +708,8 @@ class SheetDownloader:
             Whether to download tiles in parallel, by default ``True``.
         force : bool, optional
             Whether to force the download or ask for confirmation, by default ``False``.
+        error_on_missing_map : bool, optional
+            Whether to raise an error if a map sheet is missing, by default True.
         **kwargs : dict, optional
             Keyword arguments to pass to the
             :meth:`~.download.sheet_downloader.SheetDownloader._save_metadata`
@@ -759,6 +765,7 @@ class SheetDownloader:
                 existing_id,
                 download_in_parallel=download_in_parallel,
                 overwrite=overwrite,
+                error_on_missing_map=error_on_missing_map,
             )
             if img_path is not False:
                 metadata_path = f"{path_save}/{metadata_fname}"

{mapreader-1.6.2.post0.dev8 → mapreader-1.6.2.post0.dev29}/mapreader/download/tile_merging.py

@@ -148,6 +148,7 @@ class TileMerger:
         grid_bb: GridBoundingBox,
         file_name: str | None = None,
         overwrite: bool = False,
+        error_on_missing_map: bool = True,
     ) -> str | bool:
         """Merges cells contained within GridBoundingBox.
 
@@ -167,7 +168,12 @@ class TileMerger:
         """
         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 as err:
+            if error_on_missing_map:
+                raise err
+            return False, False
 
         merged_image = Image.new(
             "RGBA", (len(grid_bb.x_range) * tile_size, len(grid_bb.y_range) * tile_size)

{mapreader-1.6.2.post0.dev8 → mapreader-1.6.2.post0.dev29}/mapreader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mapreader
-Version: 1.6.2.post0.dev8
+Version: 1.6.2.post0.dev29
 Summary: A computer vision pipeline for the semantic exploration of maps/images at scale
 Home-page: https://github.com/Living-with-machines/MapReader
 Download-URL: https://github.com/Living-with-machines/MapReader/archive/refs/heads/main.zip
@@ -58,7 +58,7 @@ Requires-Dist: geopandas<1.0.0
 Requires-Dist: pyogrio>=0.7.2
 Requires-Dist: cartopy>=0.22.0
 Requires-Dist: joblib>=1.4.0
-Requires-Dist: opencv-python<5.0.0.0
+Requires-Dist: opencv-python<5.0.0.0,>=4.8.1.78
 Requires-Dist: folium<1.0.0,>=0.12
 Requires-Dist: mapclassify<3.0.0,>=2.0.0
 Requires-Dist: xyzservices==2024.9.0

{mapreader-1.6.2.post0.dev8 → mapreader-1.6.2.post0.dev29}/mapreader.egg-info/requires.txt

@@ -29,7 +29,7 @@ geopandas<1.0.0
 pyogrio>=0.7.2
 cartopy>=0.22.0
 joblib>=1.4.0
-opencv-python<5.0.0.0
+opencv-python<5.0.0.0,>=4.8.1.78
 folium<1.0.0,>=0.12
 mapclassify<3.0.0,>=2.0.0
 xyzservices==2024.9.0

{mapreader-1.6.2.post0.dev8 → mapreader-1.6.2.post0.dev29}/setup.py

@@ -59,7 +59,7 @@ setuptools.setup(
         "pyogrio>=0.7.2",
         "cartopy>=0.22.0",
         "joblib>=1.4.0",
-        "opencv-python<5.0.0.0",
+        "opencv-python>=4.8.1.78,<5.0.0.0",
         "folium>=0.12,<1.0.0",
         "mapclassify>=2.0.0,<3.0.0",
         "xyzservices==2024.9.0",