Merge pull request #549 from jbouffard/update/geotrellis-rc2

Updates for GeoTrellis 1.2.0-RC2

geopyspark-backend/geotrellis/build.sbt

@@ -2,6 +2,7 @@ name := "geotrellis-backend"
 
 resolvers ++= Seq(
   "Location Tech GeoTrellis Snapshots" at "https://repo.locationtech.org/content/repositories/geotrellis-snapshots",
+  "Location Tech GeoTrellis resleases" at "https://repo.locationtech.org/content/groups/releases",
   Resolver.mavenLocal
 )
 

geopyspark/tests/io_tests/catalog_test.py

@@ -4,7 +4,7 @@
 
 from shapely.geometry import box
 
-from geopyspark.geotrellis import Extent, SpatialKey, GlobalLayout
+from geopyspark.geotrellis import Extent, SpatialKey, GlobalLayout, LocalLayout
 from geopyspark.geotrellis.catalog import read_value, query, read_layer_metadata, AttributeStore
 from geopyspark.geotrellis.constants import LayerType
 from geopyspark.geotrellis.geotiff import get
@@ -16,7 +16,7 @@ class CatalogTest(BaseTestClass):
     rdd = get(LayerType.SPATIAL, geotiff_test_path("srtm_52_11.tif"), max_tile_size=6001)
 
     metadata = rdd.collect_metadata()
-    reprojected = rdd.tile_to_layout(layout=GlobalLayout(zoom=11), target_crs="EPSG:3857")
+    reprojected = rdd.tile_to_layout(layout=GlobalLayout(zoom=11), target_crs=3857)
     result = reprojected.pyramid()
 
     dir_path = geotiff_test_path("catalog/")
@@ -30,11 +30,15 @@ def tearDown(self):
 
     def test_read(self):
         for x in range(11, 0, -1):
-            actual_layer = query(self.uri, self.layer_name, x)
-            expected_layer = self.result.levels[x]
+            actual_layer = query(self.uri, self.layer_name, x).tile_to_layout(LocalLayout(), self.metadata.crs)
+            expected_layer = self.result.levels[x].tile_to_layout(LocalLayout(), self.metadata.crs)
 
-            self.assertDictEqual(actual_layer.layer_metadata.to_dict(),
-                                 expected_layer.layer_metadata.to_dict())
+            actual_md = actual_layer.layer_metadata
+            expected_md = expected_layer.layer_metadata
+
+            self.assertEqual(actual_md.tile_layout, expected_md.tile_layout)
+            self.assertEqual(actual_md.layout_definition, expected_md.layout_definition)
+            self.assertEqual(actual_md.bounds, expected_md.bounds)
 
     def test_read_value(self):
         tiled = read_value(self.uri,

geopyspark/tests/io_tests/hadoop_geotiff_rdd_test.py

@@ -51,13 +51,14 @@ def tearDown(self):
     def read_singleband_geotrellis(self, options=None):
         if options is None:
             result = get(LayerType.SPATIAL,
-                         self.dir_path)
+                         self.dir_path,
+                         max_tile_size=512)
         else:
             result = get(LayerType.SPATIAL,
                          self.dir_path,
                          max_tile_size=256)
 
-        return [tile[1] for tile in result.to_numpy_rdd().collect()]
+        return result.to_numpy_rdd().values().collect()
 
     def test_whole_tiles(self):
         geotrellis_tiles = self.read_singleband_geotrellis()
@@ -74,13 +75,16 @@ def windowed_result_checker(self, windowed_tiles):
 
     def test_windowed_tiles(self):
         geotrellis_tiles = self.read_singleband_geotrellis(True)
+        sorted_1 = sorted(geotrellis_tiles, key=lambda x: (x.cells[0, 0, 0], x.cells[0, 255, 255]))
 
         file_paths = self.get_filepaths(self.dir_path)
         rasterio_tiles = self.read_geotiff_rasterio(file_paths, True)
+        sorted_2 = sorted(rasterio_tiles, key=lambda x: (x['cells'][0, 0, 0], x['cells'][0, 255, 255]))
 
         self.windowed_result_checker(geotrellis_tiles)
 
-        for x, y in zip(geotrellis_tiles, rasterio_tiles):
+        for x, y in zip(sorted_1, sorted_2):
+            self.assertEqual(x.cells.shape, y['cells'].shape)
             self.assertTrue((x.cells == y['cells']).all())
             self.assertEqual(x.no_data_value, y['no_data_value'])
 

geopyspark/tests/io_tests/s3_geotiff_rdd_test.py

@@ -99,12 +99,15 @@ def windowed_result_checker(self, windowed_tiles):
 
     def test_windowed_tiles(self):
         geotrellis_tiles = self.read_multiband_geotrellis({"s3Client": "mock", "maxTileSize": 256})
-        geotrellis_tiles = [tile[1] for tile in geotrellis_tiles.to_numpy_rdd().collect()]
+        geotrellis_tiles = geotrellis_tiles.to_numpy_rdd().values().collect()
+        sorted_1 = sorted(geotrellis_tiles, key=lambda x: x.cells[0, 0, 0])
+
         rasterio_tiles = self.read_geotiff_rasterio([self.file_path], True)
+        sorted_2 = sorted(rasterio_tiles, key=lambda x: x['cells'][0, 0, 0])
 
         self.windowed_result_checker(geotrellis_tiles)
 
-        for x, y in zip(geotrellis_tiles, rasterio_tiles):
+        for x, y in zip(sorted_1, sorted_2):
             print('\n')
             print('This is read in from geotrellis', x.cells.shape)
             print('This is read in from rasterio', y['cells'].shape)