mapreader 1.6.3.post0.dev12__tar.gz → 1.6.3.post0.dev18__tar.gz

{mapreader-1.6.3.post0.dev12 → mapreader-1.6.3.post0.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mapreader
-Version: 1.6.3.post0.dev12
+Version: 1.6.3.post0.dev18
 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
@@ -66,7 +66,7 @@ Provides-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: transformers!=4.50.0,<5.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"
 Dynamic: author
@@ -77,6 +77,7 @@ Dynamic: download-url
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: platform
 Dynamic: provides-extra
 Dynamic: requires-dist

{mapreader-1.6.3.post0.dev12 → mapreader-1.6.3.post0.dev18}/mapreader/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-03-19T13:41:18+0000",
+ "date": "2025-03-22T19:46:10+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "1c28f2da2d218d619592f573c2c4148a3a801fbb",
- "version": "1.6.3.post0.dev12"
+ "full-revisionid": "65e309226586e0ca4d1ae9babee54ab766803f2f",
+ "version": "1.6.3.post0.dev18"
 }
 '''  # END VERSION_JSON
 

{mapreader-1.6.3.post0.dev12 → mapreader-1.6.3.post0.dev18}/mapreader/spot_text/dataclasses.py

@@ -2,12 +2,13 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
-from shapely.geometry import Polygon
+from shapely.geometry import LineString, Polygon
 
 
 @dataclass(frozen=True)
 class PatchPrediction:
     pixel_geometry: Polygon
+    pixel_line: LineString
     score: float
     text: str = None
 
@@ -15,6 +16,7 @@ class PatchPrediction:
 @dataclass(frozen=True)
 class ParentPrediction:
     pixel_geometry: Polygon
+    pixel_line: LineString
     score: float
     patch_id: str
     text: str = None
@@ -23,8 +25,10 @@ class ParentPrediction:
 @dataclass(frozen=True)
 class GeoPrediction:
     pixel_geometry: Polygon
+    pixel_line: LineString
     score: float
     patch_id: str
     geometry: Polygon
+    line: LineString
     crs: str
     text: str = None

{mapreader-1.6.3.post0.dev12 → mapreader-1.6.3.post0.dev18}/mapreader/spot_text/dptext_detr_runner.py

@@ -124,5 +124,5 @@ class DPTextDETRRunner(DetRunner):
             score = f"{score:.2f}"
 
             self.patch_predictions[image_id].append(
-                PatchPrediction(pixel_geometry=polygon, score=score)
+                PatchPrediction(pixel_geometry=polygon, pixel_line=None, score=score)
             )

{mapreader-1.6.3.post0.dev12 → mapreader-1.6.3.post0.dev18}/mapreader/spot_text/runner_base.py

@@ -325,6 +325,7 @@ class DetRunner:
                 self.parent_predictions[parent_id] = []
 
             for instance in prediction:
+                # convert polygon
                 polygon = instance.pixel_geometry
 
                 xx, yy = (np.array(i) for i in polygon.exterior.xy)
@@ -332,9 +333,26 @@ class DetRunner:
                 yy = yy + self.patch_df.loc[image_id, "pixel_bounds"][1]  # add min_y
 
                 parent_polygon = Polygon(zip(xx, yy)).buffer(0)
+
+                # convert line
+                if instance.pixel_line is not None:
+                    line = instance.pixel_line
+                    xx, yy = (np.array(i) for i in line.xy)
+                    xx = (
+                        xx + self.patch_df.loc[image_id, "pixel_bounds"][0]
+                    )  # add min_x
+                    yy = (
+                        yy + self.patch_df.loc[image_id, "pixel_bounds"][1]
+                    )  # add min_y
+
+                    parent_line = LineString(zip(xx, yy))
+                else:
+                    parent_line = None
+
                 self.parent_predictions[parent_id].append(
                     ParentPrediction(
                         pixel_geometry=parent_polygon,
+                        pixel_line=parent_line,
                         score=instance.score,
                         text=instance.text,
                         patch_id=image_id,
@@ -446,6 +464,7 @@ class DetRunner:
                 self.geo_predictions[parent_id] = []
 
                 for instance in prediction:
+                    # convert polygon
                     polygon = instance.pixel_geometry
 
                     xx, yy = (np.array(i) for i in polygon.exterior.xy)
@@ -461,13 +480,32 @@ class DetRunner:
                     parent_polygon_geo = Polygon(zip(xx, yy)).buffer(0)
                     crs = self.parent_df.loc[parent_id, "crs"]
 
+                    # convert line
+                    if instance.pixel_line is not None:
+                        line = instance.pixel_line
+
+                        xx, yy = (np.array(i) for i in line.xy)
+                        xx = (
+                            xx * self.parent_df.loc[parent_id, "dlon"]
+                            + self.parent_df.loc[parent_id, "coordinates"][0]
+                        )
+                        yy = (
+                            self.parent_df.loc[parent_id, "coordinates"][3]
+                            - yy * self.parent_df.loc[parent_id, "dlat"]
+                        )
+                        parent_line_geo = LineString(zip(xx, yy))
+                    else:
+                        parent_line_geo = None
+
                     self.geo_predictions[parent_id].append(
                         GeoPrediction(
                             pixel_geometry=instance.pixel_geometry,
+                            pixel_line=instance.pixel_line,
                             score=instance.score,
                             text=instance.text,
                             patch_id=instance.patch_id,
                             geometry=parent_polygon_geo,
+                            line=parent_line_geo,
                             crs=crs,
                         )
                     )
@@ -711,6 +749,17 @@ class DetRunner:
             lambda x: from_wkt(x)
         )
 
+        # convert lines to shapely geometry
+        # if line and pixel_line are not in the columns, add them as None values
+        if "line" in preds_df.columns:
+            preds_df["line"] = preds_df["line"].apply(lambda x: from_wkt(x))
+        else:
+            preds_df["line"] = None
+        if "pixel_line" in preds_df.columns:
+            preds_df["pixel_line"] = preds_df["pixel_line"].apply(lambda x: from_wkt(x))
+        else:
+            preds_df["pixel_line"] = None
+
         self.geo_predictions = {}
         self.parent_predictions = {}
 
@@ -724,16 +773,19 @@ class DetRunner:
                 self.geo_predictions[image_id].append(
                     GeoPrediction(
                         pixel_geometry=v.pixel_geometry,
+                        pixel_line=v.pixel_line,
                         score=v.score,
                         text=v.text if "text" in v.index else None,
                         patch_id=v.patch_id,
                         geometry=v.geometry,
+                        line=v.line,
                         crs=v.crs,
                     )
                 )
                 self.parent_predictions[image_id].append(
                     ParentPrediction(
                         pixel_geometry=v.pixel_geometry,
+                        pixel_line=v.pixel_line,
                         score=v.score,
                         text=v.text if "text" in v.index else None,
                         patch_id=v.patch_id,
@@ -747,6 +799,7 @@ class DetRunner:
                 if instance.patch_id not in self.patch_predictions.keys():
                     self.patch_predictions[instance.patch_id] = []
 
+                # convert polygon
                 polygon = instance.pixel_geometry
 
                 xx, yy = (np.array(i) for i in polygon.exterior.xy)
@@ -756,11 +809,27 @@ class DetRunner:
                 yy = (
                     yy - self.patch_df.loc[instance.patch_id, "pixel_bounds"][1]
                 )  # add min_y
-
                 patch_polygon = Polygon(zip(xx, yy)).buffer(0)
+
+                # convert line
+                if instance.pixel_line is not None:
+                    line = instance.pixel_line
+
+                    xx, yy = (np.array(i) for i in line.xy)
+                    xx = (
+                        xx - self.patch_df.loc[instance.patch_id, "pixel_bounds"][0]
+                    )  # add min_x
+                    yy = (
+                        yy - self.patch_df.loc[instance.patch_id, "pixel_bounds"][1]
+                    )  # add min_y
+                    patch_line = LineString(zip(xx, yy))
+                else:
+                    patch_line = None
+
                 self.patch_predictions[instance.patch_id].append(
                     PatchPrediction(
                         pixel_geometry=patch_polygon,
+                        pixel_line=patch_line,
                         score=instance.score,
                         text=instance.text,
                     )
@@ -789,6 +858,15 @@ class DetRunner:
                 lambda x: from_wkt(x)
             )
 
+            # convert lines to shapely geometry
+            # if line and pixel_line are not in the columns, add them as None values
+            if "pixel_line" in patch_preds.columns:
+                patch_preds["pixel_line"] = patch_preds["pixel_line"].apply(
+                    lambda x: from_wkt(x)
+                )
+            else:
+                patch_preds["pixel_line"] = None
+
         self.patch_predictions = {}  # reset patch predictions
 
         for image_id in patch_preds["image_id"].unique():
@@ -796,9 +874,12 @@ class DetRunner:
                 self.patch_predictions[image_id] = []
 
             for _, v in patch_preds[patch_preds["image_id"] == image_id].iterrows():
+                if not hasattr(v, "pixel_line"):
+                    v.pixel_line = None
                 self.patch_predictions[image_id].append(
                     PatchPrediction(
                         pixel_geometry=v.pixel_geometry,
+                        pixel_line=v.pixel_line,
                         score=v.score,
                         text=v.text if "text" in v.index else None,
                     )
@@ -879,7 +960,9 @@ class DetRecRunner(DetRunner):
             score = f"{score:.2f}"
 
             self.patch_predictions[image_id].append(
-                PatchPrediction(pixel_geometry=polygon, score=score, text=text)
+                PatchPrediction(
+                    pixel_geometry=polygon, pixel_line=line, score=score, text=text
+                )
             )
 
     def search_predictions(
@@ -1009,6 +1092,7 @@ class DetRecRunner(DetRunner):
                 geo_search_results[parent_id] = []
 
                 for instance in prediction:
+                    # convert polygon
                     polygon = instance.pixel_geometry
 
                     xx, yy = (np.array(i) for i in polygon.exterior.xy)
@@ -1021,16 +1105,32 @@ class DetRecRunner(DetRunner):
                         - yy * self.parent_df.loc[parent_id, "dlat"]
                     )
 
+                    parent_polygon_geo = Polygon(zip(xx, yy)).buffer(0)
                     crs = self.parent_df.loc[parent_id, "crs"]
 
-                    parent_polygon_geo = Polygon(zip(xx, yy)).buffer(0)
+                    # convert line
+                    line = instance.pixel_line
+
+                    xx, yy = (np.array(i) for i in line.xy)
+                    xx = (
+                        xx * self.parent_df.loc[parent_id, "dlon"]
+                        + self.parent_df.loc[parent_id, "coordinates"][0]
+                    )
+                    yy = (
+                        self.parent_df.loc[parent_id, "coordinates"][3]
+                        - yy * self.parent_df.loc[parent_id, "dlat"]
+                    )
+                    parent_line_geo = LineString(zip(xx, yy))
+
                     geo_search_results[parent_id].append(
                         GeoPrediction(
                             pixel_geometry=instance.pixel_geometry,
+                            pixel_line=instance.pixel_line,
                             score=instance.score,
                             text=instance.score,
                             patch_id=instance.patch_id,
                             geometry=parent_polygon_geo,
+                            line=parent_line_geo,
                             crs=crs,
                         )
                     )

{mapreader-1.6.3.post0.dev12 → mapreader-1.6.3.post0.dev18}/mapreader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mapreader
-Version: 1.6.3.post0.dev12
+Version: 1.6.3.post0.dev18
 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
@@ -66,7 +66,7 @@ Provides-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: transformers!=4.50.0,<5.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"
 Dynamic: author
@@ -77,6 +77,7 @@ Dynamic: download-url
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: platform
 Dynamic: provides-extra
 Dynamic: requires-dist

{mapreader-1.6.3.post0.dev12 → mapreader-1.6.3.post0.dev18}/mapreader.egg-info/requires.txt

@@ -38,6 +38,6 @@ xyzservices==2024.9.0
 pytest<9.0.0
 pytest-cov<6.0.0,>=4.1.0
 timm<1.0.0
-transformers<5.0.0
+transformers!=4.50.0,<5.0.0
 black<25.0.0,>=23.7.0
 flake8<8.0.0,>=6.0.0

{mapreader-1.6.3.post0.dev12 → mapreader-1.6.3.post0.dev18}/setup.py

@@ -69,7 +69,7 @@ setuptools.setup(
             "pytest<9.0.0",
             "pytest-cov>=4.1.0,<6.0.0",
             "timm<1.0.0",
-            "transformers<5.0.0",
+            "transformers<5.0.0, !=4.50.0",
             "black>=23.7.0,<25.0.0",
             "flake8>=6.0.0,<8.0.0",
         ],