Upgrade to org.locationtech organization for JTS (bumps GT and Geom…

…esa versions)
geotrellis · jpolchlo · Mar 22, 2019 · Mar 1, 2019 · Mar 1, 2019 · Mar 1, 2019
commit bb64732ca6656075f3f72a5ecacbb008ff548cb4
diff --git a/project/Version.scala b/project/Version.scala
@@ -2,8 +2,8 @@ object Version {
   val awscala = "0.8.1"
   val vectorpipe = "1.0.0-RC1"
   val scala = "2.11.12"
-  val geotrellis = "2.1.0"
-  val geomesa = "2.1.2"
+  val geotrellis = "2.2.0"
+  val geomesa = "2.2.1"
   val decline = "0.6.1"
   val cats = "1.6.0"
   val scalactic = "3.0.6"

diff --git a/src/main/scala/vectorpipe/OSM.scala b/src/main/scala/vectorpipe/OSM.scala
@@ -2,7 +2,7 @@ package vectorpipe
 
 import java.sql.Timestamp
 
-import com.vividsolutions.jts.{geom => jts}
+import org.locationtech.jts.{geom => jts}
 import geotrellis.vector._
 import org.apache.log4j.Logger
 import org.apache.spark.sql._

diff --git a/src/main/scala/vectorpipe/internal/package.scala b/src/main/scala/vectorpipe/internal/package.scala
@@ -2,7 +2,7 @@ package vectorpipe
 
 import java.sql.Timestamp
 
-import com.vividsolutions.jts.{geom => jts}
+import org.locationtech.jts.{geom => jts}
 import geotrellis.vector._
 import org.apache.log4j.Logger
 import org.apache.spark.sql._

diff --git a/src/main/scala/vectorpipe/model/AugmentedDiff.scala b/src/main/scala/vectorpipe/model/AugmentedDiff.scala
@@ -2,7 +2,7 @@ package vectorpipe.model
 
 import java.sql.Timestamp
 
-import com.vividsolutions.jts.{geom => jts}
+import org.locationtech.jts.{geom => jts}
 import geotrellis.vector.{Feature, Geometry => GTGeometry}
 
 case class AugmentedDiff(sequence: Int,

diff --git a/src/main/scala/vectorpipe/relations/MultiPolygons.scala b/src/main/scala/vectorpipe/relations/MultiPolygons.scala
@@ -1,8 +1,8 @@
 package vectorpipe.relations
 import java.sql.Timestamp
 
-import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory
-import com.vividsolutions.jts.geom.{Geometry, LineString, Polygon, TopologyException}
+import org.locationtech.jts.geom.prep.PreparedGeometryFactory
+import org.locationtech.jts.geom.{Geometry, LineString, Polygon, TopologyException}
 import org.apache.log4j.Logger
 import vectorpipe.internal.WayType
 

diff --git a/src/main/scala/vectorpipe/relations/Routes.scala b/src/main/scala/vectorpipe/relations/Routes.scala
@@ -1,7 +1,7 @@
 package vectorpipe.relations
 import java.sql.Timestamp
 
-import com.vividsolutions.jts.geom.{Geometry, TopologyException}
+import org.locationtech.jts.geom.{Geometry, TopologyException}
 import org.apache.log4j.Logger
 import vectorpipe.internal.WayType
 

diff --git a/src/main/scala/vectorpipe/relations/package.scala b/src/main/scala/vectorpipe/relations/package.scala
@@ -1,6 +1,6 @@
 package vectorpipe
 
-import com.vividsolutions.jts.geom._
+import org.locationtech.jts.geom._
 import vectorpipe.relations.utils.{
   PartialCoordinateSequence,
   ReversedCoordinateSequence,

diff --git a/src/main/scala/vectorpipe/relations/utils/PartialCoordinateSequence.scala b/src/main/scala/vectorpipe/relations/utils/PartialCoordinateSequence.scala
@@ -1,5 +1,5 @@
 package vectorpipe.relations.utils
-import com.vividsolutions.jts.geom.{Coordinate, CoordinateSequence, Envelope}
+import org.locationtech.jts.geom.{Coordinate, CoordinateSequence, Envelope}
 
 class PartialCoordinateSequence(sequence: CoordinateSequence, offset: Int)
     extends CoordinateSequence {
@@ -47,4 +47,6 @@ class PartialCoordinateSequence(sequence: CoordinateSequence, offset: Int)
   override def size(): Int = _size
 
   override def clone(): AnyRef = new PartialCoordinateSequence(sequence, offset)
+
+  override def copy(): PartialCoordinateSequence = new PartialCoordinateSequence(sequence, offset)
 }
diff --git a/src/main/scala/vectorpipe/relations/utils/ReversedCoordinateSequence.scala b/src/main/scala/vectorpipe/relations/utils/ReversedCoordinateSequence.scala
@@ -1,5 +1,5 @@
 package vectorpipe.relations.utils
-import com.vividsolutions.jts.geom.{Coordinate, CoordinateSequence, Envelope}
+import org.locationtech.jts.geom.{Coordinate, CoordinateSequence, Envelope}
 
 class ReversedCoordinateSequence(sequence: CoordinateSequence) extends CoordinateSequence {
   private lazy val coordinates: Array[Coordinate] = {
@@ -40,4 +40,6 @@ class ReversedCoordinateSequence(sequence: CoordinateSequence) extends Coordinat
   override def expandEnvelope(env: Envelope): Envelope = sequence.expandEnvelope(env)
 
   override def clone(): AnyRef = new ReversedCoordinateSequence(sequence)
+
+  override def copy(): ReversedCoordinateSequence = new ReversedCoordinateSequence(sequence)
 }
diff --git a/src/main/scala/vectorpipe/relations/utils/VirtualCoordinateSequence.scala b/src/main/scala/vectorpipe/relations/utils/VirtualCoordinateSequence.scala
@@ -1,6 +1,6 @@
 package vectorpipe.relations.utils
 import com.google.common.collect.{Range, RangeMap, TreeRangeMap}
-import com.vividsolutions.jts.geom.{Coordinate, CoordinateSequence, Envelope}
+import org.locationtech.jts.geom.{Coordinate, CoordinateSequence, Envelope}
 
 // rather than being a nested set of CoordinateSequences, this is a mutable wrapper to avoid deep call stacks
 class VirtualCoordinateSequence(sequences: Seq[CoordinateSequence]) extends CoordinateSequence {
@@ -111,4 +111,6 @@ class VirtualCoordinateSequence(sequences: Seq[CoordinateSequence]) extends Coor
     // we're already playing fast and loose
     this
   }
+
+  override def copy(): VirtualCoordinateSequence = new VirtualCoordinateSequence(sequences)
 }
diff --git a/src/main/scala/vectorpipe/relations/utils/package.scala b/src/main/scala/vectorpipe/relations/utils/package.scala
@@ -1,5 +1,5 @@
 package vectorpipe.relations
-import com.vividsolutions.jts.geom.CoordinateSequence
+import org.locationtech.jts.geom.CoordinateSequence
 
 package object utils {
 

diff --git a/src/main/scala/vectorpipe/util/Geocode.scala b/src/main/scala/vectorpipe/util/Geocode.scala
@@ -1,6 +1,6 @@
 package vectorpipe.util
 
-import com.vividsolutions.jts.{geom => jts}
+import org.locationtech.jts.{geom => jts}
 import geotrellis.vector._
 import geotrellis.vector.io._
 import geotrellis.vector.io.json._
@@ -69,7 +69,7 @@ object Geocode {
         new Traversable[(geotrellis.vector.prepared.PreparedGeometry[geotrellis.vector.MultiPolygon], CountryId)] {
           override def foreach[U](f: ((geotrellis.vector.prepared.PreparedGeometry[geotrellis.vector.MultiPolygon],
             CountryId)) => U): Unit = {
-            val visitor = new com.vividsolutions.jts.index.ItemVisitor {
+            val visitor = new org.locationtech.jts.index.ItemVisitor {
               override def visitItem(obj: AnyRef): Unit = f(obj.asInstanceOf[(geotrellis.vector.prepared
               .PreparedGeometry[geotrellis.vector.MultiPolygon], CountryId)])
             }

diff --git a/src/test/scala/vectorpipe/MultiPolygonRelationReconstructionSpec.scala b/src/test/scala/vectorpipe/MultiPolygonRelationReconstructionSpec.scala
@@ -16,8 +16,8 @@ import vectorpipe.functions._
 import vectorpipe.functions.osm._
 import vectorpipe.internal.{VersionedElementEncoder, VersionedElementSchema}
 import vectorpipe.model.Member
-import com.vividsolutions.jts.{geom => jts}
-import com.vividsolutions.jts.io.WKTReader
+import org.locationtech.jts.{geom => jts}
+import org.locationtech.jts.io.WKTReader
 import org.locationtech.geomesa.spark.jts._
 import vectorpipe.relations.MultiPolygons.build