First addition of GeoTools 21.4 and JTS 1.17.

Problems so far:

- GML files are broken and don't compile
- Some Geotools libraries seem missing
- No model using GIS data can run

irit.gaml.extensions.database/src/msi/gama/database/CreateFromDatabaseDelegate.java

@@ -7,7 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 import msi.gama.common.interfaces.ICreateDelegate;
 import msi.gama.database.sql.SqlConnection;

irit.gaml.extensions.database/src/msi/gama/database/geosql/GamaSqlConnection.java

@@ -20,7 +20,7 @@
 import org.opengis.filter.Filter;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 import msi.gama.common.geometry.Envelope3D;
 import msi.gama.common.util.FileUtils;

irit.gaml.extensions.database/src/msi/gama/database/sql/MSSQLConnection.java

@@ -21,9 +21,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
 
 import msi.gama.metamodel.topology.projection.IProjection;
 import msi.gama.runtime.IScope;

irit.gaml.extensions.database/src/msi/gama/database/sql/MySqlConnection.java

@@ -21,9 +21,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
 
 import msi.gama.metamodel.topology.projection.IProjection;
 import msi.gama.runtime.IScope;

irit.gaml.extensions.database/src/msi/gama/database/sql/PostgresConnection.java

@@ -21,9 +21,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
 
 import msi.gama.metamodel.topology.projection.IProjection;
 import msi.gama.runtime.IScope;

irit.gaml.extensions.database/src/msi/gama/database/sql/SqlConnection.java

@@ -23,7 +23,7 @@
 
 import org.opengis.referencing.FactoryException;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 import msi.gama.common.geometry.Envelope3D;
 import msi.gama.common.preferences.GamaPreferences;

irit.gaml.extensions.database/src/msi/gama/database/sql/SqlUtils.java

@@ -17,9 +17,9 @@
 import java.io.InputStream;
 import java.util.Map;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKBReader;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKBReader;
 
 import msi.gama.common.preferences.GamaPreferences;
 import msi.gama.common.util.FileUtils;

irit.gaml.extensions.database/src/msi/gama/database/sql/SqliteConnection.java

@@ -24,9 +24,9 @@
 
 import org.sqlite.SQLiteConfig;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
 
 import msi.gama.metamodel.topology.projection.IProjection;
 import msi.gama.runtime.IScope;

msi.gama.core/META-INF/MANIFEST.MF

@@ -28,7 +28,7 @@ Export-Package: msi.gama.common,
    msi.gaml.commands,
    msi.gama.metamodel.shape,
    org.osgi.framework,
-   com.vividsolutions.jts.geom,
+   org.locationtech.jts.geom,
    msi.gaml.descriptions,
    msi.gama.metamodel.agent,
    msi.gama.runtime.exceptions",
@@ -49,7 +49,7 @@ Export-Package: msi.gama.common,
    msi.gama.metamodel.shape,
    org.osgi.framework,
    org.opengis.referencing.operation,
-   com.vividsolutions.jts.geom,
+   org.locationtech.jts.geom,
    msi.gama.runtime.exceptions",
  msi.gama.extensions.messaging,
  msi.gama.kernel.batch;
@@ -99,7 +99,7 @@ Export-Package: msi.gama.common,
    msi.gama.kernel.simulation,
    msi.gama.metamodel.population,
    msi.gama.metamodel.shape,
-   com.vividsolutions.jts.geom",
+   org.locationtech.jts.geom",
  msi.gama.metamodel.population;
   uses:="msi.gaml.variables,
    msi.gaml.expressions,
@@ -117,17 +117,17 @@ Export-Package: msi.gama.common,
    msi.gaml.descriptions,
    msi.gama.metamodel.agent",
  msi.gama.metamodel.shape;
-  uses:="com.vividsolutions.jts.geom.prep,
+  uses:="org.locationtech.jts.geom.prep,
    msi.gaml.expressions,
-   com.vividsolutions.jts.algorithm.distance,
+   org.locationtech.jts.algorithm.distance,
    msi.gama.runtime,
    msi.gama.util,
    msi.gaml.types,
    msi.gama.common.interfaces,
    org.opengis.feature.simple,
-   com.vividsolutions.jts.operation.distance,
-   com.vividsolutions.jts.geom,
-   com.vividsolutions.jts.algorithm,
+   org.locationtech.jts.operation.distance,
+   org.locationtech.jts.geom,
+   org.locationtech.jts.algorithm,
    msi.gama.metamodel.agent",
  msi.gama.metamodel.topology;
   uses:="msi.gaml.expressions,
@@ -138,15 +138,15 @@ Export-Package: msi.gama.common,
    msi.gama.common.interfaces,
    msi.gama.metamodel.population,
    msi.gama.metamodel.shape,
