Revert "Use TypedDict instead of regular Python dict for the GeoMetaD…

…ata" This reverts commit 847998e.
microsoft · Apr 20, 2022 · 801d09c · 801d09c
1 parent 847998e
commit 801d09c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/torchgeo/datasets/geo.py b/torchgeo/datasets/geo.py
@@ -9,7 +9,7 @@
 import os
 import re
 import sys
-from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, TypedDict, cast
+from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, cast
 
 import fiona
 import fiona.transform
@@ -37,13 +37,6 @@
 ImageFolder.__module__ = "torchvision.datasets"
 
 
-class GeoMetaData(TypedDict):
-    """A dictionary for metadata to be stored in the rtree index."""
-
-    filepath: str
-    crs: CRS
-
-
 class GeoDataset(Dataset[Dict[str, Any]], abc.ABC):
     """Abstract base class for datasets containing geospatial information.
 
@@ -375,9 +368,7 @@ def __init__(
 
                     coords = (minx, maxx, miny, maxy, mint, maxt)
                     self.index.insert(
-                        id=i,
-                        coordinates=coords,
-                        obj=GeoMetaData(filepath=filepath, crs=crs),
+                        id=i, coordinates=coords, obj=dict(filepath=filepath, crs=crs)
                     )
                     i += 1
 
@@ -566,9 +557,7 @@ def __init__(
                 maxt = sys.maxsize
                 coords = (minx, maxx, miny, maxy, mint, maxt)
                 self.index.insert(
-                    id=i,
-                    coordinates=coords,
-                    obj=GeoMetaData(filepath=filepath, crs=crs),
+                    id=i, coordinates=coords, obj=dict(filepath=filepath, crs=crs)
                 )
                 i += 1
 

diff --git a/torchgeo/datasets/openbuildings.py b/torchgeo/datasets/openbuildings.py
@@ -19,7 +19,7 @@
 from rasterio.crs import CRS
 from rtree.index import Index, Property
 
-from .geo import GeoMetaData, VectorDataset
+from .geo import VectorDataset
 from .utils import BoundingBox, check_integrity
 
 
@@ -281,7 +281,7 @@ def __init__(
             filepath = os.path.join(
                 self.root, feature["properties"]["tile_url"].split("/")[-1]
             )
-            self.index.insert(i, coords, GeoMetaData(filepath=filepath, crs=crs))
+            self.index.insert(i, coords, dict(filepath=filepath, crs=crs))
             i += 1
 
         if i == 0: