All traits that inherit CellGrid and Grid should be abstract classes by pomadchin · Pull Request #3136 · locationtech/geotrellis

pomadchin · 2019-10-22T16:05:58Z

Overview

This PR makes Tile, ArrayTile and MultibandTile abstract classes. In our types hierarchy Tile types extend CellGrid and Grid. In 2.x both Tile and CellGrid were traits, and in 3.x CellGrid became an abstract class, so we had a not very usual case, where traits extended abstract classes. This is not possible in Java and creates problems on Spark, for more details looks into #3134

This is the idea suggested by @echeipesh and it is probably the best solution.

Checklist

docs/CHANGELOG.rst updated, if necessary

Demo

scala> :javap geotrellis.raster.Tile
  Size 11433 bytes
  MD5 checksum 973688ee6c0ddfd43788d33a6cee0989
  Compiled from "Tile.scala"
public abstract class geotrellis.raster.Tile extends geotrellis.raster.CellGrid<java.lang.Object> implements geotrellis.raster.IterableTile, geotrellis.raster.MappableTile<geotrellis.raster.Tile>

scala> classOf[geotrellis.raster.CellGrid[_]].isAssignableFrom(classOf[geotrellis.raster.Tile])
res0: Boolean = true

scala> classOf[geotrellis.raster.CellGrid[_]].isInstance(geotrellis.raster.IntConstantTile(1,2,3))
res1: Boolean = true

scala> classOf[geotrellis.raster.CellGrid[Int]].isAssignableFrom(classOf[geotrellis.raster.Tile])
res2: Boolean = true

Closes #3134

metasim

Wow... that's it?

Did you confirm that new Raster(tile, extent) works in Java?

pomadchin · 2019-10-22T16:27:35Z

@metasim yep:

raster > run
[info] Running RasterInstantiation 
[success] Total time: 3 s, completed Oct 22, 2019 12:27:02 PM

… names

metasim · 2019-10-22T16:39:19Z

I wonder if the following should preemptively converted to abstract classes:

geotrellis.raster.RasterRegion
geotrellis.raster.RasterSource
geotrellis.raster.MosaicRasterSource
geotrellis.raster.ProjectedRasterLike
geotrellis.raster.DelegatingTile
geotrellis.raster.ConstantTile
geotrellis.raster.MutableArrayTile

pomadchin · 2019-10-22T16:42:19Z

@metasim should be (was in progress)

metasim · 2019-10-22T19:15:33Z

Got some more feedback:

I think this should be the definition for ProjectedRasterLike:

trait ProjectedRasterLike  { _: CellGrid[Int] =>
  def crs: CRS
  def extent: Extent
}

pomadchin · 2019-10-22T19:17:40Z

@metasim do you want it to be a mixin?

metasim · 2019-10-22T19:19:55Z

In RF it's used as a means to show conformity among a few different types for operations that want, say just an Extent or CRS, etc.

Not sure if that qualifies as a mix-in, or just "shape compliance" like an old-style interface.

pomadchin · 2019-10-22T19:22:09Z

@metasim sweet, thanks for looking into it that hard 💯

pomadchin · 2019-10-22T19:25:56Z

@metasim do we even need this constrain? _: CellGrid[Int] =>

metasim · 2019-10-22T19:43:30Z

Yes, we need the constraint, because it forces cols and rows to exist. Could use structural types, but ick.

metasim · 2019-10-22T22:48:25Z

Maybe this instead?

trait ProjectedRasterLike {
  def crs: CRS
  def extent: Extent
  def cellType: CellType
  def cols: Int
  def rows: Int
}

pomadchin · 2019-10-23T12:56:03Z

@metasim will look into what is possible to do here

echeipesh · 2019-10-23T13:07:10Z

My vote is for

trait ProjectedRasterLike {
  def crs: CRS
  def extent: Extent
  def cellType: CellType
  def cols: Int
  def rows: Int
}

... version. Trait self typing is another of those weird scala features that isn't really necessary (?). Also proposed variation is more flexible since it doesn't mention CellGrid.

pomadchin · 2019-10-23T13:09:17Z

@echeipesh yep, my point was that we don't need _: CellGrid[Int] => since it doesnt expose functions that @metasim wants (this was discussed in a gitter channel)

