mapreader 1.1.4__tar.gz → 1.2.0__tar.gz

{mapreader-1.1.4 → mapreader-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapreader
-Version: 1.1.4
+Version: 1.2.0
 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
@@ -24,7 +24,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
-Requires-Python: >=3.7, <3.11
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib<4.0.0,>=3.5.0
@@ -37,8 +37,8 @@ Requires-Dist: Shapely<3.0.0,>=2.0.0
 Requires-Dist: nest-asyncio<2.0.0,>=1.5.1
 Requires-Dist: scikit-image>=0.18.3
 Requires-Dist: scikit-learn<2.0.0,>=1.0.1
-Requires-Dist: torch<2.0.0,>=1.10.0
-Requires-Dist: torchvision<0.12.1,>=0.11.1
+Requires-Dist: torch>=1.10.0
+Requires-Dist: torchvision<0.17.3,>=0.11.1
 Requires-Dist: jupyter<2.0.0,>=1.0.0
 Requires-Dist: ipykernel<7.0.0,>=6.5.1
 Requires-Dist: ipywidgets<9.0.0,>=8.0.0
@@ -55,13 +55,15 @@ Requires-Dist: tqdm<5.0.0
 Requires-Dist: torchinfo<2.0.0
 Requires-Dist: openpyxl<4.0.0
 Requires-Dist: geopandas<1.0.0
+Requires-Dist: pyogrio>=0.7.2
+Requires-Dist: cartopy>=0.22.0
 Provides-Extra: dev
-Requires-Dist: pytest<8.0.0; extra == "dev"
-Requires-Dist: pytest-cov<5.0.0,>=4.1.0; extra == "dev"
+Requires-Dist: pytest<9.0.0; extra == "dev"
+Requires-Dist: pytest-cov<6.0.0,>=4.1.0; extra == "dev"
 Requires-Dist: timm<1.0.0; extra == "dev"
 Requires-Dist: transformers<5.0.0; extra == "dev"
-Requires-Dist: black<24.0.0,>=23.7.0; extra == "dev"
-Requires-Dist: flake8<7.0.0,>=6.0.0; extra == "dev"
+Requires-Dist: black<25.0.0,>=23.7.0; extra == "dev"
+Requires-Dist: flake8<8.0.0,>=6.0.0; extra == "dev"
 
 <div align="center">
     <br>
@@ -132,7 +134,7 @@ The MapReader documentation can be found at https://mapreader.readthedocs.io/en/
 - Geospatial images (i.e. maps)
 - Non-geospatial images
 
- **Developers and contributors** may also want to refer to the [API documentation](https://mapreader.readthedocs.io/en/latest/api/index.html) and [Contribution guide](https://mapreader.readthedocs.io/en/latest/Contribution-guide.html) for guidance on how to contribute to the MapReader package.
+ **Developers and contributors** may also want to refer to the [API documentation](https://mapreader.readthedocs.io/en/latest/api/index.html) and [Contribution guide](https://mapreader.readthedocs.io/en/latest/Contribution-guide/Contribution-guide.html) for guidance on how to contribute to the MapReader package.
 
 **Join our Slack workspace!**
 Please fill out [this form](https://forms.gle/dXjECHZQkwrZ3Xpt9) to receive an invitation to the Slack workspace.

{mapreader-1.1.4 → mapreader-1.2.0}/README.md

@@ -67,7 +67,7 @@ The MapReader documentation can be found at https://mapreader.readthedocs.io/en/
 - Geospatial images (i.e. maps)
 - Non-geospatial images
 
- **Developers and contributors** may also want to refer to the [API documentation](https://mapreader.readthedocs.io/en/latest/api/index.html) and [Contribution guide](https://mapreader.readthedocs.io/en/latest/Contribution-guide.html) for guidance on how to contribute to the MapReader package.
+ **Developers and contributors** may also want to refer to the [API documentation](https://mapreader.readthedocs.io/en/latest/api/index.html) and [Contribution guide](https://mapreader.readthedocs.io/en/latest/Contribution-guide/Contribution-guide.html) for guidance on how to contribute to the MapReader package.
 
 **Join our Slack workspace!**
 Please fill out [this form](https://forms.gle/dXjECHZQkwrZ3Xpt9) to receive an invitation to the Slack workspace.

{mapreader-1.1.4 → mapreader-1.2.0}/mapreader/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-02-22T16:00:21+0000",
+ "date": "2024-04-08T09:00:00+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "4ae6026f4694f1995359fd77a26daf042f64e32a",
- "version": "1.1.4"
+ "full-revisionid": "e9d119ffa6946e723f7977ddd7add0c9bcce34d8",
+ "version": "1.2.0"
 }
 '''  # END VERSION_JSON
 

{mapreader-1.1.4 → mapreader-1.2.0}/mapreader/annotate/utils.py

@@ -95,7 +95,7 @@ def prepare_data(
             ).values
             if random_state in ["random"]:
                 df = df.groupby("pixel_groups").sample(
-                    n=10, random_state=random.randint(0, 1e6)
+                    n=10, random_state=random.randint(0, int(1e6))
                 )
             else:
                 df = df.groupby("pixel_groups").sample(n=10, random_state=random_state)

{mapreader-1.1.4 → mapreader-1.2.0}/mapreader/classify/classifier.py

@@ -7,8 +7,9 @@ import random
 import socket
 import sys
 import time
+from collections.abc import Hashable, Iterable
 from datetime import datetime
-from typing import Any, Hashable, Iterable
+from typing import Any
 
 import joblib
 import matplotlib.pyplot as plt
@@ -167,7 +168,7 @@ class ClassifierContainer:
             if not os.path.exists("./tmp_checkpoints"):
                 os.makedirs("./tmp_checkpoints")
             self.tmp_save_filename = (
-                f"./tmp_checkpoints/tmp_{random.randint(0, 1e10)}_checkpoint.pkl"
+                f"./tmp_checkpoints/tmp_{random.randint(0, int(1e10))}_checkpoint.pkl"
             )
 
             # add colors for printing/logging

{mapreader-1.1.4 → mapreader-1.2.0}/mapreader/download/downloader.py

@@ -61,20 +61,24 @@ class Downloader:
         """
         self.merger = TileMerger(output_folder=path_save, show_progress=False)
 
-    def _check_map_exists(self, grid_bb: GridBoundingBox) -> bool:
+    def _check_map_exists(self, grid_bb: GridBoundingBox, map_name: str | None) -> bool:
         """
         Checks if a map is already saved.
 
         Parameters
         ----------
         grid_bb : GridBoundingBox
+            The grid bounding box of the map
+        map_name : str, optional
+            Name to use when saving the map, by default None
 
         Returns
         -------
         bool
             True if file exists, False if not.
         """
-        map_name = self.merger._get_output_name(grid_bb)
+        if map_name is None:
+            map_name = self.merger._get_output_name(grid_bb)
         path_save = self.merger.output_folder
         if os.path.exists(f"{path_save}{map_name}.png"):
             print(
@@ -83,22 +87,26 @@ class Downloader:
             return True
         return False
 
-    def _download_map(self, grid_bb: GridBoundingBox) -> bool:
+    def _download_map(self, grid_bb: GridBoundingBox, map_name: str | None) -> bool:
         """
         Downloads a map contained within a grid bounding box.
 
         Parameters
         ----------
         grid_bb : GridBoundingBox
+            The grid bounding box of the map
+        map_name : str, optional
+            Name to use when saving the map, by default None
 
         Returns
         -------
         bool
             True if map was successfully downloaded, False if not.
         """
-        map_name = self.merger._get_output_name(grid_bb)
+        if map_name is None:
+            map_name = self.merger._get_output_name(grid_bb)
         self.downloader.download_tiles(grid_bb, download_in_parallel=False)
-        success = self.merger.merge(grid_bb)
+        success = self.merger.merge(grid_bb, map_name)
         if success:
             print(f'[INFO] Downloaded "{map_name}.png"')
         else:
@@ -113,6 +121,7 @@ class Downloader:
         zoom_level: int | None = 14,
         path_save: str | None = "maps",
         overwrite: bool | None = False,
+        map_name: str | None = None,
     ) -> None:
         """
         Downloads a map contained within a polygon.
@@ -127,6 +136,8 @@ class Downloader:
             Path to save map sheets, by default "maps"
         overwrite : bool, optional
             Whether to overwrite existing maps, by default ``False``.
+        map_name : str, optional
+            Name to use when saving the map, by default None
         """
 
         assert isinstance(
@@ -147,6 +158,6 @@ Please pass polygon as shapely.geometry.Polygon object.\n\
         self._initialise_downloader()
         self._initialise_merger(f"{path_save}/")
         if not overwrite:
-            if self._check_map_exists(grid_bb):
+            if self._check_map_exists(grid_bb, map_name):
                 return
-        self._download_map(grid_bb)
+        self._download_map(grid_bb, map_name)

{mapreader-1.1.4 → mapreader-1.2.0}/mapreader/download/sheet_downloader.py

@@ -559,7 +559,7 @@ class SheetDownloader:
                 return False
         return False
 
-    def _download_map(self, feature: dict) -> bool:
+    def _download_map(self, feature: dict, download_in_parallel: bool = True) -> bool:
         """
         Downloads a single map sheet and saves as png file.
 
@@ -573,7 +573,9 @@ class SheetDownloader:
             True if map was downloaded successfully, False if not.
         """
         map_name = str("map_" + feature["properties"]["IMAGE"])
-        self.downloader.download_tiles(feature["grid_bb"])
+        self.downloader.download_tiles(
+            feature["grid_bb"], download_in_parallel=download_in_parallel
+        )
         success = self.merger.merge(feature["grid_bb"], map_name)
         if success:
             print(f'[INFO] Downloaded "{map_name}.png"')
@@ -681,6 +683,7 @@ class SheetDownloader:
         path_save: str | None = "maps",
         metadata_fname: str | None = "metadata.csv",
         overwrite: bool | None = False,
+        download_in_parallel: bool = True,
         **kwargs: dict | None,
     ):
         """Download map sheets from a list of features.
@@ -695,6 +698,8 @@ class SheetDownloader:
             Name to use for metadata file, by default "metadata.csv"
         overwrite : bool, optional
             Whether to overwrite existing maps, by default ``False``.
+        download_in_parallel : bool, optional
+            Whether to download tiles in parallel, by default ``True``.
         **kwargs : dict, optional
             Keyword arguments to pass to the ``_save_metadata()`` method.
         """
@@ -703,7 +708,9 @@ class SheetDownloader:
             if not overwrite:
                 if self._check_map_sheet_exists(feature):
                     continue
-            success = self._download_map(feature)
+            success = self._download_map(
+                feature, download_in_parallel=download_in_parallel
+            )
             if success:
                 metadata_path = f"{path_save}/{metadata_fname}"
                 self._save_metadata(
@@ -715,6 +722,7 @@ class SheetDownloader:
         path_save: str | None = "maps",
         metadata_fname: str | None = "metadata.csv",
         overwrite: bool | None = False,
+        download_in_parallel: bool = True,
         **kwargs: dict | None,
     ) -> None:
         """
@@ -728,6 +736,8 @@ class SheetDownloader:
             Name to use for metadata file, by default "metadata.csv"
         overwrite : bool, optional
             Whether to overwrite existing maps, by default ``False``.
+        download_in_parallel : bool, optional
+            Whether to download tiles in parallel, by default ``True``.
         **kwargs : dict, optional
             Keyword arguments to pass to the ``_download_map_sheets()`` method.
         """
@@ -739,7 +749,12 @@ class SheetDownloader:
 
         features = self.features
         self._download_map_sheets(
-            features, path_save, metadata_fname, overwrite, **kwargs
+            features,
+            path_save,
+            metadata_fname,
+            overwrite,
+            download_in_parallel=download_in_parallel,
+            **kwargs,
         )
 
     def download_map_sheets_by_wfs_ids(
@@ -748,6 +763,7 @@ class SheetDownloader:
         path_save: str | None = "maps",
         metadata_fname: str | None = "metadata.csv",
         overwrite: bool | None = False,
+        download_in_parallel: bool = True,
         **kwargs: dict | None,
     ) -> None:
         """
@@ -763,6 +779,8 @@ class SheetDownloader:
             Name to use for metadata file, by default "metadata.csv"
         overwrite : bool, optional
             Whether to overwrite existing maps, by default ``False``.
+        download_in_parallel : bool, optional
+            Whether to download tiles in parallel, by default ``True``.
         **kwargs : dict, optional
             Keyword arguments to pass to the ``_download_map_sheets()`` method.
         """
@@ -794,7 +812,12 @@ class SheetDownloader:
                 features.append(feature)
 
         self._download_map_sheets(
-            features, path_save, metadata_fname, overwrite, **kwargs
+            features,
+            path_save,
+            metadata_fname,
+            overwrite,
+            download_in_parallel=download_in_parallel,
+            **kwargs,
         )
 
     def download_map_sheets_by_polygon(
@@ -804,6 +827,7 @@ class SheetDownloader:
         metadata_fname: str | None = "metadata.csv",
         mode: str | None = "within",
         overwrite: bool | None = False,
+        download_in_parallel: bool = True,
         **kwargs: dict | None,
     ) -> None:
         """
@@ -824,6 +848,8 @@ class SheetDownloader:
             By default "within".
         overwrite : bool, optional
             Whether to overwrite existing maps, by default ``False``.
+        download_in_parallel : bool, optional
+            Whether to download tiles in parallel, by default ``True``.
         **kwargs : dict, optional
             Keyword arguments to pass to the ``_download_map_sheets()`` method.
 
@@ -869,7 +895,12 @@ class SheetDownloader:
                     features.append(feature)
 
         self._download_map_sheets(
-            features, path_save, metadata_fname, overwrite, **kwargs
+            features,
+            path_save,
+            metadata_fname,
+            overwrite,
+            download_in_parallel=download_in_parallel,
+            **kwargs,
         )
 
     def download_map_sheets_by_coordinates(
@@ -878,6 +909,7 @@ class SheetDownloader:
         path_save: str | None = "maps",
         metadata_fname: str | None = "metadata.csv",
         overwrite: bool | None = False,
+        download_in_parallel: bool = True,
         **kwargs: dict | None,
     ) -> None:
         """
@@ -894,6 +926,8 @@ class SheetDownloader:
             Name to use for metadata file, by default "metadata.csv"
         overwrite : bool, optional
             Whether to overwrite existing maps, by default ``False``.
+        download_in_parallel : bool, optional
+            Whether to download tiles in parallel, by default ``True``.
         **kwargs : dict, optional
             Keyword arguments to pass to the ``_download_map_sheets()`` method.
         """
@@ -922,7 +956,12 @@ class SheetDownloader:
                 features.append(feature)
 
         self._download_map_sheets(
-            features, path_save, metadata_fname, overwrite, **kwargs
+            features,
+            path_save,
+            metadata_fname,
+            overwrite,
+            download_in_parallel=download_in_parallel,
+            **kwargs,
         )
 
     def download_map_sheets_by_line(
@@ -931,6 +970,7 @@ class SheetDownloader:
         path_save: str | None = "maps",
         metadata_fname: str | None = "metadata.csv",
         overwrite: bool | None = False,
+        download_in_parallel: bool = True,
         **kwargs: dict | None,
     ) -> None:
         """
@@ -946,6 +986,8 @@ class SheetDownloader:
             Name to use for metadata file, by default "metadata.csv"
         overwrite : bool, optional
             Whether to overwrite existing maps, by default ``False``
+        download_in_parallel : bool, optional
+            Whether to download tiles in parallel, by default ``True``.
         **kwargs : dict, optional
             Keyword arguments to pass to the ``_download_map_sheets()`` method.
 
@@ -980,7 +1022,12 @@ class SheetDownloader:
                 features.append(feature)
 
         self._download_map_sheets(
-            features, path_save, metadata_fname, overwrite, **kwargs
+            features,
+            path_save,
+            metadata_fname,
+            overwrite,
+            download_in_parallel=download_in_parallel,
+            **kwargs,
         )
 
     def download_map_sheets_by_string(
@@ -990,6 +1037,7 @@ class SheetDownloader:
         path_save: str | None = "maps",
         metadata_fname: str | None = "metadata.csv",
         overwrite: bool | None = False,
+        download_in_parallel: bool = True,
         **kwargs: dict | None,
     ) -> None:
         """
@@ -1013,6 +1061,8 @@ class SheetDownloader:
             Name to use for metadata file, by default "metadata.csv"
         overwrite : bool, optional
             Whether to overwrite existing maps, by default ``False``.
+        download_in_parallel : bool, optional
+            Whether to download tiles in parallel, by default ``True``.
         **kwargs : dict, optional
             Keyword arguments to pass to the ``_download_map_sheets()`` method.
 
@@ -1053,7 +1103,12 @@ class SheetDownloader:
                 features.append(feature)
 
         self._download_map_sheets(
-            features, path_save, metadata_fname, overwrite, **kwargs
+            features,
+            path_save,
+            metadata_fname,
+            overwrite,
+            download_in_parallel=download_in_parallel,
+            **kwargs,
         )
 
     def download_map_sheets_by_queries(
@@ -1061,6 +1116,7 @@ class SheetDownloader:
         path_save: str | None = "maps",
         metadata_fname: str | None = "metadata.csv",
         overwrite: bool | None = False,
+        download_in_parallel: bool = True,
         **kwargs: dict | None,
     ) -> None:
         """
@@ -1074,6 +1130,8 @@ class SheetDownloader:
             Name to use for metadata file, by default "metadata.csv"
         overwrite : bool, optional
             Whether to overwrite existing maps, by default ``False``.
+        download_in_parallel : bool, optional
+            Whether to download tiles in parallel, by default ``True``.
         **kwargs : dict, optional
             Keyword arguments to pass to the ``_download_map_sheets()`` method.
         """
@@ -1088,7 +1146,12 @@ class SheetDownloader:
 
         features = self.found_queries
         self._download_map_sheets(
-            features, path_save, metadata_fname, overwrite, **kwargs
+            features,
+            path_save,
+            metadata_fname,
+            overwrite,
+            download_in_parallel=download_in_parallel,
+            **kwargs,
         )
 
     def hist_published_dates(self, **kwargs) -> None:

{mapreader-1.1.4 → mapreader-1.2.0}/mapreader/load/geo_utils.py

@@ -59,17 +59,15 @@ def reproject_geo_info(image_path, target_crs="EPSG:4326", calc_size_in_m=False)
     tiff_shape, tiff_proj, tiff_coord = extractGeoInfo(image_path)
 
     # Coordinate transformation: proj1 ---> proj2
-    transformer = Transformer.from_crs(tiff_proj, target_crs)
-    ymin, xmin = transformer.transform(tiff_coord[0], tiff_coord[1])
-    ymax, xmax = transformer.transform(tiff_coord[2], tiff_coord[3])
-    coord = (xmin, ymin, xmax, ymax)
-
+    transformer = Transformer.from_crs(tiff_proj, target_crs, always_xy=True)
+    coord = transformer.transform_bounds(*tiff_coord)
     print(f"[INFO] New CRS: {target_crs}")
     print("[INFO] Reprojected coordinates: {:.4f} {:.4f} {:.4f} {:.4f}".format(*coord))
 
     height, width, _ = tiff_shape
 
     # Calculate the size of image in meters
+    xmin, ymin, xmax, ymax = coord
     if calc_size_in_m:
         if calc_size_in_m in ["geodesic", "gd"]:
             bottom = geodesic((ymin, xmin), (ymin, xmax)).meters

{mapreader-1.1.4 → mapreader-1.2.0}/mapreader/load/images.py

@@ -985,6 +985,7 @@ See https://pillow.readthedocs.io/en/stable/handbook/concepts.html#modes for mor
         tree_level: str | None = "parent",
         path_save: str | None = None,
         add_to_parents: bool | None = True,
+        square_cuts: bool | None = False,
         resize_factor: bool | None = False,
         output_format: str | None = "png",
         rewrite: bool | None = False,
@@ -1011,6 +1012,9 @@ See https://pillow.readthedocs.io/en/stable/handbook/concepts.html#modes for mor
         add_to_parents : bool, optional
             If True, patches will be added to the MapImages instance's
             ``images`` dictionary, by default ``True``.
+        square_cuts : bool, optional
+            If True, all patches will have the same number of pixels in
+            x and y, by default ``False``.
         resize_factor : bool, optional
             If True, resize the images before patchifying, by default ``False``.
         output_format : str, optional
@@ -1058,16 +1062,33 @@ See https://pillow.readthedocs.io/en/stable/handbook/concepts.html#modes for mor
                     original_patch_size / mean_pixel_height
                 )  ## check this is correct - should patch be different size in x and y?
 
-            self._patchify_by_pixel(
-                image_id=image_id,
-                patch_size=patch_size,
-                path_save=path_save,
-                add_to_parents=add_to_parents,
-                resize_factor=resize_factor,
-                output_format=output_format,
-                rewrite=rewrite,
-                verbose=verbose,
-            )
+            if square_cuts:
+                print(
+                    "[WARNING] Square cuts is deprecated as of version 1.1.3 and will soon be removed."
+                )
+
+                self._patchify_by_pixel_square(
+                    image_id=image_id,
+                    patch_size=patch_size,
+                    path_save=path_save,
+                    add_to_parents=add_to_parents,
+                    resize_factor=resize_factor,
+                    output_format=output_format,
+                    rewrite=rewrite,
+                    verbose=verbose,
+                )
+
+            else:
+                self._patchify_by_pixel(
+                    image_id=image_id,
+                    patch_size=patch_size,
+                    path_save=path_save,
+                    add_to_parents=add_to_parents,
+                    resize_factor=resize_factor,
+                    output_format=output_format,
+                    rewrite=rewrite,
+                    verbose=verbose,
+                )
 
     def _patchify_by_pixel(
         self,
@@ -1165,6 +1186,94 @@ See https://pillow.readthedocs.io/en/stable/handbook/concepts.html#modes for mor
                     self._add_patch_coords_id(patch_id)
                     self._add_patch_polygons_id(patch_id)
 
+    def _patchify_by_pixel_square(
+        self,
+        image_id: str,
+        patch_size: int,
+        path_save: str,
+        add_to_parents: bool | None = True,
+        resize_factor: bool | None = False,
+        output_format: str | None = "png",
+        rewrite: bool | None = False,
+        verbose: bool | None = False,
+    ):
+        """Patchify one image and (if ``add_to_parents=True``) add the patch to the MapImages instance's ``images`` dictionary.
+        Use square cuts for patches at edges.
+
+        Parameters
+        ----------
+        image_id : str
+            The ID of the image to patchify
+        patch_size : int
+            Number of pixels in both x and y to use for slicing
+        path_save : str
+            Directory to save the patches.
+        add_to_parents : bool, optional
+            If True, patches will be added to the MapImages instance's
+            ``images`` dictionary, by default ``True``.
+        resize_factor : bool, optional
+            If True, resize the images before patchifying, by default ``False``.
+        output_format : str, optional
+            Format to use when writing image files, by default ``"png"``.
+        rewrite : bool, optional
+            If True, existing patches will be rewritten, by default ``False``.
+        verbose : bool, optional
+            If True, progress updates will be printed throughout, by default
+            ``False``.
+        """
+        tree_level = self._get_tree_level(image_id)
+
+        parent_path = self.images[tree_level][image_id]["image_path"]
+        img = Image.open(parent_path)
+
+        if resize_factor:
+            original_height, original_width = img.height, img.width
+            img = img.resize(
+                (
+                    int(original_width / resize_factor),
+                    int(original_height / resize_factor),
+                )
+            )
+
+        height, width = img.height, img.width
+
+        for x in range(0, width, patch_size):
+            for y in range(0, height, patch_size):
+                max_x = min(x + patch_size, width)
+                max_y = min(y + patch_size, height)
+
+                # move min_x and min_y back a bit so the patch is square
+                min_x = x - (patch_size - (max_x - x))
+                min_y = y - (patch_size - (max_y - y))
+
+                patch_id = f"patch-{min_x}-{min_y}-{max_x}-{max_y}-#{image_id}#.{output_format}"
+                patch_path = os.path.join(path_save, patch_id)
+                patch_path = os.path.abspath(patch_path)
+
+                if os.path.isfile(patch_path) and not rewrite:
+                    self._print_if_verbose(
+                        f"[INFO] File already exists: {patch_path}.", verbose
+                    )
+
+                else:
+                    self._print_if_verbose(
+                        f'[INFO] Creating "{patch_id}". Number of pixels in x,y: {max_x - min_x},{max_y - min_y}.',
+                        verbose,
+                    )
+
+                    patch = img.crop((min_x, min_y, max_x, max_y))
+                    patch.save(patch_path, output_format)
+
+                if add_to_parents:
+                    self._images_constructor(
+                        image_path=patch_path,
+                        parent_path=parent_path,
+                        tree_level="patch",
+                        pixel_bounds=(min_x, min_y, max_x, max_y),
+                    )
+                    self._add_patch_coords_id(patch_id)
+                    self._add_patch_polygons_id(patch_id)
+
     def _add_patch_to_parent(self, patch_id: str) -> None:
         """
         Add patch to parent.
@@ -2108,15 +2217,8 @@ See https://pillow.readthedocs.io/en/stable/handbook/concepts.html#modes for mor
             tiff_proj = tiff_src.crs.to_string()
             # Coordinate transformation: proj1 ---> proj2
             # tiff is "lat, lon" instead of "x, y"
-            transformer = Transformer.from_crs(tiff_proj, target_crs)
-            ymin, xmin = transformer.transform(
-                tiff_src.bounds.left, tiff_src.bounds.bottom
-            )
-            ymax, xmax = transformer.transform(
-                tiff_src.bounds.right, tiff_src.bounds.top
-            )
-            # New projected coordinates
-            coords = (xmin, ymin, xmax, ymax)
+            transformer = Transformer.from_crs(tiff_proj, target_crs, always_xy=True)
+            coords = transformer.transform_bounds(*tiff_src.bounds)
             self.parents[image_id]["coordinates"] = coords
             self.parents[image_id]["crs"] = target_crs
 

{mapreader-1.1.4 → mapreader-1.2.0}/mapreader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapreader
-Version: 1.1.4
+Version: 1.2.0
 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
@@ -24,7 +24,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
-Requires-Python: >=3.7, <3.11
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib<4.0.0,>=3.5.0
@@ -37,8 +37,8 @@ Requires-Dist: Shapely<3.0.0,>=2.0.0
 Requires-Dist: nest-asyncio<2.0.0,>=1.5.1
 Requires-Dist: scikit-image>=0.18.3
 Requires-Dist: scikit-learn<2.0.0,>=1.0.1
-Requires-Dist: torch<2.0.0,>=1.10.0
-Requires-Dist: torchvision<0.12.1,>=0.11.1
+Requires-Dist: torch>=1.10.0
+Requires-Dist: torchvision<0.17.3,>=0.11.1
 Requires-Dist: jupyter<2.0.0,>=1.0.0
 Requires-Dist: ipykernel<7.0.0,>=6.5.1
 Requires-Dist: ipywidgets<9.0.0,>=8.0.0
@@ -55,13 +55,15 @@ Requires-Dist: tqdm<5.0.0
 Requires-Dist: torchinfo<2.0.0
 Requires-Dist: openpyxl<4.0.0
 Requires-Dist: geopandas<1.0.0
+Requires-Dist: pyogrio>=0.7.2
+Requires-Dist: cartopy>=0.22.0
 Provides-Extra: dev
-Requires-Dist: pytest<8.0.0; extra == "dev"
-Requires-Dist: pytest-cov<5.0.0,>=4.1.0; extra == "dev"
+Requires-Dist: pytest<9.0.0; extra == "dev"
+Requires-Dist: pytest-cov<6.0.0,>=4.1.0; extra == "dev"
 Requires-Dist: timm<1.0.0; extra == "dev"
 Requires-Dist: transformers<5.0.0; extra == "dev"
-Requires-Dist: black<24.0.0,>=23.7.0; extra == "dev"
-Requires-Dist: flake8<7.0.0,>=6.0.0; extra == "dev"
+Requires-Dist: black<25.0.0,>=23.7.0; extra == "dev"
+Requires-Dist: flake8<8.0.0,>=6.0.0; extra == "dev"
 
 <div align="center">
     <br>
@@ -132,7 +134,7 @@ The MapReader documentation can be found at https://mapreader.readthedocs.io/en/
 - Geospatial images (i.e. maps)
 - Non-geospatial images
 
- **Developers and contributors** may also want to refer to the [API documentation](https://mapreader.readthedocs.io/en/latest/api/index.html) and [Contribution guide](https://mapreader.readthedocs.io/en/latest/Contribution-guide.html) for guidance on how to contribute to the MapReader package.
+ **Developers and contributors** may also want to refer to the [API documentation](https://mapreader.readthedocs.io/en/latest/api/index.html) and [Contribution guide](https://mapreader.readthedocs.io/en/latest/Contribution-guide/Contribution-guide.html) for guidance on how to contribute to the MapReader package.
 
 **Join our Slack workspace!**
 Please fill out [this form](https://forms.gle/dXjECHZQkwrZ3Xpt9) to receive an invitation to the Slack workspace.

{mapreader-1.1.4 → mapreader-1.2.0}/mapreader.egg-info/requires.txt

@@ -8,8 +8,8 @@ Shapely<3.0.0,>=2.0.0
 nest-asyncio<2.0.0,>=1.5.1
 scikit-image>=0.18.3
 scikit-learn<2.0.0,>=1.0.1
-torch<2.0.0,>=1.10.0
-torchvision<0.12.1,>=0.11.1
+torch>=1.10.0
+torchvision<0.17.3,>=0.11.1
 jupyter<2.0.0,>=1.0.0
 ipykernel<7.0.0,>=6.5.1
 ipywidgets<9.0.0,>=8.0.0
@@ -26,11 +26,13 @@ tqdm<5.0.0
 torchinfo<2.0.0
 openpyxl<4.0.0
 geopandas<1.0.0
+pyogrio>=0.7.2
+cartopy>=0.22.0
 
 [dev]
-pytest<8.0.0
-pytest-cov<5.0.0,>=4.1.0
+pytest<9.0.0
+pytest-cov<6.0.0,>=4.1.0
 timm<1.0.0
 transformers<5.0.0
-black<24.0.0,>=23.7.0
-flake8<7.0.0,>=6.0.0
+black<25.0.0,>=23.7.0
+flake8<8.0.0,>=6.0.0

{mapreader-1.1.4 → mapreader-1.2.0}/setup.py

@@ -26,7 +26,7 @@ setuptools.setup(
     packages=setuptools.find_packages(),
     include_package_data=True,
     platforms="OS Independent",
-    python_requires=">=3.7, <3.11",
+    python_requires=">=3.9",
     install_requires=[
         "matplotlib>=3.5.0,<4.0.0",
         "numpy>=1.21.5,<2.0.0",
@@ -38,14 +38,13 @@ setuptools.setup(
         "nest-asyncio>=1.5.1,<2.0.0",
         "scikit-image>=0.18.3",
         "scikit-learn>=1.0.1,<2.0.0",
-        "torch>=1.10.0,<2.0.0",
-        "torchvision>=0.11.1,<0.12.1",
+        "torch>=1.10.0",
+        "torchvision>=0.11.1,<0.17.3",
         "jupyter>=1.0.0,<2.0.0",
         "ipykernel>=6.5.1,<7.0.0",
         "ipywidgets>=8.0.0,<9.0.0",
         "ipyannotate==0.1.0-beta.0",
         "Cython>=0.29.24,<0.30.0",
-        # "proj>=0.2.0,<0.3.0",
         "PyYAML>=6.0,<7.0",
         "tensorboard>=2.7.0,<3.0.0",
         "parhugin>=0.0.3,<0.0.4",
@@ -57,16 +56,18 @@ setuptools.setup(
         "torchinfo<2.0.0",
         "openpyxl<4.0.0",
         "geopandas<1.0.0",
+        "pyogrio>=0.7.2",
+        "cartopy>=0.22.0",
     ],
     extras_require={
         "dev": [
-            "pytest<8.0.0",
-            "pytest-cov>=4.1.0,<5.0.0",
+            "pytest<9.0.0",
+            "pytest-cov>=4.1.0,<6.0.0",
             "timm<1.0.0",
             "transformers<5.0.0",
-            "black>=23.7.0,<24.0.0",
-            "flake8>=6.0.0,<7.0.0",
-        ]
+            "black>=23.7.0,<25.0.0",
+            "flake8>=6.0.0,<8.0.0",
+        ],
     },
     classifiers=[
         "Development Status :: 3 - Alpha",