Bump GeoTools version up to 30.x-SNAPSHOT

Author: pomadchin

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Fix FileRangeReaderProvider parsing URI in windows [#3507](https://github.com/locationtech/geotrellis/pull/3507)
 - Regrid: force crop to avoid going out of memory [#3518](https://github.com/locationtech/geotrellis/pull/3518)
+- Bump GeoTools version up to 30.x [#3521](https://github.com/locationtech/geotrellis/pull/3521)
 
 ## [3.7.0] - 2023-02-26
 

geotools/src/main/scala/geotrellis/geotools/FeatureToSimpleFeatureMethods.scala

@@ -19,8 +19,7 @@ package geotrellis.geotools
 import geotrellis.proj4.CRS
 import geotrellis.util.MethodExtensions
 import geotrellis.vector._
-
-import org.opengis.feature.simple.SimpleFeature
+import org.geotools.api.feature.simple.SimpleFeature
 
 trait FeatureToSimpleFeatureMethods[G <: Geometry, T] extends MethodExtensions[Feature[G, T]] {
 

geotools/src/main/scala/geotrellis/geotools/GeometryToSimpleFeature.scala

@@ -18,9 +18,8 @@ package geotrellis.geotools
 
 import geotrellis.vector._
 import geotrellis.proj4.CRS
-
-import org.geotools.feature.simple.{SimpleFeatureTypeBuilder, SimpleFeatureBuilder}
-import org.opengis.feature.simple.SimpleFeature
+import org.geotools.api.feature.simple.SimpleFeature
+import org.geotools.feature.simple.{SimpleFeatureBuilder, SimpleFeatureTypeBuilder}
 
 object GeometryToSimpleFeature {
   val geometryField = "the_geom"

geotools/src/main/scala/geotrellis/geotools/GeometryToSimpleFeatureMethods.scala

@@ -20,7 +20,7 @@ import geotrellis.proj4._
 import geotrellis.util.MethodExtensions
 import geotrellis.vector._
 
-import org.opengis.feature.simple.SimpleFeature
+import org.geotools.api.feature.simple.SimpleFeature
 
 trait GeometryToSimpleFeatureMethods[G <: Geometry] extends MethodExtensions[G] {
 

geotools/src/main/scala/geotrellis/geotools/GridCoverage2DConverters.scala

@@ -20,17 +20,16 @@ import geotrellis.proj4.CRS
 import geotrellis.raster._
 import geotrellis.raster.io.geotiff.util._
 import geotrellis.vector.Extent
-
 import it.geosolutions.imageio.utilities.ImageIOUtilities
 import org.geotools.coverage.Category
 import org.geotools.coverage.GridSampleDimension
 import org.geotools.coverage.grid._
-import org.geotools.geometry.Envelope2D
 import org.geotools.referencing.{CRS => GeoToolsCRS}
 import org.geotools.coverage.util.CoverageUtilities
 import org.geotools.util.NumberRange
-import org.opengis.coverage.SampleDimensionType
-import org.opengis.referencing.crs.CoordinateReferenceSystem
+import org.geotools.geometry.jts.ReferencedEnvelope
+import org.geotools.api.coverage._
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem
 import spire.syntax.cfor._
 
 import java.awt.Color
@@ -198,18 +197,18 @@ object GridCoverage2DConverters {
   }
 
   /**
-    * A function to produce a GeoTools Envelope2D from a Geotrellis
+    * A function to produce a GeoTools ReferencedEnvelope from a Geotrellis
     * Extent and CRS.
     *
     * @param  extent  The Geotrellis Extent
     * @param  crs     The CRS of the raster
     *
-    * @return         A GeoTools Envelope2D
+    * @return         A GeoTools ReferencedEnvelope
     */
-  def getEnvelope2D(extent: Extent): Envelope2D = {
+  def getEnvelope2D(extent: Extent): ReferencedEnvelope = {
     val Extent(xmin, ymin, xmax, ymax) = extent
 
-    new Envelope2D(null, xmin, ymin, (xmax - xmin), (ymax - ymin))
+    ReferencedEnvelope.rect(xmin, ymin, xmax - xmin, ymax - ymin, null)
   }
 
   def getGeotoolsCRS(crs: CRS): CoordinateReferenceSystem = {
@@ -222,20 +221,20 @@ object GridCoverage2DConverters {
   }
 
   /**
-    * A function to produce a GeoTools Envelope2D from a Geotrellis
+    * A function to produce a GeoTools ReferencedEnvelope from a Geotrellis
     * Extent and CRS. If the CRS cannot be converted, a null GeoTools
     * CRS is used.
     *
     * @param  extent  The Geotrellis Extent
     * @param  crs     The CRS of the raster
     *
-    * @return         A GeoTools Envelope2D
+    * @return         A GeoTools ReferencedEnvelope
     */
-  def getEnvelope2D(extent: Extent, crs: CRS): Envelope2D = {
+  def getEnvelope2D(extent: Extent, crs: CRS): ReferencedEnvelope = {
     val Extent(xmin, ymin, xmax, ymax) = extent
     val geoToolsCRS = getGeotoolsCRS(crs)
 
-    new Envelope2D(geoToolsCRS, xmin, ymin, (xmax - xmin), (ymax - ymin))
+    ReferencedEnvelope.rect(xmin, ymin, xmax - xmin, ymax - ymin, geoToolsCRS)
   }
 
   def getValueRange(cellType: CellType): (Double, Double) =

geotools/src/main/scala/geotrellis/geotools/SimpleFeatureToFeature.scala

@@ -17,7 +17,7 @@
 package geotrellis.geotools
 
 import geotrellis.vector._
-import org.opengis.feature.simple.SimpleFeature
+import org.geotools.api.feature.simple.SimpleFeature
 
 import scala.collection._
 import scala.collection.JavaConverters._

geotools/src/main/scala/geotrellis/geotools/SimpleFeatureToFeatureMethods.scala

@@ -18,8 +18,7 @@ package geotrellis.geotools
 
 import geotrellis.util.MethodExtensions
 import geotrellis.vector._
-
-import org.opengis.feature.simple.SimpleFeature
+import org.geotools.api.feature.simple.SimpleFeature
 
 import scala.reflect.ClassTag
 

geotools/src/main/scala/geotrellis/geotools/SimpleFeatureToGeometryMethods.scala

@@ -19,7 +19,7 @@ package geotrellis.geotools
 import geotrellis.util.MethodExtensions
 import geotrellis.vector._
 
-import org.opengis.feature.simple.SimpleFeature
+import org.geotools.api.feature.simple.SimpleFeature
 
 import scala.reflect.ClassTag
 

geotools/src/main/scala/geotrellis/geotools/package.scala

@@ -20,8 +20,8 @@ import geotrellis.raster._
 import geotrellis.util.MethodExtensions
 import geotrellis.vector._
 
+import org.geotools.api.feature.simple.SimpleFeature
 import org.geotools.coverage.grid.GridCoverage2D
-import org.opengis.feature.simple.SimpleFeature
 
 package object geotools {
   implicit class withSinglebandRasterToGridCoverage2DMethods(val self: Raster[Tile]) extends MethodExtensions[Raster[Tile]]

project/Dependencies.scala

@@ -17,7 +17,7 @@
 import sbt._
 
 object Version {
-  val geotools    = "25.4"
+  val geotools    = "30-SNAPSHOT"
   val spire       = "0.17.0"
   val accumulo    = "1.10.3"
   val cassandra   = "4.15.0"