echeipesh

Looks good, solves the problem. Wish we could just remove N from CellGrid but that is a tricky thing to do with time we have right now.

echeipesh · 2019-10-23T13:27:09Z

3.1.0 release

pomadchin · 2019-10-23T14:42:39Z

requesting the last quick look at the ProjectedRasterLike @metasim @echeipesh

…ow we would like to expose more similar functions

* Fix StreamingByteReader over-allocation past EOF * Add util project to CI tests

echeipesh · 2019-10-24T14:25:28Z

@pomadchin this looks good to me. Need changelog entry and version bump to 3.1.0

… names

…ow we would like to expose more similar functions

…into fix/tile-hierarchy

Make Tile, ArrayTile and MultibandTile abstract classes

2a16fa3

pomadchin requested review from echeipesh and metasim October 22, 2019 16:06

metasim approved these changes Oct 22, 2019

View reviewed changes

Add store and layer into the root project, sorted gdal and gdal-spark…

431b61f

… names

metasim self-requested a review October 22, 2019 16:39

All Grid and CellGrid children should not be traits

e271c82

pomadchin changed the title ~~Make Tile, ArrayTile and MultibandTile abstract classes~~ All CellGrid and Grid inherited traits should be abstract classes Oct 22, 2019

pomadchin changed the title ~~All CellGrid and Grid inherited traits should be abstract classes~~ All traits that inherit CellGrid and Grid should be abstract classes Oct 22, 2019

metasim approved these changes Oct 22, 2019

View reviewed changes

metasim self-requested a review October 22, 2019 19:14

Make ProjectedRasterLike trait back to allow mixins

1a2b414

echeipesh approved these changes Oct 23, 2019

View reviewed changes

Make ProjectedRasterLike independent since we can't inherit Grid[_] n…

d35bdf9

…ow we would like to expose more similar functions

pomadchin force-pushed the fix/tile-hierarchy branch from 1396f94 to d35bdf9 Compare October 23, 2019 14:46

Fix StreamingByteReader over-allocation past EOF (locationtech#3138)

49bb7e2

* Fix StreamingByteReader over-allocation past EOF * Add util project to CI tests

pomadchin and others added 7 commits October 24, 2019 11:11

Make Tile, ArrayTile and MultibandTile abstract classes

af44660

Add store and layer into the root project, sorted gdal and gdal-spark…

6d21c15

… names

All Grid and CellGrid children should not be traits

1fa1c0f

Make ProjectedRasterLike trait back to allow mixins

b314850

Make ProjectedRasterLike independent since we can't inherit Grid[_] n…

d76ef88

…ow we would like to expose more similar functions

Update Changelog [skip ci]

a351d77

Merge branch 'fix/tile-hierarchy' of github.com:pomadchin/geotrellis …

df934a3

…into fix/tile-hierarchy

echeipesh merged commit d15a758 into locationtech:master Oct 24, 2019

Conversation

pomadchin commented Oct 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Overview

Checklist

Demo

Uh oh!

metasim left a comment

Choose a reason for hiding this comment

Uh oh!

pomadchin commented Oct 22, 2019

Uh oh!

metasim commented Oct 22, 2019

Uh oh!

pomadchin commented Oct 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

metasim commented Oct 22, 2019

Uh oh!

pomadchin commented Oct 22, 2019

Uh oh!

metasim commented Oct 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pomadchin commented Oct 22, 2019

Uh oh!

pomadchin commented Oct 22, 2019

Uh oh!

metasim commented Oct 22, 2019

Uh oh!

metasim commented Oct 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pomadchin commented Oct 23, 2019

Uh oh!

echeipesh commented Oct 23, 2019

Uh oh!

pomadchin commented Oct 23, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

echeipesh left a comment

Choose a reason for hiding this comment

Uh oh!

echeipesh commented Oct 23, 2019

Uh oh!

pomadchin commented Oct 23, 2019

Uh oh!

echeipesh commented Oct 24, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

pomadchin commented Oct 22, 2019 •

edited

Loading

pomadchin commented Oct 22, 2019 •

edited

Loading

metasim commented Oct 22, 2019 •

edited

Loading

metasim commented Oct 22, 2019 •

edited

Loading

pomadchin commented Oct 23, 2019 •

edited

Loading