mapreader 1.0.7__tar.gz → 1.1.0__tar.gz

{mapreader-1.0.7 → mapreader-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapreader
-Version: 1.0.7
+Version: 1.1.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

{mapreader-1.0.7 → mapreader-1.1.0}/mapreader/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-12-12T16:49:22+0000",
+ "date": "2023-12-14T11:30:18+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "9ee0cdf877d82bcfefadfe64733f15957fbe37e4",
- "version": "1.0.7"
+ "full-revisionid": "8eda75e8ddc1b4d5bb22cc2fcf5ebc0954947d71",
+ "version": "1.1.0"
 }
 '''  # END VERSION_JSON
 

{mapreader-1.0.7 → mapreader-1.1.0}/mapreader/annotate/annotator.py

@@ -290,7 +290,6 @@ class Annotator(pd.DataFrame):
         self.buttons_per_row = kwargs.get("buttons_per_row", None)
         self._min_values = kwargs.get("min_values", {})
         self._max_values = kwargs.get("max_values", {})  # pixel_bounds = x0, y0, x1, y1
-        self._filter_for = kwargs.get("filter_for", {})
 
         self.patch_width, self.patch_height = self.get_patch_size()
 
@@ -475,14 +474,9 @@ class Annotator(pd.DataFrame):
             if row.label is not None:
                 return False
 
-            test = (
-                [row[col] >= min_value for col, min_value in self._min_values.items()]
-                + [row[col] <= max_value for col, max_value in self._max_values.items()]
-                + [
-                    row[col] == filter_for
-                    for col, filter_for in self._filter_for.items()
-                ]
-            )
+            test = [
+                row[col] >= min_value for col, min_value in self._min_values.items()
+            ] + [row[col] <= max_value for col, max_value in self._max_values.items()]
 
             if not all(test):
                 return False

{mapreader-1.0.7 → mapreader-1.1.0}/mapreader/load/geo_utils.py

@@ -70,36 +70,37 @@ def reproject_geo_info(image_path, target_crs="EPSG:4326", calc_size_in_m=False)
     height, width, _ = tiff_shape
 
     # Calculate the size of image in meters
-    if calc_size_in_m in ["geodesic", "gd"]:
-        bottom = geodesic((ymin, xmin), (ymin, xmax)).meters
-        right = geodesic((ymin, xmax), (ymax, xmax)).meters
-        top = geodesic((ymax, xmax), (ymax, xmin)).meters
-        left = geodesic((ymax, xmin), (ymin, xmin)).meters
-
-    elif calc_size_in_m in ["gc", "great-circle", "great_circle"]:
-        bottom = great_circle((ymin, xmin), (ymin, xmax)).meters
-        right = great_circle((ymin, xmax), (ymax, xmax)).meters
-        top = great_circle((ymax, xmax), (ymax, xmin)).meters
-        left = great_circle((ymax, xmin), (ymin, xmin)).meters
-
-    elif not calc_size_in_m:
-        size_in_m = False
-
-    else:
-        raise NotImplementedError(
-            f'[ERROR] ``calc_size_in_m`` must be one of "great-circle", "great_circle", "gc", "geodesic" or "gd", not: {calc_size_in_m}'
+    if calc_size_in_m:
+        if calc_size_in_m in ["geodesic", "gd"]:
+            bottom = geodesic((ymin, xmin), (ymin, xmax)).meters
+            right = geodesic((ymin, xmax), (ymax, xmax)).meters
+            top = geodesic((ymax, xmax), (ymax, xmin)).meters
+            left = geodesic((ymax, xmin), (ymin, xmin)).meters
+
+        elif calc_size_in_m in ["gc", "great-circle", "great_circle"]:
+            bottom = great_circle((ymin, xmin), (ymin, xmax)).meters
+            right = great_circle((ymin, xmax), (ymax, xmax)).meters
+            top = great_circle((ymax, xmax), (ymax, xmin)).meters
+            left = great_circle((ymax, xmin), (ymin, xmin)).meters
+
+        else:
+            raise NotImplementedError(
+                f'[ERROR] ``calc_size_in_m`` must be one of "great-circle", "great_circle", "gc", "geodesic" or "gd", not: {calc_size_in_m}'
+            )
+
+        size_in_m = (left, bottom, right, top)  # anticlockwise order
+
+        mean_pixel_height = np.mean([right / height, left / height])
+        mean_pixel_width = np.mean([bottom / width, top / width])
+
+        print(
+            f"[INFO] Size in meters of left/bottom/right/top: {left:.2f}/{bottom:.2f}/{right:.2f}/{top:.2f}"
         )
+        print(
+            f"Each pixel is ~{mean_pixel_height:.3f} X {mean_pixel_width:.3f} meters (height x width)."
+        )  # noqa
 
-    size_in_m = (left, bottom, right, top)  # anticlockwise order
-
-    mean_pixel_height = np.mean([right / height, left / height])
-    mean_pixel_width = np.mean([bottom / width, top / width])
-
-    print(
-        f"[INFO] Size in meters of left/bottom/right/top: {left:.2f}/{bottom:.2f}/{right:.2f}/{top:.2f}"
-    )
-    print(
-        f"Each pixel is ~{mean_pixel_height:.3f} X {mean_pixel_width:.3f} meters (height x width)."
-    )  # noqa
+    else:
+        size_in_m = None
 
     return tiff_shape, tiff_proj, target_crs, coord, size_in_m

{mapreader-1.0.7 → mapreader-1.1.0}/mapreader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapreader
-Version: 1.0.7
+Version: 1.1.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