ArrayTile.{cols | rows} calls boxing fix

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Specialize Grid for Int and Long [#3428](https://github.com/locationtech/geotrellis/pull/3428)
 - Move GeoWave and GeoMesa subproject to their own repositories [#3439](https://github.com/locationtech/geotrellis/pull/3439)
 - Use JTS 1.18, GeoTools 25.0 [#3437](https://github.com/locationtech/geotrellis/pull/3437)
+- ArrayTile.{cols | rows} calls boxing fix [#3441](https://github.com/locationtech/geotrellis/pull/3441)
 
 ## [3.6.0] - 2021-04-30
 

bench/src/main/scala/geotrellis/raster/GridBoxingBench.scala

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2021 Azavea & Astraea, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package geotrellis.raster
+
+import org.openjdk.jmh.annotations._
+
+import java.util.concurrent.TimeUnit
+import scala.util.Random
+
+/** See issue https://github.com/locationtech/geotrellis/issues/3427 */
+@BenchmarkMode(Array(Mode.AverageTime))
+@State(Scope.Thread)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+class GridBoxingBench {
+  val size = 1024
+
+  @Param(Array("short", "int"))
+  var cellType: String = _
+
+  var tile: MutableArrayTile = _
+
+  @Setup(Level.Trial)
+  def setup(): Unit = {
+    tile = cellType match {
+      case "short" =>
+        ShortArrayTile(
+          1 to size * size map (_.toShort) toArray, size, size
+        )
+      case "int" =>
+        IntArrayTile(
+          1 to size * size toArray, size, size
+        )
+    }
+  }
+
+  var row: Int = _
+  var col: Int = _
+  var value: Int = _
+  @Setup(Level.Invocation)
+  def selectCell(): Unit = {
+    row = Random.nextInt(size)
+    col = Random.nextInt(size)
+    value = Random.nextInt()
+  }
+
+  @Benchmark
+  def setCell(): Tile = {
+    tile.set(row, col, value)
+    tile
+  }
+}

raster/src/main/scala/geotrellis/raster/ArrayTile.scala

@@ -24,6 +24,13 @@ import spire.syntax.cfor._
   * cases.
   */
 abstract class ArrayTile extends Tile with Serializable {
+  /**
+   * cols and rows are explicitly defined to help with the Grid[N].{cols | rows} specialized functions dispatch.
+   * See https://github.com/locationtech/geotrellis/issues/3427
+   */
+  def cols: Int
+
+  def rows: Int
 
   /**
     * Return the [[ArrayTile]] equivalent of this ArrayTile.

raster/src/main/scala/geotrellis/raster/ConstantTile.scala

@@ -28,6 +28,14 @@ import spire.syntax.cfor._
   */
 abstract class ConstantTile extends Tile {
 
+  /**
+   * cols and rows are explicitly defined to help with the Grid[N].{cols | rows} specialized functions dispatch.
+   * See https://github.com/locationtech/geotrellis/issues/3427
+   */
+  def cols: Int
+
+  def rows: Int
+
   /** Precomputed view of tile cells as seen by [[get]] method */
   protected val iVal: Int
 

raster/src/main/scala/geotrellis/raster/MutableArrayTile.scala

@@ -26,6 +26,14 @@ import spire.syntax.cfor._
 abstract class MutableArrayTile extends ArrayTile {
   def mutable = this
 
+  /**
+   * cols and rows are explicitly defined to help with the Grid[N].{cols | rows} specialized functions dispatch.
+   * See https://github.com/locationtech/geotrellis/issues/3427
+   */
+  def cols: Int
+
+  def rows: Int
+
   /**
     * Update the datum at the specified index.
     *

raster/src/main/scala/geotrellis/raster/Tile.scala

@@ -20,6 +20,14 @@ package geotrellis.raster
   * Base trait for a Tile.
   */
 abstract class Tile extends CellGrid[Int] with IterableTile with MappableTile[Tile] {
+  /**
+   * cols and rows are explicitly defined to help with the Grid[N].{cols | rows} specialized functions dispatch.
+   * See https://github.com/locationtech/geotrellis/issues/3427
+   */
+  def cols: Int
+
+  def rows: Int
+
   /**
     * Execute a function at each pixel of a [[Tile]].  Two functions
     * are given: an integer version which is used if the tile is an