Move Striped and Tiled IndexTransform to trait file

locationtech · Dec 12, 2016 · e79d2a7 · e79d2a7
1 parent feddbfb
commit e79d2a7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 32 deletions.
diff --git a/raster/src/main/scala/geotrellis/raster/io/geotiff/GridIndexTransform.scala b/raster/src/main/scala/geotrellis/raster/io/geotiff/GridIndexTransform.scala
@@ -51,3 +51,22 @@ trait GridIndexTransform {
 
   def gridToIndex(col: Int, row: Int): Int
 }
+
+
+case class StripedSegmentTransform(segmentIndex: Int, segmentLayout: GeoTiffSegmentLayout) extends GridIndexTransform {
+  def gridToIndex(col: Int, row: Int): Int = {
+    val tileCol = col - (layoutCol * tileCols)
+    val tileRow = row - (layoutRow * tileRows)
+    tileRow * segmentCols + tileCol
+  }
+}
+
+case class TiledSegmentTransform(segmentIndex: Int, segmentLayout: GeoTiffSegmentLayout) extends GridIndexTransform {
+  def gridToIndex(col: Int, row: Int): Int = {
+    val tileCol = col - (layoutCol * tileCols)
+    val tileRow = row - (layoutRow * tileRows)
+    tileRow * tileCols + tileCol
+  }
+}
+
+
diff --git a/raster/src/main/scala/geotrellis/raster/io/geotiff/StripedSegmentTransform.scala b/raster/src/main/scala/geotrellis/raster/io/geotiff/StripedSegmentTransform.scala
diff --git a/raster/src/main/scala/geotrellis/raster/io/geotiff/TiledSegmentTransform.scala b/raster/src/main/scala/geotrellis/raster/io/geotiff/TiledSegmentTransform.scala