-   com.vividsolutions.jts.geom,
+   org.locationtech.jts.geom,
    msi.gaml.descriptions,
    msi.gama.metamodel.topology.filter,
    msi.gama.metamodel.agent",
  msi.gama.metamodel.topology.continuous;
   uses:="msi.gama.metamodel.population,
    msi.gama.metamodel.topology,
    msi.gama.runtime,
-   com.vividsolutions.jts.geom,
+   org.locationtech.jts.geom,
    msi.gama.metamodel.shape,
    msi.gama.util,
    msi.gama.metamodel.topology.filter,
@@ -174,7 +174,7 @@ Export-Package: msi.gama.common,
    msi.gama.util.matrix,
    msi.gama.metamodel.population,
    msi.gama.metamodel.shape,
-   com.vividsolutions.jts.geom,
+   org.locationtech.jts.geom,
    msi.gama.metamodel.topology.filter,
    msi.gama.metamodel.agent",
  msi.gama.metamodel.topology.projection,
@@ -227,7 +227,7 @@ Export-Package: msi.gama.common,
    msi.gama.common.interfaces,
    msi.gama.metamodel.topology.graph,
    msi.gama.metamodel.shape,
-   com.vividsolutions.jts.geom,
+   org.locationtech.jts.geom,
    msi.gama.metamodel.agent",
  msi.gama.util.file;
   uses:="msi.gama.runtime,
@@ -355,8 +355,8 @@ Export-Package: msi.gama.common,
    org.joda.time.format,
    msi.gama.util.file,
    msi.gama.metamodel.shape,
-   com.vividsolutions.jts.geom,
-   com.vividsolutions.jts.algorithm,
+   org.locationtech.jts.geom,
+   org.locationtech.jts.algorithm,
    msi.gama.metamodel.agent",
  msi.gaml.skills;
   uses:="org.graphstream.stream.file,

msi.gama.core/src/msi/gama/common/geometry/Envelope3D.java

@@ -10,11 +10,11 @@
  ********************************************************************************************************/
 package msi.gama.common.geometry;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.Polygon;
 
 import msi.gama.common.interfaces.IDisposable;
 import msi.gama.common.util.PoolUtils;

msi.gama.core/src/msi/gama/common/geometry/GamaCoordinateSequence.java

@@ -11,16 +11,16 @@
 package msi.gama.common.geometry;
 
 import static com.google.common.collect.Iterators.forArray;
-import static com.vividsolutions.jts.algorithm.CGAlgorithms.signedArea;
+import static org.locationtech.jts.algorithm.CGAlgorithms.signedArea;
 import static msi.gama.common.geometry.GamaGeometryFactory.isRing;
 
 import java.util.Arrays;
 import java.util.Iterator;
 
 import org.apache.commons.lang.ArrayUtils;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
 
 import msi.gama.metamodel.shape.GamaPoint;
 
