Skip to content

Commit aab5486

Browse files
committed
Landsat PDS is gone :(
1 parent d12ace5 commit aab5486

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

core/src/it/scala/org/locationtech/rasterframes/ref/RasterRefIT.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ class RasterRefIT extends TestEnvironment {
3232
describe("practical subregion reads") {
3333
it("should construct a natural color composite") {
3434
import spark.implicits._
35-
def scene(idx: Int) = URI.create(s"https://landsat-pds.s3.us-west-2.amazonaws.com" +
36-
s"/c1/L8/176/039/LC08_L1TP_176039_20190703_20190718_01_T1/LC08_L1TP_176039_20190703_20190718_01_T1_B$idx.TIF")
35+
def scene(idx: Int) = TestData.remoteCOGSingleBand(idx)
3736

3837
val redScene = RFRasterSource(scene(4))
3938
// [west, south, east, north]

core/src/test/scala/org/locationtech/rasterframes/TestData.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,15 @@ trait TestData {
143143
}
144144

145145
// Check the URL exists as of 2020-09-30; strictly these are not COGs because they do not have internal overviews
146-
private def remoteCOGSingleBand(b: Int) = URI.create(s"https://landsat-pds.s3.us-west-2.amazonaws.com/c1/L8/017/029/LC08_L1TP_017029_20200422_20200509_01_T1/LC08_L1TP_017029_20200422_20200509_01_T1_B${b}.TIF")
147-
lazy val remoteCOGSingleband1: URI = remoteCOGSingleBand(1)
148-
lazy val remoteCOGSingleband2: URI = remoteCOGSingleBand(2)
146+
def remoteCOGSingleBand(b: Int) = URI.create(s"https://geotrellis-test.s3.us-east-1.amazonaws.com/landsat/LC80030172015001LGN00_B${b}.tiff")
147+
lazy val remoteCOGSingleband1: URI = remoteCOGSingleBand(2)
148+
lazy val remoteCOGSingleband2: URI = remoteCOGSingleBand(3)
149149

150150
// a public 4 band COG TIF
151-
lazy val remoteCOGMultiband: URI = URI.create("https://s22s-rasterframes-integration-tests.s3.amazonaws.com/m_4411708_ne_11_1_20141005.cog.tif")
151+
lazy val remoteCOGMultiband: URI = URI.create("https://geotrellis-test.s3.us-east-1.amazonaws.com/landsat-multiband-band-cropped.tif")
152152

153153
lazy val remoteMODIS: URI = URI.create("https://modis-pds.s3.amazonaws.com/MCD43A4.006/31/11/2017158/MCD43A4.A2017158.h31v11.006.2017171203421_B01.TIF")
154-
lazy val remoteL8: URI = URI.create("https://landsat-pds.s3.amazonaws.com/c1/L8/017/033/LC08_L1TP_017033_20181010_20181030_01_T1/LC08_L1TP_017033_20181010_20181030_01_T1_B4.TIF")
154+
lazy val remoteL8: URI = URI.create("https://geotrellis-test.s3.us-east-1.amazonaws.com/landsat/LC80030172015001LGN00_B4.tiff")
155155
lazy val remoteHttpMrfPath: URI = URI.create("https://s3.amazonaws.com/s22s-rasterframes-integration-tests/m_3607526_sw_18_1_20160708.mrf")
156156
lazy val remoteS3MrfPath: URI = URI.create("s3://naip-analytic/va/2016/100cm/rgbir/37077/m_3707764_sw_18_1_20160708.mrf")
157157

datasource/src/it/scala/org/locationtech/rasterframes/datasource/raster/RaterSourceDataSourceIT.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ class RaterSourceDataSourceIT extends TestEnvironment with TestData {
3737
rf.select(rf_extent($"proj_raster").alias("extent"), rf_crs($"proj_raster").alias("crs"), rf_tile($"proj_raster").alias("target"))
3838

3939
val cat =
40-
"""
40+
s"""
4141
B3,B5
42-
https://landsat-pds.s3.us-west-2.amazonaws.com/c1/L8/021/028/LC08_L1TP_021028_20180515_20180604_01_T1/LC08_L1TP_021028_20180515_20180604_01_T1_B3.TIF,https://landsat-pds.s3.us-west-2.amazonaws.com/c1/L8/021/028/LC08_L1TP_021028_20180515_20180604_01_T1/LC08_L1TP_021028_20180515_20180604_01_T1_B5.TIF
42+
${remoteCOGSingleband1},${remoteCOGSingleband2}
4343
"""
4444

4545
val features_rf = spark.read.raster

0 commit comments

Comments
 (0)