Skip to content

Commit 50cd637

Browse files
authored
Merge branch 'main' into oodxbd
2 parents d442682 + 1953f80 commit 50cd637

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

requirements/required.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rtree==1.4.0
1717
segmentation-models-pytorch==0.5.0
1818
shapely==2.0.7
1919
timm==1.0.15
20-
torch==2.6.0
20+
torch==2.7.0
2121
torchmetrics==1.7.1
22-
torchvision==0.21.0
22+
torchvision==0.22.0
2323
typing-extensions==4.13.2

torchgeo/datasets/geo.py

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ def crs(self) -> CRS:
10671067
Returns:
10681068
The :term:`coordinate reference system (CRS)`.
10691069
"""
1070-
return self._crs
1070+
return self.datasets[0].crs
10711071

10721072
@crs.setter
10731073
def crs(self, new_crs: CRS) -> None:
@@ -1076,7 +1076,6 @@ def crs(self, new_crs: CRS) -> None:
10761076
Args:
10771077
new_crs: New :term:`coordinate reference system (CRS)`.
10781078
"""
1079-
self._crs = new_crs
10801079
self.datasets[0].crs = new_crs
10811080
self.datasets[1].crs = new_crs
10821081

@@ -1087,7 +1086,7 @@ def res(self) -> tuple[float, float]:
10871086
Returns:
10881087
Resolution of both datasets.
10891088
"""
1090-
return self._res
1089+
return self.datasets[0].res
10911090

10921091
@res.setter
10931092
def res(self, new_res: float | tuple[float, float]) -> None:
@@ -1096,12 +1095,8 @@ def res(self, new_res: float | tuple[float, float]) -> None:
10961095
Args:
10971096
new_res: New resolution.
10981097
"""
1099-
if isinstance(new_res, int | float):
1100-
new_res = (new_res, new_res)
1101-
1102-
self._res = new_res
1103-
self.datasets[0].res = new_res
1104-
self.datasets[1].res = new_res
1098+
self.datasets[0].res = new_res # type: ignore[assignment]
1099+
self.datasets[1].res = new_res # type: ignore[assignment]
11051100

11061101

11071102
class UnionDataset(GeoDataset):
@@ -1225,7 +1220,7 @@ def crs(self) -> CRS:
12251220
Returns:
12261221
The :term:`coordinate reference system (CRS)`.
12271222
"""
1228-
return self._crs
1223+
return self.datasets[0].crs
12291224

12301225
@crs.setter
12311226
def crs(self, new_crs: CRS) -> None:
@@ -1234,7 +1229,6 @@ def crs(self, new_crs: CRS) -> None:
12341229
Args:
12351230
new_crs: New :term:`coordinate reference system (CRS)`.
12361231
"""
1237-
self._crs = new_crs
12381232
self.datasets[0].crs = new_crs
12391233
self.datasets[1].crs = new_crs
12401234

@@ -1245,7 +1239,7 @@ def res(self) -> tuple[float, float]:
12451239
Returns:
12461240
The resolution of both datasets.
12471241
"""
1248-
return self._res
1242+
return self.datasets[0].res
12491243

12501244
@res.setter
12511245
def res(self, new_res: float | tuple[float, float]) -> None:
@@ -1254,9 +1248,5 @@ def res(self, new_res: float | tuple[float, float]) -> None:
12541248
Args:
12551249
new_res: New resolution.
12561250
"""
1257-
if isinstance(new_res, int | float):
1258-
new_res = (new_res, new_res)
1259-
1260-
self._res = new_res
1261-
self.datasets[0].res = new_res
1262-
self.datasets[1].res = new_res
1251+
self.datasets[0].res = new_res # type: ignore[assignment]
1252+
self.datasets[1].res = new_res # type: ignore[assignment]

0 commit comments

Comments
 (0)