@@ -91,7 +91,7 @@ public class GamaCoordinateSequence implements ICoordinates {
 	/**
 	 * Method getDimension(). Always 3 for these sequences
 	 *
-	 * @see com.vividsolutions.jts.geom.CoordinateSequence#getDimension()
+	 * @see org.locationtech.jts.geom.CoordinateSequence#getDimension()
 	 */
 	@Override
 	public int getDimension() {
@@ -102,9 +102,14 @@ public int getDimension() {
 	 * Makes a complete copy of this sequence (incl. cloning the points themselves)
 	 */
 	@Override
-	public final GamaCoordinateSequence clone() {
+	public final GamaCoordinateSequence copy() {
 		return new GamaCoordinateSequence(true, points);
 	}
+
+	@Deprecated
+	public GamaCoordinateSequence clone() {
+		return copy();
+	}
 
 	@Override
 	public String toString() {
@@ -115,7 +120,7 @@ public String toString() {
 	 * Method getCoordinate(). The coordinate is *not* a copy of the original one, so any modification to it will
 	 * directly affect the sequence of points
 	 *
-	 * @see com.vividsolutions.jts.geom.CoordinateSequence#getCoordinate(int)
+	 * @see org.locationtech.jts.geom.CoordinateSequence#getCoordinate(int)
 	 */
 	@Override
 	public GamaPoint getCoordinate(final int i) {
@@ -125,7 +130,7 @@ public GamaPoint getCoordinate(final int i) {
 	/**
 	 * Method getCoordinateCopy()
 	 *
-	 * @see com.vividsolutions.jts.geom.CoordinateSequence#getCoordinateCopy(int)
+	 * @see org.locationtech.jts.geom.CoordinateSequence#getCoordinateCopy(int)
 	 */
 	@Override
 	public GamaPoint getCoordinateCopy(final int i) {
@@ -135,7 +140,7 @@ public GamaPoint getCoordinateCopy(final int i) {
 	/**
 	 * Method getCoordinate()
 	 *
-	 * @see com.vividsolutions.jts.geom.CoordinateSequence#getCoordinate(int, com.vividsolutions.jts.geom.Coordinate)
+	 * @see org.locationtech.jts.geom.CoordinateSequence#getCoordinate(int, org.locationtech.jts.geom.Coordinate)
 	 */
 	@Override
 	public void getCoordinate(final int index, final Coordinate coord) {
@@ -145,7 +150,7 @@ public void getCoordinate(final int index, final Coordinate coord) {
 	/**
 	 * Method getX()
 	 *
-	 * @see com.vividsolutions.jts.geom.CoordinateSequence#getX(int)
+	 * @see org.locationtech.jts.geom.CoordinateSequence#getX(int)
 	 */
 	@Override
 	public double getX(final int index) {
@@ -155,7 +160,7 @@ public double getX(final int index) {
 	/**
 	 * Method getY()
 	 *
-	 * @see com.vividsolutions.jts.geom.CoordinateSequence#getY(int)
+	 * @see org.locationtech.jts.geom.CoordinateSequence#getY(int)
 	 */
 	@Override
 	public double getY(final int index) {
@@ -165,7 +170,7 @@ public double getY(final int index) {
 	/**
 	 * Method getOrdinate()
 	 *
-	 * @see com.vividsolutions.jts.geom.CoordinateSequence#getOrdinate(int, int)
+	 * @see org.locationtech.jts.geom.CoordinateSequence#getOrdinate(int, int)
 	 */
 	@Override
 	public double getOrdinate(final int index, final int ordinateIndex) {
@@ -175,7 +180,7 @@ public double getOrdinate(final int index, final int ordinateIndex) {
 	/**
 	 * Method size()
 	 *
-	 * @see com.vividsolutions.jts.geom.CoordinateSequence#size()
+	 * @see org.locationtech.jts.geom.CoordinateSequence#size()
 	 */
 	@Override
 	public int size() {
@@ -185,7 +190,7 @@ public int size() {
 	/**
 	 * Method setOrdinate(). Be aware that CW property is not maintained in case of direct modifications like this
 	 *
-	 * @see com.vividsolutions.jts.geom.CoordinateSequence#setOrdinate(int, int, double)
+	 * @see org.locationtech.jts.geom.CoordinateSequence#setOrdinate(int, int, double)
 	 */
 	@Override
 	public void setOrdinate(final int index, final int ordinateIndex, final double value) {
@@ -195,7 +200,7 @@ public void setOrdinate(final int index, final int ordinateIndex, final double v
 	/**
 	 * Method toCoordinateArray()
 	 *
-	 * @see com.vividsolutions.jts.geom.CoordinateSequence#toCoordinateArray()
+	 * @see org.locationtech.jts.geom.CoordinateSequence#toCoordinateArray()
 	 */
 	@Override
 	public GamaPoint[] toCoordinateArray() {
@@ -205,7 +210,7 @@ public GamaPoint[] toCoordinateArray() {
 	/**
 	 * Method expandEnvelope()
 	 *
-	 * @see com.vividsolutions.jts.geom.CoordinateSequence#expandEnvelope(com.vividsolutions.jts.geom.Envelope)
+	 * @see org.locationtech.jts.geom.CoordinateSequence#expandEnvelope(org.locationtech.jts.geom.Envelope)
 	 */
 	@Override
 	public Envelope expandEnvelope(final Envelope env) {

msi.gama.core/src/msi/gama/common/geometry/GamaCoordinateSequenceFactory.java

@@ -10,9 +10,9 @@
  ********************************************************************************************************/
 package msi.gama.common.geometry;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.CoordinateSequenceFactory;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateSequenceFactory;
 
 import msi.gama.metamodel.shape.GamaPoint;
 
@@ -21,7 +21,7 @@ public class GamaCoordinateSequenceFactory implements CoordinateSequenceFactory
 	/**
 	 * Method create()
 	 * 
-	 * @see com.vividsolutions.jts.geom.CoordinateSequenceFactory#create(com.vividsolutions.jts.geom.Coordinate[])
+	 * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(org.locationtech.jts.geom.Coordinate[])
 	 */
 	@Override
 	public ICoordinates create(final Coordinate[] coordinates) {
@@ -37,7 +37,7 @@ public ICoordinates create(final GamaPoint[] coordinates, final boolean copy) {
 	/**
 	 * Method create()
 	 * 
-	 * @see com.vividsolutions.jts.geom.CoordinateSequenceFactory#create(com.vividsolutions.jts.geom.CoordinateSequence)
+	 * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(org.locationtech.jts.geom.CoordinateSequence)
 	 */
 	@Override
 	public ICoordinates create(final CoordinateSequence coordSeq) {
@@ -49,7 +49,7 @@ public ICoordinates create(final CoordinateSequence coordSeq) {
 	/**
 	 * Method create()
 	 * 
-	 * @see com.vividsolutions.jts.geom.CoordinateSequenceFactory#create(int, int)
+	 * @see org.locationtech.jts.geom.CoordinateSequenceFactory#create(int, int)
 	 */
 	@Override
 	public ICoordinates create(final int size, final int dimension) {