From a54fabf5e0726969b981131674ebdda2048e726a Mon Sep 17 00:00:00 2001
From: Ashwin Nair <ash1995@gmail.com>
Date: Fri, 18 Mar 2022 04:39:57 +0400
Subject: [PATCH] SpaceNet2 update (#469)

---
 tests/data/spacenet/sn2_AOI_2_Vegas.tar.gz | Bin 1224 -> 1174 bytes
 tests/datasets/test_spacenet.py            |   2 +-
 torchgeo/datasets/spacenet.py              |  31 +--------------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/tests/data/spacenet/sn2_AOI_2_Vegas.tar.gz b/tests/data/spacenet/sn2_AOI_2_Vegas.tar.gz
index e36ec5360232e842b75e862aa837cc7721c154d8..fe01659fe2ef286bbfab4b318f112f4fbb5fd3a7 100644
GIT binary patch
literal 1174
zcmV;H1Zn#piwFP!000001MQqmY~w@}$Hz%kx}ietfn_B?GUk9lZSai0l1QxDtwdD`
zcB>jKE3r$I?YbdsY8S^9s+J=0A;JkbK*f;*S~$TjXC%0QIB`K-_Qa_|oH@V+G2=Mf
ziQCi(iHBzM{-epf*v~Vz$G?f^b<~DS%8M6P%A|bJsa6_KqZFi4S(d>{Y#AzFwuP`x
zux?>&Vd{r9Y+6V*(m0v8wi`jkmt|CGyz+X@?e3Sfe?--Y^*{S=pC{$3+qL?&np<s@
z1HV#pd7tvCJ-@bmu3X!!>ODO#z4bpPL?c8ssUOh{i$MR2(4hVQyqynf8^^c7I@mPz
zuKmyK&i>a;O!-$u+<-Cf|CN=e&=f6a5t6b<qE?1xiL*1*W*&EF&PLl=p5*LVX(BAY
zq#qAP+u1Rvxq2Rod=_YaggbVP+V|1&51Q?$t-ok~;GJodW%W>}x8I#clhl@}{dF^o
zWNNQc`&M&0totKs-)?5YV?UExS2hz%oswc{;Tij_>mTo*ZI?;+?X_>8d-<zhE`R^U
z-eaGfnLW3_*NfQoOfWlxq={(T6f5^<q^a9YcD0k?_YWRFHFc}W_TL|t2)(}<>^=Iq
z&+1#a`NE~e7ng0hpucgb{rLH3VksL--83lw)J_}%`sd%k8t^Yfz<(<}dHKU{^qW7P
zZI?;+4fwyyKedk^0FwAOH8ajXeFFskMW{Fa+4Iv2|L<}9vty3p{|q|Je<nH`J8J7U
zbin^UI^h2wbijX}<KN}@f3t)CQKFkC`FLuFr-AujJfAoLNaEix<NWIu(SUyuYV$vH
zEdNr=BawfX<DccD_-C#0{M($}X8vb%z&zu>&HQPO`HLL$8xiv-pK~c>`{Zaa{_%Xh
za@DCPgbn+P|EcWvU)5BI|A^3#`adl4RmXd^;T^h3iSK`h=6{xM!TX;O-N-4y&X%K;
zWaU|>5^Vd<l2@-g>p{(PmARa<?l<VZ8}eN*x3cLdbF#AKds~hl)SPI4xSj6b_T7?K
zT`yg8HcIs1(uL)v63%O-r8T>tEAp<qOKaU|HN_5nDaTbFox&0I@6t{5@!E6(f2Z?=
zR=xU8m7T1ttb3kMAKFULsyR&a7#n#_wG6Bm=VZ;yV@)%RB9+NLEcwb@hZiCJdRc@z
zu;&=Zz4#V;^Ws|!6TM%#E4kfVTKzvD|Eb0Q;qO0UG-&^)7XQ~_{1+jJ|3UnJ5dKq(
z{{#O*1pJRugs}Vh|Bw8q6aOc`zX(D6|0qHHzi0l_ivO#?zX(D6AL9T2oqsF6^`8dB
ze?(}|{!c6ZL*V^Sh+zKL8UOk8*WdU0iT`|OJn`@kV>|z|Qj7oSz`qay|D7|$zyCCT
z>gUZ7_)jPPqr?19h{h}abF%3kz4(unUi`-d{zd5CjQ^Zm&hN4K&k)ytcKrUU8pMBu
zXh{7(?De1Y0f6yegvN3GXQ4oJw#2enEa-aIm7P6%5fXZtMbdR;XU|@IizBf9Q%`UF
ohyVW|L__NT;gA0?{}-Zh9RFecKL`W@fyQ0`0y7}hK>$zy0AY2AXaE2J

literal 1224
zcmV;(1ULI1iwFP^5l~?O1MOQ)Y~w@}9w${Pp+fC}WhFo|;ebGG$oMyj#H!s&RFz=2
zYS4njE>Sk?hCpH$#}%rUBJm@_2{=H-kpo&d!7gVcxPUluL0mX-st{)ma6!Cr96E8E
zI>GU5yLsQpovHmiGnwb_d!EUpZ7Y@Ki)$67a>=S!+fR@LkO!Ei&T?w%l+Sx0RHKT<
z%+x%|Q<WMTk@X}x6UKJitGcpGs_mCvYuJPBqOPA(v_t-9|CcW)m8;v0=Cy`hZ&y6G
z+OT<>%6fTmWA%Kc(W;w6Juk!hUr`k$Z-AYm>ZXbQ7lF9`hw?M!oY&YqrVZv`0|-6H
z|E3=HzfLvae_q4@Ot}Bo)*dG_kk1n$rHKTk6dV#)PC=Pj{0c`pIM0r0t~@VI`S};{
z=f2=PyXOp7&;5bT5*!b5_ijM>F3A6Yqa3vL7aaG#JxkK89x!_AomnysWf{s}b<#wJ
z@;a1nc4qy$KZNqFPRhUcQ>pvO=0d3-QYbxk`Gc>u8$X=;`%nExmPd`-tKU5R;+H>P
z{_b1-(FeYtKflD+OW5a`V&xQ(rh;=bEZ?7#W^Q%Zr=9lyfB%uYXKr@b^?UrBkoQ{N
z-b0_ctiGii&pyBW+-g}aXs;h?KivORD5XPb5aRMblKkZV@Lw|&<i8Lg|GR1F$?}`8
ze6)Y=lV5({V|moLA^(H;zkDH50HXM>8%CJ_Y#M<47l0oB=Z@vS)U}A@zs>QV9Y^t>
zwZ`+m%$0kb|A`!MexDq0{tU<YOC0An1J0lPC@%TjJUJM{`#+SAmw+h#8)}&Ux}qt_
ze-Rii{<9}`nE3xL$A5OuQT#tk4#)pg(3^75)^FrM3mE@<TJR4!(1IMN1vaMzZ}i3g
z)AV-FNAlyN_V^Hw|1`PvAByWgA`sXANv;1tNI?A;0G$8zM~Ge?HEz8K@%i4vAD^Ar
z`5#Se{f8p|g#h{Azy8z9qs9&SAH@HJ)_)Y7{|UjJx&Cu<qxhY*{zDU6|55S#A0e2m
z^`Dcg3%%M;+4|37vwGEPMr<1!Y5y0@1%Ur~759G$LCp34vHG9W|GbL(zl2~+{`a$7
z-Ev-TJBJ1-GX5W$|APwX82?4!dM4}bY+2cooPElwdfTqG;xwC9&1*Pzb|I6kxox<1
zUH;F?uC}b~f}GuQoh{4t8dh-KKM&WpUAyGeYo%+}W(jUCU0hu$(VSXZ*(evZth_7l
zLam$Krr517WVp(ME*w$+E}VkLt7UoaPJf5io#sxRbym*S9LI%+w(50j_R}JzdQQ#5
z^QILSWYx$~wNOyBVzFoziv>-SuPpRgDaxo;isD-tMI~&-w>X>?-=d#jyfRlZyP2f?
zACLc9a{7<)UkJwJ|MBZTuKx(ZB<jDa>mair#Y}7mD*Mn@CR29y9MgfyKC~6z;%(9Y
zO3i7t9DA(40~&4q2X<65*!nN(fASdQ|E{hNQuNU<vi?(3(^S-d5kUP%{g3hfm)!m@
zeE%1Mxc*P<_kR@iUj%Uf$7%Y8XmI~;&;AcBx!?aG|AhegkNdx3#s8%Cf8qB(LV)|f
maQ|1#_y1(}f0@XC5y1UlM`3dIe<2Wv$;H2xjv)2`PyhgMl$`zm

diff --git a/tests/datasets/test_spacenet.py b/tests/datasets/test_spacenet.py
index 9ceff3afc74..35ce3cecf16 100644
--- a/tests/datasets/test_spacenet.py
+++ b/tests/datasets/test_spacenet.py
@@ -87,7 +87,7 @@ def dataset(
         radiant_mlhub = pytest.importorskip("radiant_mlhub", minversion="0.2.1")
         monkeypatch.setattr(radiant_mlhub.Collection, "fetch", fetch_collection)
         test_md5 = {
-            "sn2_AOI_2_Vegas": "b3236f58604a9d746c4e09b3e487e427",
+            "sn2_AOI_2_Vegas": "6ceae7ff8c557346e8a4c8b6c61cc1b9",
             "sn2_AOI_3_Paris": "811e6a26fdeb8be445fed99769fa52c5",
             "sn2_AOI_4_Shanghai": "139d1627d184c74426a85ad0222f7355",
             "sn2_AOI_5_Khartoum": "435535120414b74165aa87f051c3a2b3",
diff --git a/torchgeo/datasets/spacenet.py b/torchgeo/datasets/spacenet.py
index 32fb0983cee..5cf7d9fe5de 100644
--- a/torchgeo/datasets/spacenet.py
+++ b/torchgeo/datasets/spacenet.py
@@ -501,7 +501,7 @@ class SpaceNet2(SpaceNet):
 
     dataset_id = "spacenet2"
     collection_md5_dict = {
-        "sn2_AOI_2_Vegas": "cdc5df70920adca870a9fd0dfc4cca26",
+        "sn2_AOI_2_Vegas": "a5a8de355290783b88ac4d69c7ef0694",
         "sn2_AOI_3_Paris": "8299186b7bbfb9a256d515bad1b7f146",
         "sn2_AOI_4_Shanghai": "4e3e80f2f437faca10ca2e6e6df0ef99",
         "sn2_AOI_5_Khartoum": "8070ff9050f94cd9f0efe9417205d7c3",
@@ -553,35 +553,6 @@ def __init__(
             root, image, collections, transforms, download, api_key, checksum
         )
 
-    # TODO: Remove this once radiantearth/radiant-mlhub#65 is fixed
-    def _load_files(self, root: str) -> List[Dict[str, str]]:
-        """Return the paths of the files in the dataset.
-
-        Args:
-            root: root dir of dataset
-
-        Returns:
-            list of dicts containing paths for each pair of image and label
-        """
-        files = []
-        pat = re.compile("img1" + re.escape(os.sep))
-        for collection in self.collections:
-            images = glob.glob(os.path.join(root, collection, "*", self.filename))
-            images = sorted(images)
-            for imgpath in images:
-                if collection == "sn2_AOI_2_Vegas" and pat.search(imgpath):
-                    lbl_path = os.path.join(
-                        os.path.dirname(os.path.dirname(imgpath)),
-                        "_common",
-                        "labels.geojson",
-                    )
-                else:
-                    lbl_path = os.path.join(
-                        os.path.dirname(imgpath) + "-labels", self.label_glob
-                    )
-                files.append({"image_path": imgpath, "label_path": lbl_path})
-        return files
-
 
 class SpaceNet4(SpaceNet):
     """SpaceNet 4: Off-Nadir Buildings Dataset.