Optimise fromSegments funcs

locationtech · Jul 26, 2017 · a1ee681 · a1ee681
1 parent d952665
commit a1ee681
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/raster/src/main/scala/geotrellis/raster/io/geotiff/GeoTiffMultibandTile.scala b/raster/src/main/scala/geotrellis/raster/io/geotiff/GeoTiffMultibandTile.scala
@@ -441,8 +441,11 @@ abstract class GeoTiffMultibandTile(
   def toArrayTile(): ArrayMultibandTile =
     ArrayMultibandTile(bands.map(_.toArrayTile): _*)
 
+  /*def fromSegments(ids: Traversable[Int]): ArrayMultibandTile =
+    ArrayMultibandTile((0 until bandCount).map(i => band(i).fromSegments(ids)))*/
+
   def fromSegments(ids: Traversable[Int]): ArrayMultibandTile =
-    ArrayMultibandTile(bandsFromSegments(ids): _*)
+    ArrayMultibandTile(bandsFromSegments(ids).map(_.toArrayTile): _*)
 
   /**
    * Performs a crop on itself. The returned MultibandGeoTiffTile will

diff --git a/raster/src/main/scala/geotrellis/raster/io/geotiff/GeoTiffTile.scala b/raster/src/main/scala/geotrellis/raster/io/geotiff/GeoTiffTile.scala
@@ -529,6 +529,8 @@ abstract class GeoTiffTile(
   }
 
   def fromSegments(ids: Traversable[Int]): ArrayTile = {
+    val gb = ids.map(segmentLayout.getGridBounds(_)).reduce(_ combine _)
+    val (cols, rows) = gb.width -> gb.height
     val tile = ArrayTile.empty(cellType, cols, rows)
 
     getSegments(ids).foreach { case (segmentId, segment) =>