diff --git a/irit.gaml.extensions.database/src/msi/gama/database/CreateFromDatabaseDelegate.java b/irit.gaml.extensions.database/src/msi/gama/database/CreateFromDatabaseDelegate.java index c61f058b36..406edd200c 100644 --- a/irit.gaml.extensions.database/src/msi/gama/database/CreateFromDatabaseDelegate.java +++ b/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; diff --git a/irit.gaml.extensions.database/src/msi/gama/database/geosql/GamaSqlConnection.java b/irit.gaml.extensions.database/src/msi/gama/database/geosql/GamaSqlConnection.java index 0bfb571913..da6160fb15 100644 --- a/irit.gaml.extensions.database/src/msi/gama/database/geosql/GamaSqlConnection.java +++ b/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; diff --git a/irit.gaml.extensions.database/src/msi/gama/database/sql/MSSQLConnection.java b/irit.gaml.extensions.database/src/msi/gama/database/sql/MSSQLConnection.java index 799bd9d95f..a80f65c594 100644 --- a/irit.gaml.extensions.database/src/msi/gama/database/sql/MSSQLConnection.java +++ b/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; diff --git a/irit.gaml.extensions.database/src/msi/gama/database/sql/MySqlConnection.java b/irit.gaml.extensions.database/src/msi/gama/database/sql/MySqlConnection.java index 7d168eb403..97a6e1e414 100644 --- a/irit.gaml.extensions.database/src/msi/gama/database/sql/MySqlConnection.java +++ b/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; diff --git a/irit.gaml.extensions.database/src/msi/gama/database/sql/PostgresConnection.java b/irit.gaml.extensions.database/src/msi/gama/database/sql/PostgresConnection.java index f34d2b9fa2..ca1b326545 100644 --- a/irit.gaml.extensions.database/src/msi/gama/database/sql/PostgresConnection.java +++ b/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; diff --git a/irit.gaml.extensions.database/src/msi/gama/database/sql/SqlConnection.java b/irit.gaml.extensions.database/src/msi/gama/database/sql/SqlConnection.java index eb0016d4b3..b66feb323f 100644 --- a/irit.gaml.extensions.database/src/msi/gama/database/sql/SqlConnection.java +++ b/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; diff --git a/irit.gaml.extensions.database/src/msi/gama/database/sql/SqlUtils.java b/irit.gaml.extensions.database/src/msi/gama/database/sql/SqlUtils.java index 1e2d078fad..950b2d8d6f 100644 --- a/irit.gaml.extensions.database/src/msi/gama/database/sql/SqlUtils.java +++ b/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; diff --git a/irit.gaml.extensions.database/src/msi/gama/database/sql/SqliteConnection.java b/irit.gaml.extensions.database/src/msi/gama/database/sql/SqliteConnection.java index 1791411864..4e2b5ee70e 100644 --- a/irit.gaml.extensions.database/src/msi/gama/database/sql/SqliteConnection.java +++ b/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; diff --git a/msi.gama.core/META-INF/MANIFEST.MF b/msi.gama.core/META-INF/MANIFEST.MF index 48825992ba..8147f9da03 100644 --- a/msi.gama.core/META-INF/MANIFEST.MF +++ b/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,7 +138,7 @@ 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", @@ -146,7 +146,7 @@ Export-Package: msi.gama.common, 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, diff --git a/msi.gama.core/src/msi/gama/common/geometry/Envelope3D.java b/msi.gama.core/src/msi/gama/common/geometry/Envelope3D.java index f1f7a91bbb..d61cfdf8d9 100644 --- a/msi.gama.core/src/msi/gama/common/geometry/Envelope3D.java +++ b/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; diff --git a/msi.gama.core/src/msi/gama/common/geometry/GamaCoordinateSequence.java b/msi.gama.core/src/msi/gama/common/geometry/GamaCoordinateSequence.java index f6271f2749..45c999b2a0 100644 --- a/msi.gama.core/src/msi/gama/common/geometry/GamaCoordinateSequence.java +++ b/msi.gama.core/src/msi/gama/common/geometry/GamaCoordinateSequence.java @@ -11,7 +11,7 @@ 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; @@ -19,8 +19,8 @@ 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) { diff --git a/msi.gama.core/src/msi/gama/common/geometry/GamaCoordinateSequenceFactory.java b/msi.gama.core/src/msi/gama/common/geometry/GamaCoordinateSequenceFactory.java index c500cc7134..325fecaba7 100644 --- a/msi.gama.core/src/msi/gama/common/geometry/GamaCoordinateSequenceFactory.java +++ b/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) { diff --git a/msi.gama.core/src/msi/gama/common/geometry/GamaGeometryFactory.java b/msi.gama.core/src/msi/gama/common/geometry/GamaGeometryFactory.java index b2217029bc..c64db8eabe 100644 --- a/msi.gama.core/src/msi/gama/common/geometry/GamaGeometryFactory.java +++ b/msi.gama.core/src/msi/gama/common/geometry/GamaGeometryFactory.java @@ -14,14 +14,14 @@ import org.apache.commons.lang.ArrayUtils; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.CoordinateSequence; -import com.vividsolutions.jts.geom.CoordinateSequenceFactory; -import com.vividsolutions.jts.geom.GeometryFactory; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.LinearRing; -import com.vividsolutions.jts.geom.Polygon; -import com.vividsolutions.jts.geom.impl.CoordinateArraySequenceFactory; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.CoordinateSequence; +import org.locationtech.jts.geom.CoordinateSequenceFactory; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.LinearRing; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.geom.impl.CoordinateArraySequenceFactory; import msi.gama.metamodel.shape.GamaPoint; diff --git a/msi.gama.core/src/msi/gama/common/geometry/GeometryUtils.java b/msi.gama.core/src/msi/gama/common/geometry/GeometryUtils.java index 3d17ca900c..c6e69cdceb 100644 --- a/msi.gama.core/src/msi/gama/common/geometry/GeometryUtils.java +++ b/msi.gama.core/src/msi/gama/common/geometry/GeometryUtils.java @@ -10,7 +10,7 @@ ********************************************************************************************************/ package msi.gama.common.geometry; -import static com.vividsolutions.jts.algorithm.CGAlgorithms.distancePointLine; +import static org.locationtech.jts.algorithm.CGAlgorithms.distancePointLine; import static msi.gama.metamodel.shape.IShape.Type.LINESTRING; import static msi.gama.metamodel.shape.IShape.Type.MULTILINESTRING; import static msi.gama.metamodel.shape.IShape.Type.MULTIPOINT; @@ -27,31 +27,31 @@ import org.geotools.geometry.jts.JTS; -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.GeometryFilter; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.LinearRing; -import com.vividsolutions.jts.geom.MultiLineString; -import com.vividsolutions.jts.geom.MultiPoint; -import com.vividsolutions.jts.geom.MultiPolygon; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.geom.Polygon; -import com.vividsolutions.jts.geom.PrecisionModel; -import com.vividsolutions.jts.geom.impl.CoordinateArraySequence; -import com.vividsolutions.jts.geom.prep.PreparedGeometry; -import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory; -import com.vividsolutions.jts.io.WKTWriter; -import com.vividsolutions.jts.operation.buffer.BufferParameters; -import com.vividsolutions.jts.precision.GeometryPrecisionReducer; -import com.vividsolutions.jts.simplify.DouglasPeuckerSimplifier; -import com.vividsolutions.jts.triangulate.ConformingDelaunayTriangulationBuilder; -import com.vividsolutions.jts.triangulate.ConstraintEnforcementException; -import com.vividsolutions.jts.triangulate.DelaunayTriangulationBuilder; -import com.vividsolutions.jts.triangulate.VoronoiDiagramBuilder; -import com.vividsolutions.jts.triangulate.quadedge.LocateFailureException; +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.GeometryFilter; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.LinearRing; +import org.locationtech.jts.geom.MultiLineString; +import org.locationtech.jts.geom.MultiPoint; +import org.locationtech.jts.geom.MultiPolygon; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.geom.PrecisionModel; +import org.locationtech.jts.geom.impl.CoordinateArraySequence; +import org.locationtech.jts.geom.prep.PreparedGeometry; +import org.locationtech.jts.geom.prep.PreparedGeometryFactory; +import org.locationtech.jts.io.WKTWriter; +import org.locationtech.jts.operation.buffer.BufferParameters; +import org.locationtech.jts.precision.GeometryPrecisionReducer; +import org.locationtech.jts.simplify.DouglasPeuckerSimplifier; +import org.locationtech.jts.triangulate.ConformingDelaunayTriangulationBuilder; +import org.locationtech.jts.triangulate.ConstraintEnforcementException; +import org.locationtech.jts.triangulate.DelaunayTriangulationBuilder; +import org.locationtech.jts.triangulate.VoronoiDiagramBuilder; +import org.locationtech.jts.triangulate.quadedge.LocateFailureException; import msi.gama.common.interfaces.IEnvelopeComputer; import msi.gama.common.util.RandomUtils; diff --git a/msi.gama.core/src/msi/gama/common/geometry/ICoordinates.java b/msi.gama.core/src/msi/gama/common/geometry/ICoordinates.java index b97d60b7a1..fcd581931b 100644 --- a/msi.gama.core/src/msi/gama/common/geometry/ICoordinates.java +++ b/msi.gama.core/src/msi/gama/common/geometry/ICoordinates.java @@ -10,7 +10,7 @@ ********************************************************************************************************/ package msi.gama.common.geometry; -import com.vividsolutions.jts.geom.CoordinateSequence; +import org.locationtech.jts.geom.CoordinateSequence; import msi.gama.metamodel.shape.GamaPoint; @@ -62,6 +62,11 @@ default void getCenter(final GamaPoint center) { center.setLocation(0, 0, 0); addCenterTo(center); } + + @Deprecated + default CoordinateSequence clone() { + return copy(); + } /** * Computes the center of this sequence of points and fills the parameter with its ordinates diff --git a/msi.gama.core/src/msi/gama/common/geometry/Rotation3D.java b/msi.gama.core/src/msi/gama/common/geometry/Rotation3D.java index c975531346..d71ed76609 100644 --- a/msi.gama.core/src/msi/gama/common/geometry/Rotation3D.java +++ b/msi.gama.core/src/msi/gama/common/geometry/Rotation3D.java @@ -13,7 +13,7 @@ import java.io.Serializable; -import com.vividsolutions.jts.geom.Coordinate; +import org.locationtech.jts.geom.Coordinate; import msi.gama.metamodel.shape.GamaPoint; diff --git a/msi.gama.core/src/msi/gama/common/geometry/Scaling3D.java b/msi.gama.core/src/msi/gama/common/geometry/Scaling3D.java index c24177208c..2d5d3e40d2 100644 --- a/msi.gama.core/src/msi/gama/common/geometry/Scaling3D.java +++ b/msi.gama.core/src/msi/gama/common/geometry/Scaling3D.java @@ -10,7 +10,7 @@ ********************************************************************************************************/ package msi.gama.common.geometry; -import com.vividsolutions.jts.geom.Coordinate; +import org.locationtech.jts.geom.Coordinate; import msi.gama.metamodel.shape.GamaPoint; import msi.gama.metamodel.shape.ILocation; diff --git a/msi.gama.core/src/msi/gama/common/geometry/Transformation3D.java b/msi.gama.core/src/msi/gama/common/geometry/Transformation3D.java index 6600a75707..0e40636f46 100644 --- a/msi.gama.core/src/msi/gama/common/geometry/Transformation3D.java +++ b/msi.gama.core/src/msi/gama/common/geometry/Transformation3D.java @@ -10,7 +10,7 @@ ********************************************************************************************************/ package msi.gama.common.geometry; -import com.vividsolutions.jts.geom.CoordinateFilter; +import org.locationtech.jts.geom.CoordinateFilter; import msi.gama.metamodel.shape.GamaPoint; diff --git a/msi.gama.core/src/msi/gama/common/geometry/UnboundedCoordinateSequence.java b/msi.gama.core/src/msi/gama/common/geometry/UnboundedCoordinateSequence.java index 22387b595a..5e582350ef 100644 --- a/msi.gama.core/src/msi/gama/common/geometry/UnboundedCoordinateSequence.java +++ b/msi.gama.core/src/msi/gama/common/geometry/UnboundedCoordinateSequence.java @@ -16,8 +16,8 @@ import java.util.Arrays; import java.util.Iterator; -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; @@ -67,10 +67,15 @@ public int getDimension() { } @Override - public final UnboundedCoordinateSequence clone() { + public final UnboundedCoordinateSequence copy() { return new UnboundedCoordinateSequence(true, nbPoints, points); } + @Deprecated + public UnboundedCoordinateSequence clone() { + return copy(); + } + @Override public Coordinate getCoordinateCopy(final int i) { return points[i].clone(); diff --git a/msi.gama.core/src/msi/gama/common/geometry/UniqueCoordinateSequence.java b/msi.gama.core/src/msi/gama/common/geometry/UniqueCoordinateSequence.java index 60c93f7cc7..df06ba1b2a 100644 --- a/msi.gama.core/src/msi/gama/common/geometry/UniqueCoordinateSequence.java +++ b/msi.gama.core/src/msi/gama/common/geometry/UniqueCoordinateSequence.java @@ -13,8 +13,8 @@ import java.util.Iterator; import com.google.common.collect.Iterators; -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; @@ -107,9 +107,15 @@ public ICoordinates yNegated() { } @Override - public final ICoordinates clone() { + public final UniqueCoordinateSequence copy() { return new UniqueCoordinateSequence(new GamaPoint(point)); } + + @Deprecated + public UniqueCoordinateSequence clone() { + return copy(); + } + @Override public void visit(final IndexedVisitor v, final int max, final boolean reversed) { diff --git a/msi.gama.core/src/msi/gama/common/interfaces/IDisplaySurface.java b/msi.gama.core/src/msi/gama/common/interfaces/IDisplaySurface.java index 4248eccbef..a6e7a41f3b 100644 --- a/msi.gama.core/src/msi/gama/common/interfaces/IDisplaySurface.java +++ b/msi.gama.core/src/msi/gama/common/interfaces/IDisplaySurface.java @@ -15,7 +15,7 @@ import java.awt.image.BufferedImage; import java.util.Collection; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.geometry.Envelope3D; // import msi.gama.common.interfaces.IDisplaySurface.IZoomListener; diff --git a/msi.gama.core/src/msi/gama/common/interfaces/IGraphics.java b/msi.gama.core/src/msi/gama/common/interfaces/IGraphics.java index 4fe97a4351..ddcbb829af 100644 --- a/msi.gama.core/src/msi/gama/common/interfaces/IGraphics.java +++ b/msi.gama.core/src/msi/gama/common/interfaces/IGraphics.java @@ -15,8 +15,8 @@ import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; -import com.vividsolutions.jts.geom.Envelope; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; import msi.gama.metamodel.shape.ILocation; import msi.gama.outputs.layers.OverlayLayer; diff --git a/msi.gama.core/src/msi/gama/kernel/experiment/ExperimentParameter.java b/msi.gama.core/src/msi/gama/kernel/experiment/ExperimentParameter.java index a7c1dbbb5b..05c37ab36a 100644 --- a/msi.gama.core/src/msi/gama/kernel/experiment/ExperimentParameter.java +++ b/msi.gama.core/src/msi/gama/kernel/experiment/ExperimentParameter.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Set; -import com.vividsolutions.jts.util.NumberUtil; +import org.locationtech.jts.util.NumberUtil; import msi.gama.common.interfaces.IKeyword; import msi.gama.common.util.StringUtils; diff --git a/msi.gama.core/src/msi/gama/kernel/simulation/SimulationAgent.java b/msi.gama.core/src/msi/gama/kernel/simulation/SimulationAgent.java index 1ef831291e..daa85ab44c 100644 --- a/msi.gama.core/src/msi/gama/kernel/simulation/SimulationAgent.java +++ b/msi.gama.core/src/msi/gama/kernel/simulation/SimulationAgent.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Map.Entry; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.interfaces.IKeyword; diff --git a/msi.gama.core/src/msi/gama/metamodel/agent/AbstractAgent.java b/msi.gama.core/src/msi/gama/metamodel/agent/AbstractAgent.java index a2697f5401..9fe2bce950 100644 --- a/msi.gama.core/src/msi/gama/metamodel/agent/AbstractAgent.java +++ b/msi.gama.core/src/msi/gama/metamodel/agent/AbstractAgent.java @@ -15,7 +15,7 @@ import java.util.Map.Entry; import com.google.common.primitives.Ints; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.interfaces.BiConsumerWithPruning; @@ -149,7 +149,7 @@ public boolean crosses(final IShape g) { } /** - * @see msi.gama.common.interfaces.IGeometry#setInnerGeometry(com.vividsolutions.jts.geom.Geometry) + * @see msi.gama.common.interfaces.IGeometry#setInnerGeometry(org.locationtech.jts.geom.Geometry) */ @Override public void setInnerGeometry(final Geometry geom) { diff --git a/msi.gama.core/src/msi/gama/metamodel/agent/MinimalAgent.java b/msi.gama.core/src/msi/gama/metamodel/agent/MinimalAgent.java index 7c257c9d1f..13e45d757f 100644 --- a/msi.gama.core/src/msi/gama/metamodel/agent/MinimalAgent.java +++ b/msi.gama.core/src/msi/gama/metamodel/agent/MinimalAgent.java @@ -13,7 +13,7 @@ import java.util.Objects; import java.util.Set; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.interfaces.IKeyword; diff --git a/msi.gama.core/src/msi/gama/metamodel/shape/DynamicLineString.java b/msi.gama.core/src/msi/gama/metamodel/shape/DynamicLineString.java index ee0b9a9dce..089dc7028e 100644 --- a/msi.gama.core/src/msi/gama/metamodel/shape/DynamicLineString.java +++ b/msi.gama.core/src/msi/gama/metamodel/shape/DynamicLineString.java @@ -12,18 +12,18 @@ import java.util.Objects; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.CoordinateFilter; -import com.vividsolutions.jts.geom.CoordinateSequence; -import com.vividsolutions.jts.geom.CoordinateSequenceComparator; -import com.vividsolutions.jts.geom.CoordinateSequenceFilter; -import com.vividsolutions.jts.geom.Envelope; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.GeometryComponentFilter; -import com.vividsolutions.jts.geom.GeometryFactory; -import com.vividsolutions.jts.geom.GeometryFilter; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.Point; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.CoordinateFilter; +import org.locationtech.jts.geom.CoordinateSequence; +import org.locationtech.jts.geom.CoordinateSequenceComparator; +import org.locationtech.jts.geom.CoordinateSequenceFilter; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryComponentFilter; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.GeometryFilter; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.Point; import msi.gama.common.geometry.GeometryUtils; @@ -72,7 +72,7 @@ public DynamicLineString(final GeometryFactory factory, final IShape source, fin /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#getGeometryType() + * @see org.locationtech.jts.geom.Geometry#getGeometryType() */ @Override public String getGeometryType() { @@ -82,7 +82,7 @@ public String getGeometryType() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#getCoordinate() + * @see org.locationtech.jts.geom.Geometry#getCoordinate() */ @Override public Coordinate getCoordinate() { @@ -92,7 +92,7 @@ public Coordinate getCoordinate() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#getCoordinates() + * @see org.locationtech.jts.geom.Geometry#getCoordinates() */ @Override public Coordinate[] getCoordinates() { @@ -108,7 +108,7 @@ public CoordinateSequence getCoordinateSequence() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#getNumPoints() + * @see org.locationtech.jts.geom.Geometry#getNumPoints() */ @Override public int getNumPoints() { @@ -118,7 +118,7 @@ public int getNumPoints() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#isEmpty() + * @see org.locationtech.jts.geom.Geometry#isEmpty() */ @Override public boolean isEmpty() { @@ -128,7 +128,7 @@ public boolean isEmpty() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#getDimension() + * @see org.locationtech.jts.geom.Geometry#getDimension() */ @Override public int getDimension() { @@ -138,7 +138,7 @@ public int getDimension() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#getBoundary() + * @see org.locationtech.jts.geom.Geometry#getBoundary() */ @Override public Geometry getBoundary() { @@ -158,7 +158,7 @@ public Point getEndPoint() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#getBoundaryDimension() + * @see org.locationtech.jts.geom.Geometry#getBoundaryDimension() */ @Override public int getBoundaryDimension() { @@ -168,17 +168,17 @@ public int getBoundaryDimension() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#reverse() + * @see org.locationtech.jts.geom.Geometry#reverse() */ @Override - public Geometry reverse() { + public LineString reverse() { return new DynamicLineString(getFactory(), target, source); } /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#equalsExact(com.vividsolutions.jts. geom.Geometry, double) + * @see org.locationtech.jts.geom.Geometry#equalsExact(org.locationtech.jts. geom.Geometry, double) */ @Override public boolean equalsExact(final Geometry other, final double tolerance) { @@ -198,7 +198,7 @@ public int hashCode() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#apply(com.vividsolutions.jts.geom. CoordinateFilter) + * @see org.locationtech.jts.geom.Geometry#apply(org.locationtech.jts.geom. CoordinateFilter) */ @Override public void apply(final CoordinateFilter filter) { @@ -209,7 +209,7 @@ public void apply(final CoordinateFilter filter) { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#apply(com.vividsolutions.jts.geom. CoordinateSequenceFilter) + * @see org.locationtech.jts.geom.Geometry#apply(org.locationtech.jts.geom. CoordinateSequenceFilter) */ @Override public void apply(final CoordinateSequenceFilter filter) { @@ -225,7 +225,7 @@ public void apply(final CoordinateSequenceFilter filter) { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#apply(com.vividsolutions.jts.geom. GeometryFilter) + * @see org.locationtech.jts.geom.Geometry#apply(org.locationtech.jts.geom. GeometryFilter) */ @Override public void apply(final GeometryFilter filter) { @@ -235,7 +235,7 @@ public void apply(final GeometryFilter filter) { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#apply(com.vividsolutions.jts.geom. GeometryComponentFilter) + * @see org.locationtech.jts.geom.Geometry#apply(org.locationtech.jts.geom. GeometryComponentFilter) */ @Override public void apply(final GeometryComponentFilter filter) { @@ -255,7 +255,7 @@ public boolean isValid() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#normalize() + * @see org.locationtech.jts.geom.Geometry#normalize() */ @Override public void normalize() {} @@ -270,7 +270,7 @@ public final Object clone() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#computeEnvelopeInternal() + * @see org.locationtech.jts.geom.Geometry#computeEnvelopeInternal() */ @Override protected Envelope computeEnvelopeInternal() { @@ -281,7 +281,7 @@ protected Envelope computeEnvelopeInternal() { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#compareToSameClass(java.lang.Object) + * @see org.locationtech.jts.geom.Geometry#compareToSameClass(java.lang.Object) */ @Override protected int compareToSameClass(final Object o) { @@ -294,8 +294,8 @@ protected int compareToSameClass(final Object o) { /* * (non-Javadoc) * - * @see com.vividsolutions.jts.geom.Geometry#compareToSameClass(java.lang.Object, - * com.vividsolutions.jts.geom.CoordinateSequenceComparator) + * @see org.locationtech.jts.geom.Geometry#compareToSameClass(java.lang.Object, + * org.locationtech.jts.geom.CoordinateSequenceComparator) */ @Override protected int compareToSameClass(final Object o, final CoordinateSequenceComparator comp) { diff --git a/msi.gama.core/src/msi/gama/metamodel/shape/GamaGisGeometry.java b/msi.gama.core/src/msi/gama/metamodel/shape/GamaGisGeometry.java index ce5a872a00..72503b54ec 100644 --- a/msi.gama.core/src/msi/gama/metamodel/shape/GamaGisGeometry.java +++ b/msi.gama.core/src/msi/gama/metamodel/shape/GamaGisGeometry.java @@ -14,7 +14,7 @@ import org.opengis.feature.Property; import org.opengis.feature.type.GeometryType; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; /** * diff --git a/msi.gama.core/src/msi/gama/metamodel/shape/GamaPoint.java b/msi.gama.core/src/msi/gama/metamodel/shape/GamaPoint.java index f0194e8559..edf852c313 100644 --- a/msi.gama.core/src/msi/gama/metamodel/shape/GamaPoint.java +++ b/msi.gama.core/src/msi/gama/metamodel/shape/GamaPoint.java @@ -13,9 +13,9 @@ import static java.lang.Math.sqrt; import static msi.gaml.operators.Maths.round; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.util.NumberUtil; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.util.NumberUtil; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.geometry.GeometryUtils; @@ -331,7 +331,7 @@ public IAgent getAgent() { public void setAgent(final IAgent agent) {} /** - * @see msi.gama.common.interfaces.IGeometry#setInnerGeometry(com.vividsolutions.jts.geom.Geometry) + * @see msi.gama.common.interfaces.IGeometry#setInnerGeometry(org.locationtech.jts.geom.Geometry) */ @Override public void setInnerGeometry(final Geometry point) { diff --git a/msi.gama.core/src/msi/gama/metamodel/shape/GamaProxyGeometry.java b/msi.gama.core/src/msi/gama/metamodel/shape/GamaProxyGeometry.java index 44bcb777e0..78d872b18b 100644 --- a/msi.gama.core/src/msi/gama/metamodel/shape/GamaProxyGeometry.java +++ b/msi.gama.core/src/msi/gama/metamodel/shape/GamaProxyGeometry.java @@ -12,9 +12,9 @@ import static msi.gama.common.geometry.GeometryUtils.translate; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Polygon; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Polygon; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.geometry.GeometryUtils; @@ -354,7 +354,7 @@ public double getPerimeter() { /** * Method setInnerGeometry() * - * @see msi.gama.metamodel.shape.IShape#setInnerGeometry(com.vividsolutions.jts.geom.Geometry) + * @see msi.gama.metamodel.shape.IShape#setInnerGeometry(org.locationtech.jts.geom.Geometry) */ @Override public void setInnerGeometry(final Geometry intersection) {} diff --git a/msi.gama.core/src/msi/gama/metamodel/shape/GamaShape.java b/msi.gama.core/src/msi/gama/metamodel/shape/GamaShape.java index 64c8ea9588..7d1e32c2a9 100644 --- a/msi.gama.core/src/msi/gama/metamodel/shape/GamaShape.java +++ b/msi.gama.core/src/msi/gama/metamodel/shape/GamaShape.java @@ -17,16 +17,16 @@ import static msi.gama.util.GamaListFactory.create; import static msi.gaml.types.Types.POINT; -import com.vividsolutions.jts.algorithm.PointLocator; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.GeometryCollection; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.MultiLineString; -import com.vividsolutions.jts.geom.MultiPolygon; -import com.vividsolutions.jts.geom.Polygon; -import com.vividsolutions.jts.geom.TopologyException; -import com.vividsolutions.jts.util.AssertionFailedException; +import org.locationtech.jts.algorithm.PointLocator; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryCollection; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.MultiLineString; +import org.locationtech.jts.geom.MultiPolygon; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.geom.TopologyException; +import org.locationtech.jts.util.AssertionFailedException; import msi.gama.common.geometry.AxisAngle; import msi.gama.common.geometry.Envelope3D; diff --git a/msi.gama.core/src/msi/gama/metamodel/shape/ILocation.java b/msi.gama.core/src/msi/gama/metamodel/shape/ILocation.java index 84077a45b5..5dd0b2e228 100644 --- a/msi.gama.core/src/msi/gama/metamodel/shape/ILocation.java +++ b/msi.gama.core/src/msi/gama/metamodel/shape/ILocation.java @@ -10,7 +10,7 @@ ********************************************************************************************************/ package msi.gama.metamodel.shape; -import com.vividsolutions.jts.geom.Coordinate; +import org.locationtech.jts.geom.Coordinate; import msi.gama.common.interfaces.IKeyword; import msi.gama.precompiler.GamlAnnotations.doc; @@ -40,7 +40,7 @@ name = IKeyword.Z, type = IType.FLOAT, doc = { @doc ("Returns the z ordinate of this point") }) }) -public interface ILocation extends IShape, Comparable { +public interface ILocation extends IShape, Comparable { @getter (IKeyword.X) double getX(); @@ -74,4 +74,8 @@ public interface ILocation extends IShape, Comparable { ILocation withPrecision(int i); + default int compareTo(ILocation location) { + return compareTo((Coordinate)toGamaPoint()); + } + } \ No newline at end of file diff --git a/msi.gama.core/src/msi/gama/metamodel/shape/IShape.java b/msi.gama.core/src/msi/gama/metamodel/shape/IShape.java index 6e2d1557d5..9a5b6e332a 100644 --- a/msi.gama.core/src/msi/gama/metamodel/shape/IShape.java +++ b/msi.gama.core/src/msi/gama/metamodel/shape/IShape.java @@ -14,8 +14,8 @@ import java.util.Map; import java.util.Set; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.io.WKTWriter; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.io.WKTWriter; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.interfaces.IAttributed; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/AbstractTopology.java b/msi.gama.core/src/msi/gama/metamodel/topology/AbstractTopology.java index 92c2e350a0..77823bf49a 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/AbstractTopology.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/AbstractTopology.java @@ -17,12 +17,12 @@ import java.util.Map; import com.google.common.collect.Ordering; -import com.vividsolutions.jts.geom.Envelope; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.geom.prep.PreparedGeometry; -import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory; -import com.vividsolutions.jts.geom.util.AffineTransformation; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.geom.prep.PreparedGeometry; +import org.locationtech.jts.geom.prep.PreparedGeometryFactory; +import org.locationtech.jts.geom.util.AffineTransformation; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.geometry.GeometryUtils; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/CompoundSpatialIndex.java b/msi.gama.core/src/msi/gama/metamodel/topology/CompoundSpatialIndex.java index a39a624cab..58a03d6bd5 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/CompoundSpatialIndex.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/CompoundSpatialIndex.java @@ -17,7 +17,7 @@ import java.util.Map; import com.google.common.collect.Ordering; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.geometry.Envelope3D; import msi.gama.metamodel.agent.IAgent; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/GamaQuadTree.java b/msi.gama.core/src/msi/gama/metamodel/topology/GamaQuadTree.java index 26f9b0904b..d57a2469b6 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/GamaQuadTree.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/GamaQuadTree.java @@ -15,8 +15,8 @@ import java.util.Map; import com.google.common.collect.Ordering; -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.common.geometry.Envelope3D; import msi.gama.metamodel.agent.IAgent; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/ISpatialIndex.java b/msi.gama.core/src/msi/gama/metamodel/topology/ISpatialIndex.java index 3563e2af43..1ace8cf659 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/ISpatialIndex.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/ISpatialIndex.java @@ -12,7 +12,7 @@ import java.util.Collection; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.geometry.Envelope3D; import msi.gama.metamodel.agent.IAgent; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/ITopology.java b/msi.gama.core/src/msi/gama/metamodel/topology/ITopology.java index 53c0deba36..8f370a08f8 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/ITopology.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/ITopology.java @@ -13,7 +13,7 @@ import java.util.Collection; import java.util.List; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.interfaces.IKeyword; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/continuous/AmorphousTopology.java b/msi.gama.core/src/msi/gama/metamodel/topology/continuous/AmorphousTopology.java index c8686de3b6..f5dcf24d02 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/continuous/AmorphousTopology.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/continuous/AmorphousTopology.java @@ -15,8 +15,8 @@ import java.util.List; import java.util.Set; -import com.vividsolutions.jts.geom.Envelope; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.Envelope3D; import msi.gama.metamodel.agent.IAgent; @@ -97,7 +97,7 @@ public void initialize(final IScope scope, final IPopulation p /** * @see msi.gama.environment.ITopology#updateAgent(msi.gama.interfaces.IAgent, boolean, msi.gama.util.GamaPoint, - * com.vividsolutions.jts.geom.Envelope) + * org.locationtech.jts.geom.Envelope) */ // @Override // public void updateAgent(final IAgent agent, final boolean diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/continuous/RootTopology.java b/msi.gama.core/src/msi/gama/metamodel/topology/continuous/RootTopology.java index a2227d5b19..31daa84922 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/continuous/RootTopology.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/continuous/RootTopology.java @@ -10,7 +10,7 @@ ********************************************************************************************************/ package msi.gama.metamodel.topology.continuous; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.metamodel.agent.IAgent; import msi.gama.metamodel.population.IPopulation; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/graph/GamaSpatialGraph.java b/msi.gama.core/src/msi/gama/metamodel/topology/graph/GamaSpatialGraph.java index 68ae66d4c4..d63d94b95b 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/graph/GamaSpatialGraph.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/graph/GamaSpatialGraph.java @@ -18,7 +18,7 @@ import org.jgrapht.Graphs; -import com.vividsolutions.jts.geom.Coordinate; +import org.locationtech.jts.geom.Coordinate; import msi.gama.common.geometry.GeometryUtils; import msi.gama.common.util.StringUtils; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/graph/_SpatialEdge.java b/msi.gama.core/src/msi/gama/metamodel/topology/graph/_SpatialEdge.java index 17ea1e63f1..93c698846b 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/graph/_SpatialEdge.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/graph/_SpatialEdge.java @@ -10,7 +10,7 @@ ********************************************************************************************************/ package msi.gama.metamodel.topology.graph; -import com.vividsolutions.jts.geom.Coordinate; +import org.locationtech.jts.geom.Coordinate; import msi.gama.common.util.StringUtils; import msi.gama.metamodel.shape.GamaPoint; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/grid/GamaSpatialMatrix.java b/msi.gama.core/src/msi/gama/metamodel/topology/grid/GamaSpatialMatrix.java index ba6b84d756..db469dfc6e 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/grid/GamaSpatialMatrix.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/grid/GamaSpatialMatrix.java @@ -29,10 +29,10 @@ import java.util.stream.Stream; import com.google.common.collect.Ordering; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Envelope; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.operation.distance.DistanceOp; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.operation.distance.DistanceOp; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.geometry.GeometryUtils; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/projection/IProjection.java b/msi.gama.core/src/msi/gama/metamodel/topology/projection/IProjection.java index 6264936b4f..41280f1d6e 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/projection/IProjection.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/projection/IProjection.java @@ -13,7 +13,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.MathTransform; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.Envelope3D; import msi.gama.runtime.IScope; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/projection/Projection.java b/msi.gama.core/src/msi/gama/metamodel/topology/projection/Projection.java index c5894f738f..a15fcc38ed 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/projection/Projection.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/projection/Projection.java @@ -20,8 +20,8 @@ import org.opengis.referencing.operation.NoninvertibleTransformException; import org.opengis.referencing.operation.TransformException; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.GeometryCollection; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryCollection; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.geometry.GeometryUtils; @@ -161,7 +161,7 @@ public CoordinateReferenceSystem getTargetCRS(final IScope scope) { /** * Method translate() * - * @see msi.gama.metamodel.topology.projection.IProjection#translate(com.vividsolutions.jts.geom.Geometry) + * @see msi.gama.metamodel.topology.projection.IProjection#translate(org.locationtech.jts.geom.Geometry) */ @Override public void translate(final Geometry geom) { @@ -173,7 +173,7 @@ public void translate(final Geometry geom) { /** * Method inverseTranslate() * - * @see msi.gama.metamodel.topology.projection.IProjection#inverseTranslate(com.vividsolutions.jts.geom.Geometry) + * @see msi.gama.metamodel.topology.projection.IProjection#inverseTranslate(org.locationtech.jts.geom.Geometry) */ @Override public void inverseTranslate(final Geometry geom) { diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/projection/ProjectionFactory.java b/msi.gama.core/src/msi/gama/metamodel/topology/projection/ProjectionFactory.java index f960fb6430..2116484df9 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/projection/ProjectionFactory.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/projection/ProjectionFactory.java @@ -12,9 +12,10 @@ import java.util.Map; -import javax.measure.converter.UnitConverter; -import javax.measure.unit.SI; -import javax.measure.unit.Unit; +import si.uom.SI; +import javax.measure.Unit; +import javax.measure.UnitConverter; +import javax.measure.quantity.Length; import org.geotools.referencing.CRS; import org.geotools.referencing.crs.DefaultProjectedCRS; @@ -23,7 +24,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.cs.CartesianCS; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.preferences.GamaPreferences; @@ -69,9 +70,9 @@ void computeTargetCRS(final IScope scope, final CoordinateReferenceSystem crs, f } else { if (crs != null && crs instanceof DefaultProjectedCRS) { // Temporary fix of issue 766... a better solution final CartesianCS ccs = ((DefaultProjectedCRS) crs).getCoordinateSystem(); - final Unit unitX = ccs.getAxis(0).getUnit(); - if (unitX != null && !unitX.equals(SI.METER)) { - unitConverter = unitX.getConverterTo(SI.METER); + final Unit unitX = (Unit) ccs.getAxis(0).getUnit(); + if (unitX != null && !unitX.equals(SI.METRE)) { + unitConverter = unitX.getConverterTo(SI.METRE); } targetCRS = crs; } else { diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/projection/SimpleScalingProjection.java b/msi.gama.core/src/msi/gama/metamodel/topology/projection/SimpleScalingProjection.java index 4628a9b949..734ff95830 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/projection/SimpleScalingProjection.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/projection/SimpleScalingProjection.java @@ -4,8 +4,8 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.MathTransform; -import com.vividsolutions.jts.geom.CoordinateFilter; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.CoordinateFilter; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.Envelope3D; import msi.gama.runtime.IScope; diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/projection/WorldProjection.java b/msi.gama.core/src/msi/gama/metamodel/topology/projection/WorldProjection.java index d607228c98..7d11dcf3f7 100644 --- a/msi.gama.core/src/msi/gama/metamodel/topology/projection/WorldProjection.java +++ b/msi.gama.core/src/msi/gama/metamodel/topology/projection/WorldProjection.java @@ -10,12 +10,13 @@ ********************************************************************************************************/ package msi.gama.metamodel.topology.projection; -import javax.measure.converter.UnitConverter; import org.opengis.referencing.crs.CoordinateReferenceSystem; -import com.vividsolutions.jts.geom.CoordinateFilter; -import com.vividsolutions.jts.geom.Geometry; +import javax.measure.UnitConverter; + +import org.locationtech.jts.geom.CoordinateFilter; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.Envelope3D; import msi.gama.runtime.IScope; diff --git a/msi.gama.core/src/msi/gama/outputs/ImageDisplaySurface.java b/msi.gama.core/src/msi/gama/outputs/ImageDisplaySurface.java index 1d39765534..8fb9785bdd 100644 --- a/msi.gama.core/src/msi/gama/outputs/ImageDisplaySurface.java +++ b/msi.gama.core/src/msi/gama/outputs/ImageDisplaySurface.java @@ -22,7 +22,7 @@ import javax.imageio.ImageIO; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.interfaces.IDisplaySurface; import msi.gama.common.interfaces.IGraphics; diff --git a/msi.gama.core/src/msi/gama/outputs/display/AWTDisplayGraphics.java b/msi.gama.core/src/msi/gama/outputs/display/AWTDisplayGraphics.java index 431b4ca88c..a90b815c86 100644 --- a/msi.gama.core/src/msi/gama/outputs/display/AWTDisplayGraphics.java +++ b/msi.gama.core/src/msi/gama/outputs/display/AWTDisplayGraphics.java @@ -41,13 +41,13 @@ import java.awt.image.BufferedImage; import java.util.List; -import com.vividsolutions.jts.awt.PointTransformation; -import com.vividsolutions.jts.awt.ShapeWriter; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.GeometryCollection; -import com.vividsolutions.jts.geom.Lineal; -import com.vividsolutions.jts.geom.Puntal; +import org.locationtech.jts.awt.PointTransformation; +import org.locationtech.jts.awt.ShapeWriter; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryCollection; +import org.locationtech.jts.geom.Lineal; +import org.locationtech.jts.geom.Puntal; import msi.gama.common.geometry.AxisAngle; import msi.gama.common.geometry.GeometryUtils; @@ -143,7 +143,7 @@ public void setOpacity(final double alpha) { /** * Implements PointTransformation.transform * - * @see com.vividsolutions.jts.awt.PointTransformation#transform(com.vividsolutions.jts.geom.Coordinate, + * @see org.locationtech.jts.awt.PointTransformation#transform(org.locationtech.jts.geom.Coordinate, * java.awt.geom.Point2D) */ @Override diff --git a/msi.gama.core/src/msi/gama/outputs/display/AbstractDisplayGraphics.java b/msi.gama.core/src/msi/gama/outputs/display/AbstractDisplayGraphics.java index ea86ff1125..c3a16617cc 100644 --- a/msi.gama.core/src/msi/gama/outputs/display/AbstractDisplayGraphics.java +++ b/msi.gama.core/src/msi/gama/outputs/display/AbstractDisplayGraphics.java @@ -12,7 +12,7 @@ import java.awt.geom.Rectangle2D; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.interfaces.IDisplaySurface; import msi.gama.common.interfaces.IGraphics; diff --git a/msi.gama.core/src/msi/gama/outputs/display/NullDisplaySurface.java b/msi.gama.core/src/msi/gama/outputs/display/NullDisplaySurface.java index 7be1b48440..69b16123c2 100644 --- a/msi.gama.core/src/msi/gama/outputs/display/NullDisplaySurface.java +++ b/msi.gama.core/src/msi/gama/outputs/display/NullDisplaySurface.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.Collections; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.interfaces.IDisplaySurface; import msi.gama.common.interfaces.ILayer; diff --git a/msi.gama.core/src/msi/gama/outputs/layers/GridLayerData.java b/msi.gama.core/src/msi/gama/outputs/layers/GridLayerData.java index 73da554132..f25d02a853 100644 --- a/msi.gama.core/src/msi/gama/outputs/layers/GridLayerData.java +++ b/msi.gama.core/src/msi/gama/outputs/layers/GridLayerData.java @@ -16,7 +16,7 @@ import java.awt.image.BufferedImage; import java.util.Collection; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.interfaces.IGraphics; import msi.gama.common.interfaces.IKeyword; diff --git a/msi.gama.core/src/msi/gama/outputs/layers/ILayerData.java b/msi.gama.core/src/msi/gama/outputs/layers/ILayerData.java index 96e1fefd5c..d164409acc 100644 --- a/msi.gama.core/src/msi/gama/outputs/layers/ILayerData.java +++ b/msi.gama.core/src/msi/gama/outputs/layers/ILayerData.java @@ -12,7 +12,7 @@ import java.awt.Point; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.interfaces.IGraphics; import msi.gama.metamodel.shape.ILocation; diff --git a/msi.gama.core/src/msi/gama/outputs/layers/LayerData.java b/msi.gama.core/src/msi/gama/outputs/layers/LayerData.java index c232c5d1f3..28a19b2ce0 100644 --- a/msi.gama.core/src/msi/gama/outputs/layers/LayerData.java +++ b/msi.gama.core/src/msi/gama/outputs/layers/LayerData.java @@ -24,7 +24,7 @@ import java.awt.Point; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.interfaces.IGraphics; import msi.gama.metamodel.shape.GamaPoint; diff --git a/msi.gama.core/src/msi/gama/util/file/Gama3DGeometryFile.java b/msi.gama.core/src/msi/gama/util/file/Gama3DGeometryFile.java index 890d30b376..2e875f6217 100644 --- a/msi.gama.core/src/msi/gama/util/file/Gama3DGeometryFile.java +++ b/msi.gama.core/src/msi/gama/util/file/Gama3DGeometryFile.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.AxisAngle; import msi.gama.common.geometry.Envelope3D; diff --git a/msi.gama.core/src/msi/gama/util/file/GamaDXFFile.java b/msi.gama.core/src/msi/gama/util/file/GamaDXFFile.java index 40624643f2..ebd3a23dbe 100644 --- a/msi.gama.core/src/msi/gama/util/file/GamaDXFFile.java +++ b/msi.gama.core/src/msi/gama/util/file/GamaDXFFile.java @@ -30,7 +30,7 @@ import org.kabeja.parser.Parser; import org.kabeja.parser.ParserBuilder; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.geometry.Envelope3D; import msi.gama.metamodel.shape.GamaPoint; diff --git a/msi.gama.core/src/msi/gama/util/file/GamaGMLFile.java b/msi.gama.core/src/msi/gama/util/file/GamaGMLFile.java index a413efc1ad..fbb8de2632 100644 --- a/msi.gama.core/src/msi/gama/util/file/GamaGMLFile.java +++ b/msi.gama.core/src/msi/gama/util/file/GamaGMLFile.java @@ -16,17 +16,14 @@ import org.geotools.data.simple.SimpleFeatureIterator; import org.geotools.feature.DefaultFeatureCollection; -import org.geotools.gml.GMLFilterDocument; -import org.geotools.gml.GMLFilterFeature; -import org.geotools.gml.GMLFilterGeometry; -import org.geotools.gml.GMLReceiver; +import org.geotools.wfs.GML; import org.opengis.feature.Feature; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.Envelope3D; import msi.gama.metamodel.shape.GamaGisGeometry; @@ -36,7 +33,7 @@ import msi.gama.precompiler.GamlAnnotations.file; import msi.gama.precompiler.IConcept; import msi.gama.runtime.GAMA; -import msi.gama.runtime.IScope; +import msi.gama.runtime.IScope; import msi.gama.runtime.exceptions.GamaRuntimeException; import msi.gama.util.GamaListFactory; import msi.gama.util.IList; diff --git a/msi.gama.core/src/msi/gama/util/file/GamaGeoJsonFile.java b/msi.gama.core/src/msi/gama/util/file/GamaGeoJsonFile.java index 0c84a5d02b..05edbdfb33 100644 --- a/msi.gama.core/src/msi/gama/util/file/GamaGeoJsonFile.java +++ b/msi.gama.core/src/msi/gama/util/file/GamaGeoJsonFile.java @@ -22,7 +22,7 @@ import org.opengis.feature.type.GeometryType; 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.metamodel.shape.GamaGisGeometry; diff --git a/msi.gama.core/src/msi/gama/util/file/GamaGisFile.java b/msi.gama.core/src/msi/gama/util/file/GamaGisFile.java index e62c01dab6..fcfceb2b2e 100644 --- a/msi.gama.core/src/msi/gama/util/file/GamaGisFile.java +++ b/msi.gama.core/src/msi/gama/util/file/GamaGisFile.java @@ -14,11 +14,11 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem; -import com.vividsolutions.jts.geom.CoordinateFilter; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.LinearRing; -import com.vividsolutions.jts.geom.MultiPolygon; -import com.vividsolutions.jts.geom.Polygon; +import org.locationtech.jts.geom.CoordinateFilter; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.LinearRing; +import org.locationtech.jts.geom.MultiPolygon; +import org.locationtech.jts.geom.Polygon; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.geometry.GeometryUtils; diff --git a/msi.gama.core/src/msi/gama/util/file/GamaGridFile.java b/msi.gama.core/src/msi/gama/util/file/GamaGridFile.java index a97f749263..d5d6b94294 100644 --- a/msi.gama.core/src/msi/gama/util/file/GamaGridFile.java +++ b/msi.gama.core/src/msi/gama/util/file/GamaGridFile.java @@ -25,15 +25,15 @@ import org.geotools.coverage.grid.io.AbstractGridCoverage2DReader; import org.geotools.data.DataSourceException; import org.geotools.data.PrjFileReader; -import org.geotools.factory.Hints; import org.geotools.gce.arcgrid.ArcGridReader; import org.geotools.gce.geotiff.GeoTiffReader; import org.geotools.geometry.DirectPosition2D; import org.geotools.geometry.GeneralEnvelope; +import org.geotools.util.factory.Hints; import org.opengis.referencing.FactoryException; import org.opengis.referencing.crs.CoordinateReferenceSystem; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.geometry.Envelope3D; import msi.gama.metamodel.shape.GamaPoint; diff --git a/msi.gama.core/src/msi/gama/util/file/GamaImageFile.java b/msi.gama.core/src/msi/gama/util/file/GamaImageFile.java index 0b88024af1..dad6bfbe05 100644 --- a/msi.gama.core/src/msi/gama/util/file/GamaImageFile.java +++ b/msi.gama.core/src/msi/gama/util/file/GamaImageFile.java @@ -28,7 +28,7 @@ import org.opengis.referencing.FactoryException; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.util.ImageUtils; diff --git a/msi.gama.core/src/msi/gama/util/file/GamaOsmFile.java b/msi.gama.core/src/msi/gama/util/file/GamaOsmFile.java index cef19d1269..8999267da9 100644 --- a/msi.gama.core/src/msi/gama/util/file/GamaOsmFile.java +++ b/msi.gama.core/src/msi/gama/util/file/GamaOsmFile.java @@ -46,7 +46,7 @@ import org.opengis.referencing.NoSuchAuthorityCodeException; 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.ext.osmosis.Bound; diff --git a/msi.gama.core/src/msi/gama/util/file/GamaSVGFile.java b/msi.gama.core/src/msi/gama/util/file/GamaSVGFile.java index 634e902822..cd7b019410 100644 --- a/msi.gama.core/src/msi/gama/util/file/GamaSVGFile.java +++ b/msi.gama.core/src/msi/gama/util/file/GamaSVGFile.java @@ -16,8 +16,8 @@ import java.io.IOException; import java.net.URI; -import com.vividsolutions.jts.awt.ShapeReader; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.awt.ShapeReader; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.GeometryUtils; import msi.gama.common.geometry.Scaling3D; diff --git a/msi.gama.core/src/msi/gama/util/file/GamaShapeFile.java b/msi.gama.core/src/msi/gama/util/file/GamaShapeFile.java index fa41d795ef..808b86381e 100644 --- a/msi.gama.core/src/msi/gama/util/file/GamaShapeFile.java +++ b/msi.gama.core/src/msi/gama/util/file/GamaShapeFile.java @@ -34,8 +34,8 @@ import org.opengis.feature.type.GeometryType; import org.opengis.referencing.crs.CoordinateReferenceSystem; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Polygon; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Polygon; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.geometry.GeometryUtils; diff --git a/msi.gama.core/src/msi/gama/util/matrix/GamaFloatMatrix.java b/msi.gama.core/src/msi/gama/util/matrix/GamaFloatMatrix.java index d29b59fd2d..7f2b27d252 100644 --- a/msi.gama.core/src/msi/gama/util/matrix/GamaFloatMatrix.java +++ b/msi.gama.core/src/msi/gama/util/matrix/GamaFloatMatrix.java @@ -10,7 +10,7 @@ ********************************************************************************************************/ package msi.gama.util.matrix; -import static com.vividsolutions.jts.index.quadtree.IntervalSize.isZeroWidth; +import static org.locationtech.jts.index.quadtree.IntervalSize.isZeroWidth; import java.util.Arrays; import java.util.List; @@ -23,7 +23,7 @@ import org.apache.commons.math3.linear.RealMatrix; import com.google.common.primitives.Doubles; -import com.vividsolutions.jts.index.quadtree.IntervalSize; +import org.locationtech.jts.index.quadtree.IntervalSize; import msi.gama.common.util.RandomUtils; import msi.gama.metamodel.shape.GamaPoint; diff --git a/msi.gama.core/src/msi/gama/util/path/GamaSpatialPath.java b/msi.gama.core/src/msi/gama/util/path/GamaSpatialPath.java index 2680c5a617..75e6d55747 100644 --- a/msi.gama.core/src/msi/gama/util/path/GamaSpatialPath.java +++ b/msi.gama.core/src/msi/gama/util/path/GamaSpatialPath.java @@ -21,10 +21,10 @@ import org.apache.commons.lang.ArrayUtils; import org.jgrapht.Graph; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.Point; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.Point; import msi.gama.common.geometry.GeometryUtils; import msi.gama.common.geometry.ICoordinates; diff --git a/msi.gama.core/src/msi/gaml/operators/Comparison.java b/msi.gama.core/src/msi/gaml/operators/Comparison.java index 5241d75c36..f249a8185d 100644 --- a/msi.gama.core/src/msi/gaml/operators/Comparison.java +++ b/msi.gama.core/src/msi/gaml/operators/Comparison.java @@ -10,11 +10,11 @@ ********************************************************************************************************/ package msi.gaml.operators; -import static com.vividsolutions.jts.index.quadtree.IntervalSize.isZeroWidth; +import static org.locationtech.jts.index.quadtree.IntervalSize.isZeroWidth; import org.eclipse.emf.ecore.EObject; -import com.vividsolutions.jts.index.quadtree.IntervalSize; +import org.locationtech.jts.index.quadtree.IntervalSize; import msi.gama.common.interfaces.IGamlIssue; import msi.gama.metamodel.shape.GamaPoint; diff --git a/msi.gama.core/src/msi/gaml/operators/Graphs.java b/msi.gama.core/src/msi/gaml/operators/Graphs.java index 562d848ca1..a79cd1d3d4 100644 --- a/msi.gama.core/src/msi/gaml/operators/Graphs.java +++ b/msi.gama.core/src/msi/gaml/operators/Graphs.java @@ -27,7 +27,7 @@ import org.jgrapht.alg.flow.EdmondsKarpMFImpl; import org.jgrapht.alg.interfaces.MaximumFlowAlgorithm.MaximumFlow; -import com.vividsolutions.jts.geom.Coordinate; +import org.locationtech.jts.geom.Coordinate; import msi.gama.common.geometry.GeometryUtils; import msi.gama.common.interfaces.IKeyword; diff --git a/msi.gama.core/src/msi/gaml/operators/Spatial.java b/msi.gama.core/src/msi/gaml/operators/Spatial.java index 627f10f336..2db16732ad 100644 --- a/msi.gama.core/src/msi/gaml/operators/Spatial.java +++ b/msi.gama.core/src/msi/gaml/operators/Spatial.java @@ -32,31 +32,31 @@ import org.opengis.referencing.operation.MathTransform; import com.google.common.collect.Ordering; -import com.vividsolutions.jts.algorithm.Centroid; -import com.vividsolutions.jts.algorithm.distance.DistanceToPoint; -import com.vividsolutions.jts.algorithm.distance.PointPairDistance; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.CoordinateSequence; -import com.vividsolutions.jts.geom.CoordinateSequenceFilter; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.GeometryCollection; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.LinearRing; -import com.vividsolutions.jts.geom.MultiLineString; -import com.vividsolutions.jts.geom.MultiPoint; -import com.vividsolutions.jts.geom.MultiPolygon; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.geom.Polygon; -import com.vividsolutions.jts.geom.PrecisionModel; -import com.vividsolutions.jts.geom.TopologyException; -import com.vividsolutions.jts.geom.prep.PreparedGeometry; -import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory; -import com.vividsolutions.jts.operation.buffer.BufferParameters; -import com.vividsolutions.jts.operation.distance.DistanceOp; -import com.vividsolutions.jts.precision.EnhancedPrecisionOp; -import com.vividsolutions.jts.precision.GeometryPrecisionReducer; -import com.vividsolutions.jts.simplify.DouglasPeuckerSimplifier; -import com.vividsolutions.jts.util.AssertionFailedException; +import org.locationtech.jts.algorithm.Centroid; +import org.locationtech.jts.algorithm.distance.DistanceToPoint; +import org.locationtech.jts.algorithm.distance.PointPairDistance; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.CoordinateSequence; +import org.locationtech.jts.geom.CoordinateSequenceFilter; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryCollection; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.LinearRing; +import org.locationtech.jts.geom.MultiLineString; +import org.locationtech.jts.geom.MultiPoint; +import org.locationtech.jts.geom.MultiPolygon; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.geom.PrecisionModel; +import org.locationtech.jts.geom.TopologyException; +import org.locationtech.jts.geom.prep.PreparedGeometry; +import org.locationtech.jts.geom.prep.PreparedGeometryFactory; +import org.locationtech.jts.operation.buffer.BufferParameters; +import org.locationtech.jts.operation.distance.DistanceOp; +import org.locationtech.jts.precision.EnhancedPrecisionOp; +import org.locationtech.jts.precision.GeometryPrecisionReducer; +import org.locationtech.jts.simplify.DouglasPeuckerSimplifier; +import org.locationtech.jts.util.AssertionFailedException; import msi.gama.common.geometry.AxisAngle; import msi.gama.common.geometry.Envelope3D; diff --git a/msi.gama.core/src/msi/gaml/skills/MovingSkill.java b/msi.gama.core/src/msi/gaml/skills/MovingSkill.java index 4bbbba9843..b3598a444a 100644 --- a/msi.gama.core/src/msi/gaml/skills/MovingSkill.java +++ b/msi.gama.core/src/msi/gaml/skills/MovingSkill.java @@ -10,7 +10,7 @@ ********************************************************************************************************/ package msi.gaml.skills; -import static com.vividsolutions.jts.algorithm.CGAlgorithms.distancePointLine; +import static org.locationtech.jts.algorithm.CGAlgorithms.distancePointLine; import static msi.gama.common.geometry.GeometryUtils.getFirstPointOf; import static msi.gama.common.geometry.GeometryUtils.getLastPointOf; import static msi.gama.common.geometry.GeometryUtils.getPointsOf; @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import com.vividsolutions.jts.geom.Coordinate; +import org.locationtech.jts.geom.Coordinate; import msi.gama.common.interfaces.IKeyword; import msi.gama.metamodel.agent.IAgent; diff --git a/msi.gama.core/src/msi/gaml/statements/SaveStatement.java b/msi.gama.core/src/msi/gaml/statements/SaveStatement.java index 3a86942996..4ea1d62566 100644 --- a/msi.gama.core/src/msi/gaml/statements/SaveStatement.java +++ b/msi.gama.core/src/msi/gaml/statements/SaveStatement.java @@ -54,20 +54,20 @@ import org.opengis.referencing.FactoryException; import org.opengis.referencing.crs.CoordinateReferenceSystem; -import com.vividsolutions.jts.algorithm.CGAlgorithms; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.CoordinateSequence; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.GeometryCollection; -import com.vividsolutions.jts.geom.GeometryFactory; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.LinearRing; -import com.vividsolutions.jts.geom.MultiLineString; -import com.vividsolutions.jts.geom.MultiPoint; -import com.vividsolutions.jts.geom.MultiPolygon; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.geom.Polygon; -import com.vividsolutions.jts.geom.impl.CoordinateArraySequenceFactory; +import org.locationtech.jts.algorithm.CGAlgorithms; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.CoordinateSequence; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryCollection; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.LinearRing; +import org.locationtech.jts.geom.MultiLineString; +import org.locationtech.jts.geom.MultiPoint; +import org.locationtech.jts.geom.MultiPolygon; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.geom.impl.CoordinateArraySequenceFactory; import msi.gama.common.geometry.GeometryUtils; import msi.gama.common.interfaces.IGamlIssue; diff --git a/msi.gama.core/src/msi/gaml/statements/draw/FileExecuter.java b/msi.gama.core/src/msi/gaml/statements/draw/FileExecuter.java index f0bc21b5f7..6c34570653 100644 --- a/msi.gama.core/src/msi/gaml/statements/draw/FileExecuter.java +++ b/msi.gama.core/src/msi/gaml/statements/draw/FileExecuter.java @@ -12,7 +12,7 @@ import java.awt.geom.Rectangle2D; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.geometry.Scaling3D; diff --git a/msi.gama.core/src/msi/gaml/statements/draw/ShapeExecuter.java b/msi.gama.core/src/msi/gaml/statements/draw/ShapeExecuter.java index 40d5e051bb..66e8886a96 100644 --- a/msi.gama.core/src/msi/gaml/statements/draw/ShapeExecuter.java +++ b/msi.gama.core/src/msi/gaml/statements/draw/ShapeExecuter.java @@ -25,8 +25,8 @@ import java.util.ArrayList; import java.util.List; -import com.vividsolutions.jts.geom.Envelope; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.geometry.ICoordinates; diff --git a/msi.gama.core/src/msi/gaml/types/GamaGeometryType.java b/msi.gama.core/src/msi/gaml/types/GamaGeometryType.java index 506142c9f6..47d8c522be 100644 --- a/msi.gama.core/src/msi/gaml/types/GamaGeometryType.java +++ b/msi.gama.core/src/msi/gaml/types/GamaGeometryType.java @@ -26,22 +26,22 @@ import java.util.Collection; import java.util.List; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.CoordinateSequence; -import com.vividsolutions.jts.geom.CoordinateSequenceFactory; -import com.vividsolutions.jts.geom.CoordinateSequences; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.LinearRing; -import com.vividsolutions.jts.geom.MultiPolygon; -import com.vividsolutions.jts.geom.Polygon; -import com.vividsolutions.jts.geom.TopologyException; -import com.vividsolutions.jts.io.ParseException; -import com.vividsolutions.jts.io.WKTReader; -import com.vividsolutions.jts.operation.linemerge.LineMerger; -import com.vividsolutions.jts.operation.union.CascadedPolygonUnion; -import com.vividsolutions.jts.util.AssertionFailedException; -import com.vividsolutions.jts.util.GeometricShapeFactory; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.CoordinateSequence; +import org.locationtech.jts.geom.CoordinateSequenceFactory; +import org.locationtech.jts.geom.CoordinateSequences; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.LinearRing; +import org.locationtech.jts.geom.MultiPolygon; +import org.locationtech.jts.geom.Polygon; +import org.locationtech.jts.geom.TopologyException; +import org.locationtech.jts.io.ParseException; +import org.locationtech.jts.io.WKTReader; +import org.locationtech.jts.operation.linemerge.LineMerger; +import org.locationtech.jts.operation.union.CascadedPolygonUnion; +import org.locationtech.jts.util.AssertionFailedException; +import org.locationtech.jts.util.GeometricShapeFactory; import msi.gama.common.geometry.GamaGeometryFactory; import msi.gama.common.geometry.GeometryUtils; diff --git a/msi.gama.core/src/msi/gaml/types/GamaKmlExport.java b/msi.gama.core/src/msi/gaml/types/GamaKmlExport.java index 966ca44f04..359412c659 100644 --- a/msi.gama.core/src/msi/gaml/types/GamaKmlExport.java +++ b/msi.gama.core/src/msi/gaml/types/GamaKmlExport.java @@ -15,14 +15,14 @@ import java.io.IOException; import java.util.HashMap; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.MultiLineString; -import com.vividsolutions.jts.geom.MultiPoint; -import com.vividsolutions.jts.geom.MultiPolygon; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.geom.Polygon; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.MultiLineString; +import org.locationtech.jts.geom.MultiPoint; +import org.locationtech.jts.geom.MultiPolygon; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.geom.Polygon; import de.micromata.opengis.kml.v_2_2_0.AltitudeMode; import de.micromata.opengis.kml.v_2_2_0.ColorMode; diff --git a/msi.gama.ext/.classpath b/msi.gama.ext/.classpath index 46af3fe302..2a10e21869 100644 --- a/msi.gama.ext/.classpath +++ b/msi.gama.ext/.classpath @@ -1,114 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msi.gama.ext/META-INF/MANIFEST.MF b/msi.gama.ext/META-INF/MANIFEST.MF index 9c75a12f7f..a82e1e628a 100644 --- a/msi.gama.ext/META-INF/MANIFEST.MF +++ b/msi.gama.ext/META-INF/MANIFEST.MF @@ -49,26 +49,6 @@ Export-Package: com.google.protobuf, com.sun.media.jai.rmi, com.sun.media.jai.tilecodec, com.sun.media.jai.util, - com.vividsolutions.jts.algorithm;uses:="com.vividsolutions.jts.index.chain,com.vividsolutions.jts.geom,com.vividsolutions.jts.math", - com.vividsolutions.jts.algorithm.distance;uses:="com.vividsolutions.jts.geom", - com.vividsolutions.jts.awt;uses:="com.vividsolutions.jts.geom", - com.vividsolutions.jts.geom;uses:="com.vividsolutions.jts.algorithm,com.vividsolutions.jts.geom.util", - com.vividsolutions.jts.geom.impl, - com.vividsolutions.jts.geom.prep;uses:="com.vividsolutions.jts.algorithm.locate,com.vividsolutions.jts.noding,com.vividsolutions.jts.geom", - com.vividsolutions.jts.geom.util;uses:="com.vividsolutions.jts.geom,com.vividsolutions.jts.util", - com.vividsolutions.jts.index.quadtree;uses:="com.vividsolutions.jts.geom,com.vividsolutions.jts.index", - com.vividsolutions.jts.io;uses:="com.vividsolutions.jts.geom", - com.vividsolutions.jts.math, - com.vividsolutions.jts.operation.buffer;uses:="com.vividsolutions.jts.noding,com.vividsolutions.jts.geom,com.vividsolutions.jts.geomgraph", - com.vividsolutions.jts.operation.distance;uses:="com.vividsolutions.jts.index.strtree,com.vividsolutions.jts.geom", - com.vividsolutions.jts.operation.linemerge, - com.vividsolutions.jts.operation.union;uses:="com.vividsolutions.jts.geom", - com.vividsolutions.jts.precision;uses:="com.vividsolutions.jts.geom,com.vividsolutions.jts.geom.util", - com.vividsolutions.jts.simplify;uses:="com.vividsolutions.jts.geom,com.vividsolutions.jts.index,com.vividsolutions.jts.geom.util", - com.vividsolutions.jts.triangulate;uses:="com.vividsolutions.jts.index.kdtree,com.vividsolutions.jts.geom,com.vividsolutions.jts.triangulate.quadedge", - com.vividsolutions.jts.triangulate.quadedge;uses:="com.vividsolutions.jts.geom,com.vividsolutions.jts.math", - com.vividsolutions.jts.util;uses:="com.vividsolutions.jts.geom", - com.vividsolutions.jtsexample.geom, de.micromata.opengis.kml.v_2_2_0, geodb, it.geosolutions.imageio.core, @@ -114,8 +94,10 @@ Export-Package: com.google.protobuf, it.geosolutions.jaiext.vectorbin, it.geosolutions.jaiext.warp, it.geosolutions.jaiext.zonal, - javax.measure.converter, - javax.measure.unit, + javax.measure, + javax.measure.format, + javax.measure.quantity, + javax.measure.spi, javax.media.jai, javax.media.jai.iterator, javax.media.jai.operator, @@ -190,7 +172,6 @@ Export-Package: com.google.protobuf, org.apache.commons.math3.stat.descriptive.moment, org.apache.commons.math3.stat.regression;uses:="org.apache.commons.math3.exception.util,org.apache.commons.math3.exception,org.apache.commons.math3.linear", org.apache.commons.math3.util;uses:="org.apache.commons.math3,org.apache.commons.math3.exception.util,new org.apache.commons.math3.util", - org.geotools, org.geotools.brewer.color, org.geotools.console, org.geotools.coverage, @@ -227,7 +208,6 @@ Export-Package: com.google.protobuf, org.geotools.data.shapefile.shp.xml, org.geotools.data.simple, org.geotools.data.sort, - org.geotools.data.spatialite, org.geotools.data.store, org.geotools.data.transform, org.geotools.data.view, @@ -257,12 +237,26 @@ Export-Package: com.google.protobuf, org.geotools.geojson.feature, org.geotools.geojson.geom, org.geotools.geometry, - org.geotools.geometry.coordinatesequence, org.geotools.geometry.jts, org.geotools.geometry.jts.coordinatesequence, - org.geotools.geometry.text, - org.geotools.gml, - org.geotools.gml.producer, + org.geotools.gml2, + org.geotools.gml2.bindings, + org.geotools.gml2.simple, + org.geotools.gml3, + org.geotools.gml3.bindings, + org.geotools.gml3.bindings.ext, + org.geotools.gml3.bindings.smil, + org.geotools.gml3.complex, + org.geotools.gml3.simple, + org.geotools.gml3.smil, + org.geotools.gml3.v3_2, + org.geotools.gml3.v3_2.bindings, + org.geotools.gml3.v3_2.gco, + org.geotools.gml3.v3_2.gmd, + org.geotools.gml3.v3_2.gmx, + org.geotools.gml3.v3_2.gsr, + org.geotools.gml3.v3_2.gss, + org.geotools.gml3.v3_2.gts, org.geotools.grid, org.geotools.grid.hexagon, org.geotools.grid.oblong, @@ -272,13 +266,8 @@ Export-Package: com.google.protobuf, org.geotools.image.jai, org.geotools.image.palette, org.geotools.image.test, - org.geotools.io, org.geotools.jdbc, - org.geotools.legend, org.geotools.map, - org.geotools.map.direct, - org.geotools.map.event, - org.geotools.math, org.geotools.measure, org.geotools.metadata, org.geotools.metadata.iso, @@ -318,7 +307,6 @@ Export-Package: com.google.protobuf, org.geotools.referencing.operation.matrix, org.geotools.referencing.operation.projection, org.geotools.referencing.operation.transform, - org.geotools.referencing.piecewise, org.geotools.referencing.wkt, org.geotools.renderer, org.geotools.renderer.composite, @@ -327,27 +315,23 @@ Export-Package: com.google.protobuf, org.geotools.renderer.label, org.geotools.renderer.lite, org.geotools.renderer.lite.gridcoverage2d, - org.geotools.renderer.markwkt, org.geotools.renderer.style, - org.geotools.renderer.style.shape, - org.geotools.renderer.windbarbs, - org.geotools.resources, - org.geotools.resources.coverage, - org.geotools.resources.geometry, - org.geotools.resources.i18n, - org.geotools.resources.image, - org.geotools.sql, org.geotools.styling, - org.geotools.styling.builder, org.geotools.styling.visitor, org.geotools.temporal, org.geotools.temporal.object, org.geotools.temporal.reference, org.geotools.text, org.geotools.util, + org.geotools.util.factory, org.geotools.util.logging, - org.geotools.xml, - org.geotools.xml.transform, + org.geotools.wfs, + org.geotools.wfs.bindings, + org.geotools.wfs.gtxml, + org.geotools.wfs.v1_0, + org.geotools.wfs.v1_1, + org.geotools.wfs.v2_0, + org.geotools.wfs.v2_0.bindings, org.gjt.mm.mysql, org.jfree.chart, org.jfree.chart.annotations, @@ -422,6 +406,63 @@ Export-Package: com.google.protobuf, org.kabeja.parser.dxf.filter, org.kabeja.parser.dxf, org.kabeja.parser.table", + org.locationtech.jts, + org.locationtech.jts.algorithm;uses:="org.locationtech.jts.index.chain,org.locationtech.jts.geom,org.locationtech.jts.math", + org.locationtech.jts.algorithm.construct, + org.locationtech.jts.algorithm.distance;uses:="org.locationtech.jts.geom", + org.locationtech.jts.algorithm.locate, + org.locationtech.jts.algorithm.match, + org.locationtech.jts.awt;uses:="org.locationtech.jts.geom", + org.locationtech.jts.densify, + org.locationtech.jts.dissolve, + org.locationtech.jts.edgegraph, + org.locationtech.jts.geom;uses:="org.locationtech.jts.algorithm,org.locationtech.jts.geom.util", + org.locationtech.jts.geom.impl, + org.locationtech.jts.geom.prep;uses:="org.locationtech.jts.algorithm.locate,org.locationtech.jts.noding,org.locationtech.jts.geom", + org.locationtech.jts.geom.util;uses:="org.locationtech.jts.geom,org.locationtech.jts.util", + org.locationtech.jts.geomgraph, + org.locationtech.jts.geomgraph.index, + org.locationtech.jts.index, + org.locationtech.jts.index.bintree, + org.locationtech.jts.index.chain, + org.locationtech.jts.index.hprtree, + org.locationtech.jts.index.intervalrtree, + org.locationtech.jts.index.kdtree, + org.locationtech.jts.index.quadtree;uses:="org.locationtech.jts.geom,org.locationtech.jts.index", + org.locationtech.jts.index.strtree, + org.locationtech.jts.index.sweepline, + org.locationtech.jts.io;uses:="org.locationtech.jts.geom", + org.locationtech.jts.io.geojson, + org.locationtech.jts.io.gml2, + org.locationtech.jts.io.kml, + org.locationtech.jts.linearref, + org.locationtech.jts.math, + org.locationtech.jts.noding, + org.locationtech.jts.noding.snapround, + org.locationtech.jts.operation, + org.locationtech.jts.operation.buffer;uses:="org.locationtech.jts.noding,org.locationtech.jts.geom,org.locationtech.jts.geomgraph", + org.locationtech.jts.operation.buffer.validate, + org.locationtech.jts.operation.distance;uses:="org.locationtech.jts.index.strtree,org.locationtech.jts.geom", + org.locationtech.jts.operation.distance3d, + org.locationtech.jts.operation.linemerge, + org.locationtech.jts.operation.overlay, + org.locationtech.jts.operation.overlay.snap, + org.locationtech.jts.operation.overlay.validate, + org.locationtech.jts.operation.polygonize, + org.locationtech.jts.operation.predicate, + org.locationtech.jts.operation.relate, + org.locationtech.jts.operation.union;uses:="org.locationtech.jts.geom", + org.locationtech.jts.operation.valid, + org.locationtech.jts.planargraph, + org.locationtech.jts.planargraph.algorithm, + org.locationtech.jts.precision;uses:="org.locationtech.jts.geom,org.locationtech.jts.geom.util", + org.locationtech.jts.shape, + org.locationtech.jts.shape.fractal, + org.locationtech.jts.shape.random, + org.locationtech.jts.simplify;uses:="org.locationtech.jts.geom,org.locationtech.jts.index,org.locationtech.jts.geom.util", + org.locationtech.jts.triangulate;uses:="org.locationtech.jts.index.kdtree,org.locationtech.jts.geom,org.locationtech.jts.triangulate.quadedge", + org.locationtech.jts.triangulate.quadedge;uses:="org.locationtech.jts.geom,org.locationtech.jts.math", + org.locationtech.jts.util;uses:="org.locationtech.jts.geom", org.olap4j; uses:="org.olap4j.mdx.parser, javax.sql, @@ -448,28 +489,20 @@ Export-Package: com.google.protobuf, org.postgresql, org.postgresql.copy, org.postgresql.core, - org.postgresql.core.types, - org.postgresql.core.v2, org.postgresql.core.v3, org.postgresql.ds, org.postgresql.ds.common, - org.postgresql.ds.jdbc23, - org.postgresql.ds.jdbc4, org.postgresql.fastpath, org.postgresql.geometric, org.postgresql.gss, org.postgresql.jdbc2, org.postgresql.jdbc2.optional, org.postgresql.jdbc3, - org.postgresql.jdbc3g, - org.postgresql.jdbc4, org.postgresql.largeobject, org.postgresql.ssl, org.postgresql.translation, org.postgresql.util, org.postgresql.xa, - org.postgresql.xa.jdbc3, - org.postgresql.xa.jdbc4, org.sqlite, org.sqlite.core, org.sqlite.javax, @@ -481,7 +514,26 @@ Export-Package: com.google.protobuf, graphics, javax.xml.parsers, javax.swing", - rcaller.exception + rcaller.exception, + si.uom, + si.uom.impl, + si.uom.impl.quantity, + si.uom.quantity, + systems.uom.common, + systems.uom.common.internal, + tec.uom.lib.common, + tec.uom.lib.common.function, + tec.uom.lib.common.util, + tec.uom.se, + tec.uom.se.format, + tec.uom.se.function, + tec.uom.se.internal, + tec.uom.se.internal.format, + tec.uom.se.internal.format.l10n, + tec.uom.se.quantity, + tec.uom.se.quantity.time, + tec.uom.se.spi, + tec.uom.se.unit Require-Bundle: com.google.guava;bundle-version="15.0.0";visibility:=reexport, org.eclipse.osgi, org.apache.commons.lang;bundle-version="2.6.0", @@ -489,106 +541,114 @@ Require-Bundle: com.google.guava;bundle-version="15.0.0";visibility:=reexport, Bundle-ClassPath: ., protobuf-java-3.6.1.jar, commons-math3-3.6.1/jars/commons-math3-3.6.1.jar, - jts 1.14/jars/jts-core-1.14.0.jar, rcaller 2.5/jars/RCaller-2.5.jar, vecmath 1.5.2/jars/vecmath-1.5.2.jar, kabeja 0.4/jars/kabeja-0.4.jar, olap4j 1.2.0/jars/olap4j-1.2.0.jar, olap4j 1.2.0/jars/olap4j-xmla-1.2.0.jar, jtds 1.3.1/jars/jtds-1.3.1.jar, - geotools 14.5/batik-transcoder-1.7.jar, - geotools 14.5/commons-collections-3.1.jar, - geotools 14.5/commons-dbcp-1.4.jar, - geotools 14.5/commons-pool-1.5.4.jar, - geotools 14.5/geodb-0.7-RC2.jar, - geotools 14.5/gt-api-14.5.jar, - geotools 14.5/gt-arcgrid-14.5.jar, - geotools 14.5/gt-data-14.5.jar, - geotools 14.5/gt-epsg-wkt-14.5.jar, - geotools 14.5/gt-geotiff-14.5.jar, - geotools 14.5/gt-grid-14.5.jar, - geotools 14.5/gt-jdbc-14.5.jar, - geotools 14.5/gt-jdbc-db2-14.5.jar, - geotools 14.5/gt-jdbc-mysql-14.5.jar, - geotools 14.5/gt-jdbc-oracle-14.5.jar, - geotools 14.5/gt-jdbc-postgis-14.5.jar, - geotools 14.5/gt-jdbc-spatialite-14.5.jar, - geotools 14.5/gt-main-14.5.jar, - geotools 14.5/gt-metadata-14.5.jar, - geotools 14.5/gt-opengis-14.5.jar, - geotools 14.5/gt-process-14.5.jar, - geotools 14.5/gt-process-feature-14.5.jar, - geotools 14.5/gt-process-geometry-14.5.jar, - geotools 14.5/gt-referencing-14.5.jar, - geotools 14.5/gt-render-14.5.jar, - geotools 14.5/gt-shapefile-14.5.jar, - geotools 14.5/gt-transform-14.5.jar, - geotools 14.5/imageio-ext-arcgrid-1.1.13.jar, - geotools 14.5/imageio-ext-tiff-1.1.13.jar, - geotools 14.5/imageio-ext-utilities-1.1.13.jar, - geotools 14.5/jai_codec-1.1.3.jar, - geotools 14.5/jai_core-1.1.3.jar, - geotools 14.5/jai_imageio-1.1.jar, - geotools 14.5/jdom-1.1.3.jar, - geotools 14.5/json-simple-1.1.jar, - geotools 14.5/jsqlparser-0.3.14.jar, - geotools 14.5/jsr-275-1.0-beta-2.jar, - geotools 14.5/mysql-connector-java-5.1.17.jar, - geotools 14.5/postgresql-9.4-1201-jdbc41.jar, - geotools 14.5/spatialite-jdbc-3.7.2-2.4.jar, - geotools 14.5/sqlite-jdbc-3.8.6.jar, - geotools 14.5/jt-utilities-1.0.9.jar, - geotools 14.5/core-0.26.jar, jgrapht 1.0.1/jgrapht-core-1.0.1.jar, kml/jars/JavaAPIforKml-2.2.1.jar, - jts 1.14/jars/jts-example-1.14.0.jar, - streamex 0.6.7/streamex-0.6.8.jar, kml/jars/jaxb-impl.jar, kml/jars/jaxb-api.jar, kml/jars/jaxb-core.jar, jfreechart-1.5.0.jar, - geotools 14.5/jt-affine-1.0.9.jar, - geotools 14.5/jt-algebra-1.0.9.jar, - geotools 14.5/jt-bandcombine-1.0.9.jar, - geotools 14.5/jt-bandmerge-1.0.9.jar, - geotools 14.5/jt-bandselect-1.0.9.jar, - geotools 14.5/jt-binarize-1.0.9.jar, - geotools 14.5/jt-border-1.0.9.jar, - geotools 14.5/jt-buffer-1.0.9.jar, - geotools 14.5/jt-classifier-1.0.9.jar, - geotools 14.5/jt-colorconvert-1.0.9.jar, - geotools 14.5/jt-colorindexer-1.0.9.jar, - geotools 14.5/jt-crop-1.0.9.jar, - geotools 14.5/jt-errordiffusion-1.0.9.jar, - geotools 14.5/jt-format-1.0.9.jar, - geotools 14.5/jt-imagefunction-1.0.9.jar, - geotools 14.5/jt-iterators-1.0.9.jar, - geotools 14.5/jt-lookup-1.0.9.jar, - geotools 14.5/jt-mosaic-1.0.9.jar, - geotools 14.5/jt-nullop-1.0.9.jar, - geotools 14.5/jt-orderdither-1.0.9.jar, - geotools 14.5/jt-piecewise-1.0.9.jar, - geotools 14.5/jt-rescale-1.0.9.jar, - geotools 14.5/jt-rlookup-1.0.9.jar, - geotools 14.5/jt-scale-1.0.9.jar, - geotools 14.5/jt-stats-1.0.9.jar, - geotools 14.5/jt-translate-1.0.9.jar, - geotools 14.5/jt-utils-1.4.0.jar, - geotools 14.5/jt-vectorbin-1.0.9.jar, - geotools 14.5/jt-vectorbinarize-1.4.0.jar, - geotools 14.5/jt-contour-1.4.0.jar, - geotools 14.5/jt-rangelookup-1.4.0.jar, - geotools 14.5/jt-vectorize-1.4.0.jar, - geotools 14.5/jt-warp-1.0.9.jar, - geotools 14.5/jt-zonal-1.0.9.jar, - geotools 14.5/jt-zonalstats-1.4.0.jar, - geotools 14.5/jgridshift-1.0.jar, - geotools 14.5/gt-geojson-14.5.jar, - geotools 14.5/gt-cql-14.5.jar, - geotools 14.5/gt-brewer-14.5.jar, - geotools 14.5/gt-coverage-14.5.jar, - geotools 14.5/imageio-ext-streams-1.1.13.jar, - geotools 14.5/imageio-ext-geocore-1.1.13.jar, - geotools 14.5/GeographicLib-Java-1.44.jar + jts-1.17.1/jts-core-1.17.1.jar, + jts-1.17.1/jts-io-common-1.17.1.jar, + geotools 21.4/batik-transcoder-1.10.jar, + geotools 21.4/commons-collections-3.2.2.jar, + geotools 21.4/commons-dbcp-1.4.jar, + geotools 21.4/commons-pool-1.5.4.jar, + geotools 21.4/ejml-ddense-0.34.jar, + geotools 21.4/geodb-0.9.jar, + geotools 21.4/GeographicLib-Java-1.49.jar, + geotools 21.4/gt-arcgrid-21.4.jar, + geotools 21.4/gt-brewer-21.4.jar, + geotools 21.4/gt-coverage-21.4.jar, + geotools 21.4/gt-cql-21.4.jar, + geotools 21.4/gt-epsg-wkt-21.4.jar, + geotools 21.4/gt-geojson-21.4.jar, + geotools 21.4/gt-geotiff-21.4.jar, + geotools 21.4/gt-grid-21.4.jar, + geotools 21.4/gt-jdbc-21.4.jar, + geotools 21.4/gt-jdbc-db2-21.4.jar, + geotools 21.4/gt-jdbc-mysql-21.4.jar, + geotools 21.4/gt-jdbc-oracle-21.4.jar, + geotools 21.4/gt-jdbc-postgis-21.4.jar, + geotools 21.4/gt-main-21.4.jar, + geotools 21.4/gt-metadata-21.4.jar, + geotools 21.4/gt-opengis-21.4.jar, + geotools 21.4/gt-process-21.4.jar, + geotools 21.4/gt-process-feature-21.4.jar, + geotools 21.4/gt-process-geometry-21.4.jar, + geotools 21.4/gt-referencing-21.4.jar, + geotools 21.4/gt-render-21.4.jar, + geotools 21.4/gt-shapefile-21.4.jar, + geotools 21.4/gt-transform-21.4.jar, + geotools 21.4/imageio-ext-arcgrid-1.2.3.jar, + geotools 21.4/imageio-ext-geocore-1.2.3.jar, + geotools 21.4/imageio-ext-streams-1.2.3.jar, + geotools 21.4/imageio-ext-tiff-1.2.3.jar, + geotools 21.4/imageio-ext-utilities-1.2.3.jar, + geotools 21.4/jai_codec-1.1.3.jar, + geotools 21.4/jai_core-1.1.3.jar, + geotools 21.4/jai_imageio-1.1.jar, + geotools 21.4/jdom2-2.0.6.jar, + geotools 21.4/jgridshift-1.0.jar, + geotools 21.4/json-simple-1.1.jar, + geotools 21.4/jsqlparser-0.3.14.jar, + geotools 21.4/jsr305-3.0.0.jar, + geotools 21.4/jt-affine-1.1.11.jar, + geotools 21.4/jt-algebra-1.1.11.jar, + geotools 21.4/jt-bandcombine-1.1.11.jar, + geotools 21.4/jt-bandmerge-1.1.11.jar, + geotools 21.4/jt-bandselect-1.1.11.jar, + geotools 21.4/jt-binarize-1.1.11.jar, + geotools 21.4/jt-border-1.1.11.jar, + geotools 21.4/jt-buffer-1.1.11.jar, + geotools 21.4/jt-classifier-1.1.11.jar, + geotools 21.4/jt-colorconvert-1.1.11.jar, + geotools 21.4/jt-colorindexer-1.1.11.jar, + geotools 21.4/jt-contour-1.5.0.jar, + geotools 21.4/jt-crop-1.1.11.jar, + geotools 21.4/jt-errordiffusion-1.1.11.jar, + geotools 21.4/jt-format-1.1.11.jar, + geotools 21.4/jt-imagefunction-1.1.11.jar, + geotools 21.4/jt-iterators-1.1.11.jar, + geotools 21.4/jt-jiffle-op-1.1.11.jar, + geotools 21.4/jt-lookup-1.1.11.jar, + geotools 21.4/jt-mosaic-1.1.11.jar, + geotools 21.4/jt-nullop-1.1.11.jar, + geotools 21.4/jt-orderdither-1.1.11.jar, + geotools 21.4/jt-piecewise-1.1.11.jar, + geotools 21.4/jt-rangelookup-1.5.0.jar, + geotools 21.4/jt-rescale-1.1.11.jar, + geotools 21.4/jt-rlookup-1.1.11.jar, + geotools 21.4/jt-scale-1.1.11.jar, + geotools 21.4/jt-scale2-1.1.11.jar, + geotools 21.4/jt-shadedrelief-1.1.11.jar, + geotools 21.4/jt-stats-1.1.11.jar, + geotools 21.4/jt-translate-1.1.11.jar, + geotools 21.4/jt-utilities-1.1.11.jar, + geotools 21.4/jt-utils-1.5.0.jar, + geotools 21.4/jt-vectorbin-1.1.11.jar, + geotools 21.4/jt-vectorbinarize-1.5.0.jar, + geotools 21.4/jt-vectorize-1.5.0.jar, + geotools 21.4/jt-warp-1.1.11.jar, + geotools 21.4/jt-zonal-1.1.11.jar, + geotools 21.4/jt-zonalstats-1.5.0.jar, + geotools 21.4/mysql-connector-java-5.1.46.jar, + geotools 21.4/postgresql-42.2.5.jar, + geotools 21.4/sqlite-jdbc-3.27.2.1.jar, + jsr 363/si-quantity-2.0.1.jar, + jsr 363/si-units-java8-1.3.1.jar, + jsr 363/systems-common-java8-1.3.jar, + jsr 363/unit-api-2.1.1.jar, + jsr 363/uom-lib-common-1.0.3.jar, + jsr 363/uom-se-1.0.10.jar, + streamex 0.6.7/streamex-0.6.8.jar, + geotools 21.4/gt-xsd-gml2-21.4.jar, + geotools 21.4/gt-xsd-gml3-21.4.jar, + geotools 21.4/gt-xsd-wfs-21.4.jar Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: msi.gama.ext diff --git a/msi.gama.ext/build.properties b/msi.gama.ext/build.properties index 04abef8848..3932aff84c 100644 --- a/msi.gama.ext/build.properties +++ b/msi.gama.ext/build.properties @@ -1,109 +1,117 @@ bin.includes = .,\ META-INF/,\ commons-math3-3.6.1/jars/commons-math3-3.6.1.jar,\ - jts 1.14/jars/jts-core-1.14.0.jar,\ rcaller 2.5/jars/RCaller-2.5.jar,\ vecmath 1.5.2/jars/vecmath-1.5.2.jar,\ kabeja 0.4/jars/kabeja-0.4.jar,\ olap4j 1.2.0/jars/olap4j-1.2.0.jar,\ olap4j 1.2.0/jars/olap4j-xmla-1.2.0.jar,\ jtds 1.3.1/jars/jtds-1.3.1.jar,\ - geotools 14.5/batik-transcoder-1.7.jar,\ - geotools 14.5/commons-collections-3.1.jar,\ - geotools 14.5/commons-dbcp-1.4.jar,\ - geotools 14.5/commons-pool-1.5.4.jar,\ - geotools 14.5/geodb-0.7-RC2.jar,\ - geotools 14.5/gt-api-14.5.jar,\ - geotools 14.5/gt-arcgrid-14.5.jar,\ - geotools 14.5/gt-data-14.5.jar,\ - geotools 14.5/gt-epsg-wkt-14.5.jar,\ - geotools 14.5/gt-geotiff-14.5.jar,\ - geotools 14.5/gt-grid-14.5.jar,\ - geotools 14.5/gt-jdbc-14.5.jar,\ - geotools 14.5/gt-jdbc-db2-14.5.jar,\ - geotools 14.5/gt-jdbc-mysql-14.5.jar,\ - geotools 14.5/gt-jdbc-oracle-14.5.jar,\ - geotools 14.5/gt-jdbc-postgis-14.5.jar,\ - geotools 14.5/gt-jdbc-spatialite-14.5.jar,\ - geotools 14.5/gt-main-14.5.jar,\ - geotools 14.5/gt-metadata-14.5.jar,\ - geotools 14.5/gt-opengis-14.5.jar,\ - geotools 14.5/gt-process-14.5.jar,\ - geotools 14.5/gt-process-feature-14.5.jar,\ - geotools 14.5/gt-process-geometry-14.5.jar,\ - geotools 14.5/gt-referencing-14.5.jar,\ - geotools 14.5/gt-render-14.5.jar,\ - geotools 14.5/gt-shapefile-14.5.jar,\ - geotools 14.5/gt-transform-14.5.jar,\ - geotools 14.5/imageio-ext-arcgrid-1.1.13.jar,\ - geotools 14.5/imageio-ext-tiff-1.1.13.jar,\ - geotools 14.5/imageio-ext-utilities-1.1.13.jar,\ - geotools 14.5/jai_codec-1.1.3.jar,\ - geotools 14.5/jai_core-1.1.3.jar,\ - geotools 14.5/jai_imageio-1.1.jar,\ - geotools 14.5/jdom-1.1.3.jar,\ - geotools 14.5/json-simple-1.1.jar,\ - geotools 14.5/jsqlparser-0.3.14.jar,\ - geotools 14.5/jsr-275-1.0-beta-2.jar,\ - geotools 14.5/mysql-connector-java-5.1.17.jar,\ - geotools 14.5/postgresql-9.4-1201-jdbc41.jar,\ - geotools 14.5/spatialite-jdbc-3.7.2-2.4.jar,\ - geotools 14.5/sqlite-jdbc-3.8.6.jar,\ - geotools 14.5/jt-utilities-1.0.9.jar,\ - geotools 14.5/core-0.26.jar,\ streamex 0.6.7/,\ jgrapht 1.0.1/jgrapht-core-1.0.1.jar,\ kml/jars/JavaAPIforKml-2.2.1.jar,\ - jts 1.14/jars/jts-example-1.14.0.jar,\ - streamex 0.6.7/streamex-0.6.8.jar,\ kml/jars/jaxb-impl.jar,\ kml/jars/jaxb-api.jar,\ kml/jars/jaxb-core.jar,\ protobuf-java-3.6.1.jar,\ jfreechart-1.5.0.jar,\ - geotools 14.5/jt-affine-1.0.9.jar,\ - geotools 14.5/jt-algebra-1.0.9.jar,\ - geotools 14.5/jt-bandcombine-1.0.9.jar,\ - geotools 14.5/jt-bandmerge-1.0.9.jar,\ - geotools 14.5/jt-bandselect-1.0.9.jar,\ - geotools 14.5/jt-binarize-1.0.9.jar,\ - geotools 14.5/jt-border-1.0.9.jar,\ - geotools 14.5/jt-buffer-1.0.9.jar,\ - geotools 14.5/jt-classifier-1.0.9.jar,\ - geotools 14.5/jt-colorconvert-1.0.9.jar,\ - geotools 14.5/jt-colorindexer-1.0.9.jar,\ - geotools 14.5/jt-crop-1.0.9.jar,\ - geotools 14.5/jt-errordiffusion-1.0.9.jar,\ - geotools 14.5/jt-format-1.0.9.jar,\ - geotools 14.5/jt-imagefunction-1.0.9.jar,\ - geotools 14.5/jt-iterators-1.0.9.jar,\ - geotools 14.5/jt-lookup-1.0.9.jar,\ - geotools 14.5/jt-mosaic-1.0.9.jar,\ - geotools 14.5/jt-nullop-1.0.9.jar,\ - geotools 14.5/jt-orderdither-1.0.9.jar,\ - geotools 14.5/jt-piecewise-1.0.9.jar,\ - geotools 14.5/jt-rescale-1.0.9.jar,\ - geotools 14.5/jt-rlookup-1.0.9.jar,\ - geotools 14.5/jt-scale-1.0.9.jar,\ - geotools 14.5/jt-stats-1.0.9.jar,\ - geotools 14.5/jt-translate-1.0.9.jar,\ - geotools 14.5/jt-utils-1.4.0.jar,\ - geotools 14.5/jt-vectorbin-1.0.9.jar,\ - geotools 14.5/jt-vectorbinarize-1.4.0.jar,\ - geotools 14.5/jt-contour-1.4.0.jar,\ - geotools 14.5/jt-rangelookup-1.4.0.jar,\ - geotools 14.5/jt-vectorize-1.4.0.jar,\ - geotools 14.5/jt-warp-1.0.9.jar,\ - geotools 14.5/jt-zonal-1.0.9.jar,\ - geotools 14.5/jt-zonalstats-1.4.0.jar,\ - geotools 14.5/jgridshift-1.0.jar,\ - geotools 14.5/gt-geojson-14.5.jar,\ - geotools 14.5/gt-cql-14.5.jar,\ - geotools 14.5/gt-brewer-14.5.jar,\ - geotools 14.5/gt-coverage-14.5.jar,\ - geotools 14.5/imageio-ext-streams-1.1.13.jar,\ - geotools 14.5/imageio-ext-geocore-1.1.13.jar,\ - geotools 14.5/GeographicLib-Java-1.44.jar + geotools 21.4/batik-transcoder-1.10.jar,\ + geotools 21.4/commons-collections-3.2.2.jar,\ + geotools 21.4/commons-dbcp-1.4.jar,\ + geotools 21.4/commons-pool-1.5.4.jar,\ + geotools 21.4/ejml-ddense-0.34.jar,\ + geotools 21.4/geodb-0.9.jar,\ + geotools 21.4/GeographicLib-Java-1.49.jar,\ + geotools 21.4/gt-arcgrid-21.4.jar,\ + geotools 21.4/gt-brewer-21.4.jar,\ + geotools 21.4/gt-coverage-21.4.jar,\ + geotools 21.4/gt-cql-21.4.jar,\ + geotools 21.4/gt-epsg-wkt-21.4.jar,\ + geotools 21.4/gt-geojson-21.4.jar,\ + geotools 21.4/gt-geotiff-21.4.jar,\ + geotools 21.4/gt-grid-21.4.jar,\ + geotools 21.4/gt-jdbc-21.4.jar,\ + geotools 21.4/gt-jdbc-db2-21.4.jar,\ + geotools 21.4/gt-jdbc-mysql-21.4.jar,\ + geotools 21.4/gt-jdbc-oracle-21.4.jar,\ + geotools 21.4/gt-jdbc-postgis-21.4.jar,\ + geotools 21.4/gt-main-21.4.jar,\ + geotools 21.4/gt-metadata-21.4.jar,\ + geotools 21.4/gt-opengis-21.4.jar,\ + geotools 21.4/gt-process-21.4.jar,\ + geotools 21.4/gt-process-feature-21.4.jar,\ + geotools 21.4/gt-process-geometry-21.4.jar,\ + geotools 21.4/gt-referencing-21.4.jar,\ + geotools 21.4/gt-render-21.4.jar,\ + geotools 21.4/gt-shapefile-21.4.jar,\ + geotools 21.4/gt-transform-21.4.jar,\ + geotools 21.4/imageio-ext-arcgrid-1.2.3.jar,\ + geotools 21.4/imageio-ext-geocore-1.2.3.jar,\ + geotools 21.4/imageio-ext-streams-1.2.3.jar,\ + geotools 21.4/imageio-ext-tiff-1.2.3.jar,\ + geotools 21.4/imageio-ext-utilities-1.2.3.jar,\ + geotools 21.4/jai_codec-1.1.3.jar,\ + geotools 21.4/jai_core-1.1.3.jar,\ + geotools 21.4/jai_imageio-1.1.jar,\ + geotools 21.4/jdom2-2.0.6.jar,\ + geotools 21.4/jgridshift-1.0.jar,\ + geotools 21.4/json-simple-1.1.jar,\ + geotools 21.4/jsqlparser-0.3.14.jar,\ + geotools 21.4/jsr305-3.0.0.jar,\ + geotools 21.4/jt-affine-1.1.11.jar,\ + geotools 21.4/jt-algebra-1.1.11.jar,\ + geotools 21.4/jt-bandcombine-1.1.11.jar,\ + geotools 21.4/jt-bandmerge-1.1.11.jar,\ + geotools 21.4/jt-bandselect-1.1.11.jar,\ + geotools 21.4/jt-binarize-1.1.11.jar,\ + geotools 21.4/jt-border-1.1.11.jar,\ + geotools 21.4/jt-buffer-1.1.11.jar,\ + geotools 21.4/jt-classifier-1.1.11.jar,\ + geotools 21.4/jt-colorconvert-1.1.11.jar,\ + geotools 21.4/jt-colorindexer-1.1.11.jar,\ + geotools 21.4/jt-contour-1.5.0.jar,\ + geotools 21.4/jt-crop-1.1.11.jar,\ + geotools 21.4/jt-errordiffusion-1.1.11.jar,\ + geotools 21.4/jt-format-1.1.11.jar,\ + geotools 21.4/jt-imagefunction-1.1.11.jar,\ + geotools 21.4/jt-iterators-1.1.11.jar,\ + geotools 21.4/jt-jiffle-op-1.1.11.jar,\ + geotools 21.4/jt-lookup-1.1.11.jar,\ + geotools 21.4/jt-mosaic-1.1.11.jar,\ + geotools 21.4/jt-nullop-1.1.11.jar,\ + geotools 21.4/jt-orderdither-1.1.11.jar,\ + geotools 21.4/jt-piecewise-1.1.11.jar,\ + geotools 21.4/jt-rangelookup-1.5.0.jar,\ + geotools 21.4/jt-rescale-1.1.11.jar,\ + geotools 21.4/jt-rlookup-1.1.11.jar,\ + geotools 21.4/jt-scale-1.1.11.jar,\ + geotools 21.4/jt-scale2-1.1.11.jar,\ + geotools 21.4/jt-shadedrelief-1.1.11.jar,\ + geotools 21.4/jt-stats-1.1.11.jar,\ + geotools 21.4/jt-translate-1.1.11.jar,\ + geotools 21.4/jt-utilities-1.1.11.jar,\ + geotools 21.4/jt-utils-1.5.0.jar,\ + geotools 21.4/jt-vectorbin-1.1.11.jar,\ + geotools 21.4/jt-vectorbinarize-1.5.0.jar,\ + geotools 21.4/jt-vectorize-1.5.0.jar,\ + geotools 21.4/jt-warp-1.1.11.jar,\ + geotools 21.4/jt-zonal-1.1.11.jar,\ + geotools 21.4/jt-zonalstats-1.5.0.jar,\ + geotools 21.4/mysql-connector-java-5.1.46.jar,\ + geotools 21.4/postgresql-42.2.5.jar,\ + geotools 21.4/sqlite-jdbc-3.27.2.1.jar,\ + jts-1.17.1/jts-core-1.17.1.jar,\ + jts-1.17.1/jts-io-common-1.17.1.jar,\ + jsr 363/si-quantity-2.0.1.jar,\ + jsr 363/si-units-java8-1.3.1.jar,\ + jsr 363/systems-common-java8-1.3.jar,\ + jsr 363/unit-api-2.1.1.jar,\ + jsr 363/uom-lib-common-1.0.3.jar,\ + jsr 363/uom-se-1.0.10.jar,\ + streamex 0.6.7/streamex-0.6.8.jar,\ + geotools 21.4/gt-xsd-gml2-21.4.jar,\ + geotools 21.4/gt-xsd-gml3-21.4.jar,\ + geotools 21.4/gt-xsd-wfs-21.4.jar source.. = src/ output.. = bin/ bin.excludes = jgrapht 1.0.1/src.zip,\ diff --git a/msi.gama.ext/geotools 14.5/GeographicLib-Java-1.44.jar b/msi.gama.ext/geotools 14.5/GeographicLib-Java-1.44.jar deleted file mode 100644 index 338ca8e50d..0000000000 Binary files a/msi.gama.ext/geotools 14.5/GeographicLib-Java-1.44.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/batik-transcoder-1.7.jar b/msi.gama.ext/geotools 14.5/batik-transcoder-1.7.jar deleted file mode 100644 index 3934ed0a99..0000000000 Binary files a/msi.gama.ext/geotools 14.5/batik-transcoder-1.7.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/commons-collections-3.1.jar b/msi.gama.ext/geotools 14.5/commons-collections-3.1.jar deleted file mode 100644 index 41e230feea..0000000000 Binary files a/msi.gama.ext/geotools 14.5/commons-collections-3.1.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/core-0.26.jar b/msi.gama.ext/geotools 14.5/core-0.26.jar deleted file mode 100644 index 9452f17801..0000000000 Binary files a/msi.gama.ext/geotools 14.5/core-0.26.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/geodb-0.7-RC2.jar b/msi.gama.ext/geotools 14.5/geodb-0.7-RC2.jar deleted file mode 100644 index 87b6ba6e38..0000000000 Binary files a/msi.gama.ext/geotools 14.5/geodb-0.7-RC2.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-api-14.5.jar b/msi.gama.ext/geotools 14.5/gt-api-14.5.jar deleted file mode 100644 index 249330db5f..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-api-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-arcgrid-14.5.jar b/msi.gama.ext/geotools 14.5/gt-arcgrid-14.5.jar deleted file mode 100644 index df1caa66d1..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-arcgrid-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-brewer-14.5.jar b/msi.gama.ext/geotools 14.5/gt-brewer-14.5.jar deleted file mode 100644 index f7129d731e..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-brewer-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-coverage-14.5.jar b/msi.gama.ext/geotools 14.5/gt-coverage-14.5.jar deleted file mode 100644 index 09ccfa2913..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-coverage-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-cql-14.5.jar b/msi.gama.ext/geotools 14.5/gt-cql-14.5.jar deleted file mode 100644 index aa6761d3d4..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-cql-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-data-14.5.jar b/msi.gama.ext/geotools 14.5/gt-data-14.5.jar deleted file mode 100644 index ff93257c28..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-data-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-epsg-wkt-14.5.jar b/msi.gama.ext/geotools 14.5/gt-epsg-wkt-14.5.jar deleted file mode 100644 index 8a51a22cfe..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-epsg-wkt-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-geojson-14.5.jar b/msi.gama.ext/geotools 14.5/gt-geojson-14.5.jar deleted file mode 100644 index 7d164d90e4..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-geojson-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-geotiff-14.5.jar b/msi.gama.ext/geotools 14.5/gt-geotiff-14.5.jar deleted file mode 100644 index c586512042..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-geotiff-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-grid-14.5.jar b/msi.gama.ext/geotools 14.5/gt-grid-14.5.jar deleted file mode 100644 index eb6a6f5912..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-grid-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-jdbc-14.5.jar b/msi.gama.ext/geotools 14.5/gt-jdbc-14.5.jar deleted file mode 100644 index 107433a386..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-jdbc-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-jdbc-db2-14.5.jar b/msi.gama.ext/geotools 14.5/gt-jdbc-db2-14.5.jar deleted file mode 100644 index 175b943f46..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-jdbc-db2-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-jdbc-mysql-14.5.jar b/msi.gama.ext/geotools 14.5/gt-jdbc-mysql-14.5.jar deleted file mode 100644 index 4797750d40..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-jdbc-mysql-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-jdbc-oracle-14.5.jar b/msi.gama.ext/geotools 14.5/gt-jdbc-oracle-14.5.jar deleted file mode 100644 index 22f863f446..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-jdbc-oracle-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-jdbc-postgis-14.5.jar b/msi.gama.ext/geotools 14.5/gt-jdbc-postgis-14.5.jar deleted file mode 100644 index dbefb3bed9..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-jdbc-postgis-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-jdbc-spatialite-14.5.jar b/msi.gama.ext/geotools 14.5/gt-jdbc-spatialite-14.5.jar deleted file mode 100644 index e53b2aee1a..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-jdbc-spatialite-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-main-14.5.jar b/msi.gama.ext/geotools 14.5/gt-main-14.5.jar deleted file mode 100644 index 346d9831bd..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-main-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-metadata-14.5.jar b/msi.gama.ext/geotools 14.5/gt-metadata-14.5.jar deleted file mode 100644 index 10702e77ce..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-metadata-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-opengis-14.5.jar b/msi.gama.ext/geotools 14.5/gt-opengis-14.5.jar deleted file mode 100644 index aba399aca3..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-opengis-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-process-14.5.jar b/msi.gama.ext/geotools 14.5/gt-process-14.5.jar deleted file mode 100644 index 93e425393e..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-process-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-process-feature-14.5.jar b/msi.gama.ext/geotools 14.5/gt-process-feature-14.5.jar deleted file mode 100644 index 245efb4772..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-process-feature-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-process-geometry-14.5.jar b/msi.gama.ext/geotools 14.5/gt-process-geometry-14.5.jar deleted file mode 100644 index ba488e764c..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-process-geometry-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-referencing-14.5.jar b/msi.gama.ext/geotools 14.5/gt-referencing-14.5.jar deleted file mode 100644 index b9e9956934..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-referencing-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-render-14.5.jar b/msi.gama.ext/geotools 14.5/gt-render-14.5.jar deleted file mode 100644 index 8102d5b5f5..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-render-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-shapefile-14.5.jar b/msi.gama.ext/geotools 14.5/gt-shapefile-14.5.jar deleted file mode 100644 index b30e42ce4d..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-shapefile-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/gt-transform-14.5.jar b/msi.gama.ext/geotools 14.5/gt-transform-14.5.jar deleted file mode 100644 index 7195b3c8a3..0000000000 Binary files a/msi.gama.ext/geotools 14.5/gt-transform-14.5.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/imageio-ext-arcgrid-1.1.13.jar b/msi.gama.ext/geotools 14.5/imageio-ext-arcgrid-1.1.13.jar deleted file mode 100644 index c72c70e8d3..0000000000 Binary files a/msi.gama.ext/geotools 14.5/imageio-ext-arcgrid-1.1.13.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/imageio-ext-geocore-1.1.13.jar b/msi.gama.ext/geotools 14.5/imageio-ext-geocore-1.1.13.jar deleted file mode 100644 index 74eed7962b..0000000000 Binary files a/msi.gama.ext/geotools 14.5/imageio-ext-geocore-1.1.13.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/imageio-ext-streams-1.1.13.jar b/msi.gama.ext/geotools 14.5/imageio-ext-streams-1.1.13.jar deleted file mode 100644 index e948ddfc71..0000000000 Binary files a/msi.gama.ext/geotools 14.5/imageio-ext-streams-1.1.13.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/imageio-ext-tiff-1.1.13.jar b/msi.gama.ext/geotools 14.5/imageio-ext-tiff-1.1.13.jar deleted file mode 100644 index 97a5e02f92..0000000000 Binary files a/msi.gama.ext/geotools 14.5/imageio-ext-tiff-1.1.13.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/imageio-ext-utilities-1.1.13.jar b/msi.gama.ext/geotools 14.5/imageio-ext-utilities-1.1.13.jar deleted file mode 100644 index 75f6bd105f..0000000000 Binary files a/msi.gama.ext/geotools 14.5/imageio-ext-utilities-1.1.13.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jdom-1.1.3.jar b/msi.gama.ext/geotools 14.5/jdom-1.1.3.jar deleted file mode 100644 index a287727868..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jdom-1.1.3.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jsr-275-1.0-beta-2.jar b/msi.gama.ext/geotools 14.5/jsr-275-1.0-beta-2.jar deleted file mode 100644 index 68e19aa4d1..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jsr-275-1.0-beta-2.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-affine-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-affine-1.0.9.jar deleted file mode 100644 index 79984e9a72..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-affine-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-algebra-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-algebra-1.0.9.jar deleted file mode 100644 index a68da6557c..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-algebra-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-bandcombine-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-bandcombine-1.0.9.jar deleted file mode 100644 index 507ca55335..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-bandcombine-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-bandmerge-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-bandmerge-1.0.9.jar deleted file mode 100644 index 7df1b6a1c0..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-bandmerge-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-bandselect-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-bandselect-1.0.9.jar deleted file mode 100644 index c22e592ab0..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-bandselect-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-binarize-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-binarize-1.0.9.jar deleted file mode 100644 index 8a49a3f949..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-binarize-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-border-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-border-1.0.9.jar deleted file mode 100644 index f5b0c65bd5..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-border-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-buffer-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-buffer-1.0.9.jar deleted file mode 100644 index 23acf60cff..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-buffer-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-classifier-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-classifier-1.0.9.jar deleted file mode 100644 index 91754ec216..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-classifier-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-colorconvert-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-colorconvert-1.0.9.jar deleted file mode 100644 index f131c16671..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-colorconvert-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-colorindexer-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-colorindexer-1.0.9.jar deleted file mode 100644 index 9ffa519bc9..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-colorindexer-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-contour-1.4.0.jar b/msi.gama.ext/geotools 14.5/jt-contour-1.4.0.jar deleted file mode 100644 index 1ffaa69c9b..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-contour-1.4.0.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-crop-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-crop-1.0.9.jar deleted file mode 100644 index 77b34632d5..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-crop-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-errordiffusion-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-errordiffusion-1.0.9.jar deleted file mode 100644 index 03cdf2d6a9..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-errordiffusion-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-format-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-format-1.0.9.jar deleted file mode 100644 index 5278319d5b..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-format-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-imagefunction-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-imagefunction-1.0.9.jar deleted file mode 100644 index d29c9edce6..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-imagefunction-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-iterators-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-iterators-1.0.9.jar deleted file mode 100644 index d68aaaf15c..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-iterators-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-lookup-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-lookup-1.0.9.jar deleted file mode 100644 index b7074892aa..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-lookup-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-mosaic-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-mosaic-1.0.9.jar deleted file mode 100644 index b4ead17a1e..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-mosaic-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-nullop-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-nullop-1.0.9.jar deleted file mode 100644 index 93736a7780..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-nullop-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-orderdither-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-orderdither-1.0.9.jar deleted file mode 100644 index 30d17c8bb8..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-orderdither-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-piecewise-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-piecewise-1.0.9.jar deleted file mode 100644 index 14425da426..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-piecewise-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-rangelookup-1.4.0.jar b/msi.gama.ext/geotools 14.5/jt-rangelookup-1.4.0.jar deleted file mode 100644 index 39cc663b2d..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-rangelookup-1.4.0.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-rescale-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-rescale-1.0.9.jar deleted file mode 100644 index 0b49d3b308..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-rescale-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-rlookup-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-rlookup-1.0.9.jar deleted file mode 100644 index 7e0cf5a87c..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-rlookup-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-scale-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-scale-1.0.9.jar deleted file mode 100644 index 7273ddeb98..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-scale-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-stats-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-stats-1.0.9.jar deleted file mode 100644 index 88b162d253..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-stats-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-translate-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-translate-1.0.9.jar deleted file mode 100644 index c59ed9fa86..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-translate-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-utilities-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-utilities-1.0.9.jar deleted file mode 100644 index 62a18859b5..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-utilities-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-utils-1.4.0.jar b/msi.gama.ext/geotools 14.5/jt-utils-1.4.0.jar deleted file mode 100644 index 99afd47de5..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-utils-1.4.0.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-vectorbin-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-vectorbin-1.0.9.jar deleted file mode 100644 index 0f76bd5fc9..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-vectorbin-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-vectorbinarize-1.4.0.jar b/msi.gama.ext/geotools 14.5/jt-vectorbinarize-1.4.0.jar deleted file mode 100644 index a96b79f70e..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-vectorbinarize-1.4.0.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-vectorize-1.4.0.jar b/msi.gama.ext/geotools 14.5/jt-vectorize-1.4.0.jar deleted file mode 100644 index 75b68e8c97..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-vectorize-1.4.0.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-warp-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-warp-1.0.9.jar deleted file mode 100644 index 3d11a6b0de..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-warp-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-zonal-1.0.9.jar b/msi.gama.ext/geotools 14.5/jt-zonal-1.0.9.jar deleted file mode 100644 index c46abf57b7..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-zonal-1.0.9.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/jt-zonalstats-1.4.0.jar b/msi.gama.ext/geotools 14.5/jt-zonalstats-1.4.0.jar deleted file mode 100644 index 3c52f32e36..0000000000 Binary files a/msi.gama.ext/geotools 14.5/jt-zonalstats-1.4.0.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/license/Bitstream-Vera-Fonts b/msi.gama.ext/geotools 14.5/license/Bitstream-Vera-Fonts deleted file mode 100644 index e651be1c4f..0000000000 --- a/msi.gama.ext/geotools 14.5/license/Bitstream-Vera-Fonts +++ /dev/null @@ -1,124 +0,0 @@ -Bitstream Vera Fonts Copyright - -The fonts have a generous copyright, allowing derivative works (as -long as "Bitstream" or "Vera" are not in the names), and full -redistribution (so long as they are not *sold* by themselves). They -can be be bundled, redistributed and sold with any software. - -The fonts are distributed under the following copyright: - -Copyright -========= - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream -Vera is a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the fonts accompanying this license ("Fonts") and associated -documentation files (the "Font Software"), to reproduce and distribute -the Font Software, including without limitation the rights to use, -copy, merge, publish, distribute, and/or sell copies of the Font -Software, and to permit persons to whom the Font Software is furnished -to do so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice -shall be included in all copies of one or more of the Font Software -typefaces. - -The Font Software may be modified, altered, or added to, and in -particular the designs of glyphs or characters in the Fonts may be -modified and additional glyphs or characters may be added to the -Fonts, only if the fonts are renamed to names not containing either -the words "Bitstream" or the word "Vera". - -This License becomes null and void to the extent applicable to Fonts -or Font Software that has been modified and is distributed under the -"Bitstream Vera" names. - -The Font Software may be sold as part of a larger software package but -no copy of one or more of the Font Software typefaces may be sold by -itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL -BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, -OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT -SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - -Except as contained in this notice, the names of Gnome, the Gnome -Foundation, and Bitstream Inc., shall not be used in advertising or -otherwise to promote the sale, use or other dealings in this Font -Software without prior written authorization from the Gnome Foundation -or Bitstream Inc., respectively. For further information, contact: -fonts at gnome dot org. - -Copyright FAQ -============= - - 1. I don't understand the resale restriction... What gives? - - Bitstream is giving away these fonts, but wishes to ensure its - competitors can't just drop the fonts as is into a font sale system - and sell them as is. It seems fair that if Bitstream can't make money - from the Bitstream Vera fonts, their competitors should not be able to - do so either. You can sell the fonts as part of any software package, - however. - - 2. I want to package these fonts separately for distribution and - sale as part of a larger software package or system. Can I do so? - - Yes. A RPM or Debian package is a "larger software package" to begin - with, and you aren't selling them independently by themselves. - See 1. above. - - 3. Are derivative works allowed? - Yes! - - 4. Can I change or add to the font(s)? - Yes, but you must change the name(s) of the font(s). - - 5. Under what terms are derivative works allowed? - - You must change the name(s) of the fonts. This is to ensure the - quality of the fonts, both to protect Bitstream and Gnome. We want to - ensure that if an application has opened a font specifically of these - names, it gets what it expects (though of course, using fontconfig, - substitutions could still could have occurred during font - opening). You must include the Bitstream copyright. Additional - copyrights can be added, as per copyright law. Happy Font Hacking! - - 6. If I have improvements for Bitstream Vera, is it possible they might get - adopted in future versions? - - Yes. The contract between the Gnome Foundation and Bitstream has - provisions for working with Bitstream to ensure quality additions to - the Bitstream Vera font family. Please contact us if you have such - additions. Note, that in general, we will want such additions for the - entire family, not just a single font, and that you'll have to keep - both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add - glyphs to the font, they must be stylistically in keeping with Vera's - design. Vera cannot become a "ransom note" font. Jim Lyles will be - providing a document describing the design elements used in Vera, as a - guide and aid for people interested in contributing to Vera. - - 7. I want to sell a software package that uses these fonts: Can I do so? - - Sure. Bundle the fonts with your software and sell your software - with the fonts. That is the intent of the copyright. - - 8. If applications have built the names "Bitstream Vera" into them, - can I override this somehow to use fonts of my choosing? - - This depends on exact details of the software. Most open source - systems and software (e.g., Gnome, KDE, etc.) are now converting to - use fontconfig (see www.fontconfig.org) to handle font configuration, - selection and substitution; it has provisions for overriding font - names and subsituting alternatives. An example is provided by the - supplied local.conf file, which chooses the family Bitstream Vera for - "sans", "serif" and "monospace". Other software (e.g., the XFree86 - core server) has other mechanisms for font substitution. - diff --git a/msi.gama.ext/geotools 14.5/license/COLORBREWER b/msi.gama.ext/geotools 14.5/license/COLORBREWER deleted file mode 100644 index c1dfe2c714..0000000000 --- a/msi.gama.ext/geotools 14.5/license/COLORBREWER +++ /dev/null @@ -1,35 +0,0 @@ - (used in the Brewer module) - -Apache-Style Software License for ColorBrewer Color Schemes - -Copyright (c) 2002 Cynthia Brewer, Mark Harrower, and The Pennsylvania State University. - -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. - -For guidance on attribution and permissions: - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: -1. Redistributions as source code must retain the above copyright notice, this -list of conditions and the following disclaimer. -2. The end-user documentation included with the redistribution, if any, must -include the following acknowledgment: -"This product includes color specifications and designs developed by Cynthia -Brewer (http://colorbrewer.org/)." -Alternately, this acknowledgment may appear in the software itself, if and -wherever such third-party acknowledgments normally appear. -4. The name "ColorBrewer" must not be used to endorse or promote products derived -from this software without prior written permission. For written permission, -please contact Cynthia Brewer at cbrewer@psu.edu. -5. Products derived from this software may not be called "ColorBrewer", nor may -"ColorBrewer" appear in their name, without prior written permission of Cynthia -Brewer. diff --git a/msi.gama.ext/geotools 14.5/license/EPSG.html b/msi.gama.ext/geotools 14.5/license/EPSG.html deleted file mode 100644 index acc7f134f6..0000000000 --- a/msi.gama.ext/geotools 14.5/license/EPSG.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - EPSG license - - -

Copyright (c) 1993-2006, OGP Surveying & Positioning Committee

- -
-

The EPSG geodetic parameter dataset is owned jointly and severally by the - members of the Surveying and Positioning Committee of the International Association - of Oil and Gas Producers (OGP), formerly the European Petroleum Survey Group (EPSG). - It is compiled by the Geodetic Subcommittee of the OGP from publicly available and - member-supplied information and distributed at no charge through the internet. The - data may be copied and distributed subject to the following conditions:

-
    -

  1. The user assumes the entire risk as to the accuracy and the use of this data. - INFORMATION PROVIDED IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER - EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

    2. - -

  2. All data pertinent to a specific coordinate reference system must be copied - without modification and all related pages/records must be included;

    3. - -

  3. The data may not be distributed for profit by any third party; and

    4. - -

  4. The original source [OGP / EPSG] must be acknowledged.

    5. -
- -

With regard to (3) above, the data may be included within propriatory applications - distributed on a commercial basis when the commerciality is based on application - functionality and not on a value ascribed to the freely-distributed OGP data.

- -

Source: www.epsg.org

-
- - diff --git a/msi.gama.ext/geotools 14.5/license/GPL+CP b/msi.gama.ext/geotools 14.5/license/GPL+CP deleted file mode 100644 index eb0652a532..0000000000 --- a/msi.gama.ext/geotools 14.5/license/GPL+CP +++ /dev/null @@ -1,351 +0,0 @@ - - The GNU General Public License with CLASSPATH Exception (GPL+CE) - - -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., 59 - Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Sun Microsystems, Inc. are subject to -the following clarification and special exception to the GPL, but only where -Sun has expressly included in the particular source file's header the words -"Sun designates this particular file as subject to the "Classpath" exception -as provided by Sun in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/msi.gama.ext/geotools 14.5/license/GeoTools.html b/msi.gama.ext/geotools 14.5/license/GeoTools.html deleted file mode 100644 index ca57329614..0000000000 --- a/msi.gama.ext/geotools 14.5/license/GeoTools.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - License for the GeoTools geospatial Library - - -

GeoTools - The Open Source Java GIS Toolkit
- http://geotools.org

-

(C) 2014, Open Source Geospatial Foundation (OSGeo)

- -

- The files in this library are part of Geotools, an open source Java GIS - toolkit. See http://geotools.org/ for details on the project. -

- -

- Files written entirely by the project are mostly covered by a copyright - of the Open Source Geospatial Foundation (OSGeo) as documented in the - file headers. See http://osgeo.org/ for details on the Foundation. Such - files are licensed to all under the terms of the GNU Lesser General Public - License (LGPL), version 2 or later. The directory containing this file - should also contain a copy of the LGPL, as a file named LGPL. -

- -

- Some files or portions of files are licensed under a different license as - documented in the headers of individual files. A copy of any license which - is not designed to be included in the file header itself should be included - along side this file: look for files with names such as GPL+CP. -

- -

- The standard header for the project is as follows: -

-
-

- This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; - version 2.1 of the License. -

- -

- This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General - Public License for more details.

-
- - - diff --git a/msi.gama.ext/geotools 14.5/license/HSQL.html b/msi.gama.ext/geotools 14.5/license/HSQL.html deleted file mode 100644 index a9efcca648..0000000000 --- a/msi.gama.ext/geotools 14.5/license/HSQL.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - HSQL license - - -

Copyright (c) 2001-2004, The HSQL Development Group
- All rights reserved.

- -
-

Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met:

-
    -

  1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer.

    2. - -

  2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution.

    3. - -

  3. Neither the name of the HSQL Development Group nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission.

    4. -
- -

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- -

Source: www.hsqldb.org

-
- - diff --git a/msi.gama.ext/geotools 14.5/license/LGPL b/msi.gama.ext/geotools 14.5/license/LGPL deleted file mode 100644 index 9ef3d701d1..0000000000 --- a/msi.gama.ext/geotools 14.5/license/LGPL +++ /dev/null @@ -1,503 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - diff --git a/msi.gama.ext/geotools 14.5/license/LICENSE b/msi.gama.ext/geotools 14.5/license/LICENSE deleted file mode 100644 index 30468459cc..0000000000 --- a/msi.gama.ext/geotools 14.5/license/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ - - The files in this library are part of Geotools, an open source Java GIS - toolkit. See http://geotools.org/ for details on the project. - - Files written entirely by the project are mostly covered by a copyright - of the Open Source Geospatial Foundation (OSGeo) as documented in the - file headers. See http://osgeo.org/ for details on the Foundation. Such - files are licensed to all under the terms of the GNU Lesser General Public - License (LGPL), version 2 or later. The directory containing this file - should also contain a copy of the LGPL, as a file named LGPL. - - Some files or portions of files are licensed under a different license as - documented in the headers of individual files. A copy of any license which - is not designed to be included in the file header itself should be included - along side this file: look for files with names such as GPL+CP. - - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. diff --git a/msi.gama.ext/geotools 14.5/license/OGC b/msi.gama.ext/geotools 14.5/license/OGC deleted file mode 100644 index 10549e0dba..0000000000 --- a/msi.gama.ext/geotools 14.5/license/OGC +++ /dev/null @@ -1,38 +0,0 @@ -This OGC work (including software, documents, or other related items) is being -provided by the copyright holders under the following license. By obtaining, -using and/or copying this work, you (the licensee) agree that you have read, -understood, and will comply with the following terms and conditions: - -Permission to use, copy, and modify this software and its documentation, with -or without modification, for any purpose and without fee or royalty is hereby -granted, provided that you include the following on ALL copies of the software -and documentation or portions thereof, including modifications, that you make: - - 1. The full text of this NOTICE in a location viewable to users of the - redistributed or derivative work. - - 2. Any pre-existing intellectual property disclaimers, notices, or terms and - conditions. If none exist, a short notice of the following form (hypertext - is preferred, text is permitted) should be used within the body of any - redistributed or derivative code: "Copyright © [$date-of-document] Open - Geospatial Consortium, Inc. All Rights Reserved. - http://www.opengeospatial.org/Legal/ - (Hypertext is preferred, but a textual representation is permitted.) - - 3. Notice of any changes or modifications to the OGC files, including the - date changes were made. (We recommend you provide URIs to the location - from which the code is derived.) - -THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE -NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED -TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT -THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY -PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. - -COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION. - -The name and trademarks of copyright holders may NOT be used in advertising or -publicity pertaining to the software without specific, written prior permission. -Title to copyright in this software and any associated documentation will at all -times remain with copyright holders. diff --git a/msi.gama.ext/geotools 14.5/license/PostgreSQL.html b/msi.gama.ext/geotools 14.5/license/PostgreSQL.html deleted file mode 100644 index 3f2d8fc796..0000000000 --- a/msi.gama.ext/geotools 14.5/license/PostgreSQL.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - PostgreSQL JDBC driver license - - -

Copyright (c) 1997-2005, PostgreSQL Global Development Group
- All rights reserved.

- -
-

Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met:

-
    -

  1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer.

    2. - -

  2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution.

    3. - -

  3. Neither the name of the PostgreSQL Global Development Group nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission.

    4. -
- -

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE.

- -

Source: jdbc.postgresql.org

-
- - diff --git a/msi.gama.ext/geotools 14.5/license/W3C b/msi.gama.ext/geotools 14.5/license/W3C deleted file mode 100644 index fed7fd37d8..0000000000 --- a/msi.gama.ext/geotools 14.5/license/W3C +++ /dev/null @@ -1,44 +0,0 @@ -W3C SOFTWARE NOTICE AND LICENSE -------------------------------------------------------------------------------------------- -This work (and included software, documentation such as READMEs, or other related items) is -being provided by the copyright holders under the following license. - -License -------------------------------------------------------------------------------------------- -By obtaining, using and/or copying this work, you (the licensee) agree that you have read, -understood, and will comply with the following terms and conditions. -Permission to copy, modify, and distribute this software and its documentation, with or -without modification, for any purpose and without fee or royalty is hereby granted, provided -that you include the following on ALL copies of the software and documentation or portions -thereof, including modifications: -The full text of this NOTICE in a location viewable to users of the redistributed or -derivative work. -Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none -exist, the W3C Software Short Notice should be included (hypertext is preferred, text is -permitted) within the body of any redistributed or derivative code. -Notice of any changes or modifications to the files, including the date changes were made. -(We recommend you provide URIs to the location from which the code is derived.) - -Disclaimers -------------------------------------------------------------------------------------------- -THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO -REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES -OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR -DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER -RIGHTS. -COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL -DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION. -The name and trademarks of copyright holders may NOT be used in advertising or publicity -pertaining to the software without specific, written prior permission. Title to copyright in -this software and any associated documentation will at all times remain with copyright holders. - -Notes -------------------------------------------------------------------------------------------- -This version: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 -This formulation of W3C's notice and license became active on December 31 2002. This version -removes the copyright ownership notice such that this license can be used with materials -other than those owned by the W3C, reflects that ERCIM is now a host of the W3C, includes -references to this specific dated version of the license, and removes the ambiguous grant of -"use". Otherwise, this version is the same as the previous version and is written so as to -preserve the Free Software Foundation's assessment of GPL compatibility and OSI's -certification under the Open Source Definition. \ No newline at end of file diff --git a/msi.gama.ext/geotools 14.5/mysql-connector-java-5.1.17.jar b/msi.gama.ext/geotools 14.5/mysql-connector-java-5.1.17.jar deleted file mode 100644 index 026dc397cb..0000000000 Binary files a/msi.gama.ext/geotools 14.5/mysql-connector-java-5.1.17.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/postgresql-9.4-1201-jdbc41.jar b/msi.gama.ext/geotools 14.5/postgresql-9.4-1201-jdbc41.jar deleted file mode 100644 index a3f19593fb..0000000000 Binary files a/msi.gama.ext/geotools 14.5/postgresql-9.4-1201-jdbc41.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/spatialite-jdbc-3.7.2-2.4.jar b/msi.gama.ext/geotools 14.5/spatialite-jdbc-3.7.2-2.4.jar deleted file mode 100644 index 4538200920..0000000000 Binary files a/msi.gama.ext/geotools 14.5/spatialite-jdbc-3.7.2-2.4.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 14.5/sqlite-jdbc-3.8.6.jar b/msi.gama.ext/geotools 14.5/sqlite-jdbc-3.8.6.jar deleted file mode 100644 index 6ac44c31e3..0000000000 Binary files a/msi.gama.ext/geotools 14.5/sqlite-jdbc-3.8.6.jar and /dev/null differ diff --git a/msi.gama.ext/geotools 21.4/GeographicLib-Java-1.49.jar b/msi.gama.ext/geotools 21.4/GeographicLib-Java-1.49.jar new file mode 100644 index 0000000000..c75593380f Binary files /dev/null and b/msi.gama.ext/geotools 21.4/GeographicLib-Java-1.49.jar differ diff --git a/msi.gama.ext/geotools 21.4/batik-transcoder-1.10.jar b/msi.gama.ext/geotools 21.4/batik-transcoder-1.10.jar new file mode 100644 index 0000000000..351a0d59d0 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/batik-transcoder-1.10.jar differ diff --git a/msi.gama.ext/geotools 21.4/commons-collections-3.2.2.jar b/msi.gama.ext/geotools 21.4/commons-collections-3.2.2.jar new file mode 100644 index 0000000000..fa5df82a63 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/commons-collections-3.2.2.jar differ diff --git a/msi.gama.ext/geotools 14.5/commons-dbcp-1.4.jar b/msi.gama.ext/geotools 21.4/commons-dbcp-1.4.jar similarity index 100% rename from msi.gama.ext/geotools 14.5/commons-dbcp-1.4.jar rename to msi.gama.ext/geotools 21.4/commons-dbcp-1.4.jar diff --git a/msi.gama.ext/geotools 14.5/commons-pool-1.5.4.jar b/msi.gama.ext/geotools 21.4/commons-pool-1.5.4.jar similarity index 100% rename from msi.gama.ext/geotools 14.5/commons-pool-1.5.4.jar rename to msi.gama.ext/geotools 21.4/commons-pool-1.5.4.jar diff --git a/msi.gama.ext/geotools 21.4/ejml-ddense-0.34.jar b/msi.gama.ext/geotools 21.4/ejml-ddense-0.34.jar new file mode 100644 index 0000000000..2339a1a966 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/ejml-ddense-0.34.jar differ diff --git a/msi.gama.ext/geotools 21.4/geodb-0.9.jar b/msi.gama.ext/geotools 21.4/geodb-0.9.jar new file mode 100644 index 0000000000..416178ee1c Binary files /dev/null and b/msi.gama.ext/geotools 21.4/geodb-0.9.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-arcgrid-21.4.jar b/msi.gama.ext/geotools 21.4/gt-arcgrid-21.4.jar new file mode 100644 index 0000000000..aefc4faa13 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-arcgrid-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-brewer-21.4.jar b/msi.gama.ext/geotools 21.4/gt-brewer-21.4.jar new file mode 100644 index 0000000000..9098cf3152 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-brewer-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-coverage-21.4.jar b/msi.gama.ext/geotools 21.4/gt-coverage-21.4.jar new file mode 100644 index 0000000000..0b5946ec27 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-coverage-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-cql-21.4.jar b/msi.gama.ext/geotools 21.4/gt-cql-21.4.jar new file mode 100644 index 0000000000..95ad81e824 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-cql-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-epsg-wkt-21.4.jar b/msi.gama.ext/geotools 21.4/gt-epsg-wkt-21.4.jar new file mode 100644 index 0000000000..69aaf78750 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-epsg-wkt-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-geojson-21.4.jar b/msi.gama.ext/geotools 21.4/gt-geojson-21.4.jar new file mode 100644 index 0000000000..cc8abce193 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-geojson-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-geotiff-21.4.jar b/msi.gama.ext/geotools 21.4/gt-geotiff-21.4.jar new file mode 100644 index 0000000000..a050235a20 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-geotiff-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-grid-21.4.jar b/msi.gama.ext/geotools 21.4/gt-grid-21.4.jar new file mode 100644 index 0000000000..f14067016b Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-grid-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-jdbc-21.4.jar b/msi.gama.ext/geotools 21.4/gt-jdbc-21.4.jar new file mode 100644 index 0000000000..79d9b3aae9 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-jdbc-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-jdbc-db2-21.4.jar b/msi.gama.ext/geotools 21.4/gt-jdbc-db2-21.4.jar new file mode 100644 index 0000000000..a48a562938 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-jdbc-db2-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-jdbc-mysql-21.4.jar b/msi.gama.ext/geotools 21.4/gt-jdbc-mysql-21.4.jar new file mode 100644 index 0000000000..011dbdb8e3 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-jdbc-mysql-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-jdbc-oracle-21.4.jar b/msi.gama.ext/geotools 21.4/gt-jdbc-oracle-21.4.jar new file mode 100644 index 0000000000..07401750b0 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-jdbc-oracle-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-jdbc-postgis-21.4.jar b/msi.gama.ext/geotools 21.4/gt-jdbc-postgis-21.4.jar new file mode 100644 index 0000000000..18beacf0d5 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-jdbc-postgis-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-main-21.4.jar b/msi.gama.ext/geotools 21.4/gt-main-21.4.jar new file mode 100644 index 0000000000..5cccc73ba0 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-main-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-metadata-21.4.jar b/msi.gama.ext/geotools 21.4/gt-metadata-21.4.jar new file mode 100644 index 0000000000..2dafcb4343 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-metadata-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-opengis-21.4.jar b/msi.gama.ext/geotools 21.4/gt-opengis-21.4.jar new file mode 100644 index 0000000000..1a087748f8 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-opengis-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-process-21.4.jar b/msi.gama.ext/geotools 21.4/gt-process-21.4.jar new file mode 100644 index 0000000000..7dacba186c Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-process-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-process-feature-21.4.jar b/msi.gama.ext/geotools 21.4/gt-process-feature-21.4.jar new file mode 100644 index 0000000000..c7d824bd15 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-process-feature-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-process-geometry-21.4.jar b/msi.gama.ext/geotools 21.4/gt-process-geometry-21.4.jar new file mode 100644 index 0000000000..7f164c4f9b Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-process-geometry-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-referencing-21.4.jar b/msi.gama.ext/geotools 21.4/gt-referencing-21.4.jar new file mode 100644 index 0000000000..f94ac7dfd5 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-referencing-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-render-21.4.jar b/msi.gama.ext/geotools 21.4/gt-render-21.4.jar new file mode 100644 index 0000000000..19028b6107 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-render-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-shapefile-21.4.jar b/msi.gama.ext/geotools 21.4/gt-shapefile-21.4.jar new file mode 100644 index 0000000000..a78e22c46d Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-shapefile-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-transform-21.4.jar b/msi.gama.ext/geotools 21.4/gt-transform-21.4.jar new file mode 100644 index 0000000000..6fdcb234cf Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-transform-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-xsd-gml2-21.4.jar b/msi.gama.ext/geotools 21.4/gt-xsd-gml2-21.4.jar new file mode 100644 index 0000000000..05ef4d67af Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-xsd-gml2-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-xsd-gml3-21.4.jar b/msi.gama.ext/geotools 21.4/gt-xsd-gml3-21.4.jar new file mode 100644 index 0000000000..41d72b18d1 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-xsd-gml3-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/gt-xsd-wfs-21.4.jar b/msi.gama.ext/geotools 21.4/gt-xsd-wfs-21.4.jar new file mode 100644 index 0000000000..0037013cfc Binary files /dev/null and b/msi.gama.ext/geotools 21.4/gt-xsd-wfs-21.4.jar differ diff --git a/msi.gama.ext/geotools 21.4/imageio-ext-arcgrid-1.2.3.jar b/msi.gama.ext/geotools 21.4/imageio-ext-arcgrid-1.2.3.jar new file mode 100644 index 0000000000..40b206064a Binary files /dev/null and b/msi.gama.ext/geotools 21.4/imageio-ext-arcgrid-1.2.3.jar differ diff --git a/msi.gama.ext/geotools 21.4/imageio-ext-geocore-1.2.3.jar b/msi.gama.ext/geotools 21.4/imageio-ext-geocore-1.2.3.jar new file mode 100644 index 0000000000..6c6dc9a4b4 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/imageio-ext-geocore-1.2.3.jar differ diff --git a/msi.gama.ext/geotools 21.4/imageio-ext-streams-1.2.3.jar b/msi.gama.ext/geotools 21.4/imageio-ext-streams-1.2.3.jar new file mode 100644 index 0000000000..6a7230f930 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/imageio-ext-streams-1.2.3.jar differ diff --git a/msi.gama.ext/geotools 21.4/imageio-ext-tiff-1.2.3.jar b/msi.gama.ext/geotools 21.4/imageio-ext-tiff-1.2.3.jar new file mode 100644 index 0000000000..3f1d6b52c4 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/imageio-ext-tiff-1.2.3.jar differ diff --git a/msi.gama.ext/geotools 21.4/imageio-ext-utilities-1.2.3.jar b/msi.gama.ext/geotools 21.4/imageio-ext-utilities-1.2.3.jar new file mode 100644 index 0000000000..bf37245dc6 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/imageio-ext-utilities-1.2.3.jar differ diff --git a/msi.gama.ext/geotools 14.5/jai_codec-1.1.3.jar b/msi.gama.ext/geotools 21.4/jai_codec-1.1.3.jar similarity index 100% rename from msi.gama.ext/geotools 14.5/jai_codec-1.1.3.jar rename to msi.gama.ext/geotools 21.4/jai_codec-1.1.3.jar diff --git a/msi.gama.ext/geotools 14.5/jai_core-1.1.3.jar b/msi.gama.ext/geotools 21.4/jai_core-1.1.3.jar similarity index 100% rename from msi.gama.ext/geotools 14.5/jai_core-1.1.3.jar rename to msi.gama.ext/geotools 21.4/jai_core-1.1.3.jar diff --git a/msi.gama.ext/geotools 14.5/jai_imageio-1.1.jar b/msi.gama.ext/geotools 21.4/jai_imageio-1.1.jar similarity index 100% rename from msi.gama.ext/geotools 14.5/jai_imageio-1.1.jar rename to msi.gama.ext/geotools 21.4/jai_imageio-1.1.jar diff --git a/msi.gama.ext/geotools 21.4/jdom2-2.0.6.jar b/msi.gama.ext/geotools 21.4/jdom2-2.0.6.jar new file mode 100644 index 0000000000..2850ca10cf Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jdom2-2.0.6.jar differ diff --git a/msi.gama.ext/geotools 14.5/jgridshift-1.0.jar b/msi.gama.ext/geotools 21.4/jgridshift-1.0.jar similarity index 100% rename from msi.gama.ext/geotools 14.5/jgridshift-1.0.jar rename to msi.gama.ext/geotools 21.4/jgridshift-1.0.jar diff --git a/msi.gama.ext/geotools 14.5/json-simple-1.1.jar b/msi.gama.ext/geotools 21.4/json-simple-1.1.jar similarity index 100% rename from msi.gama.ext/geotools 14.5/json-simple-1.1.jar rename to msi.gama.ext/geotools 21.4/json-simple-1.1.jar diff --git a/msi.gama.ext/geotools 14.5/jsqlparser-0.3.14.jar b/msi.gama.ext/geotools 21.4/jsqlparser-0.3.14.jar similarity index 100% rename from msi.gama.ext/geotools 14.5/jsqlparser-0.3.14.jar rename to msi.gama.ext/geotools 21.4/jsqlparser-0.3.14.jar diff --git a/msi.gama.ext/geotools 21.4/jsr305-3.0.0.jar b/msi.gama.ext/geotools 21.4/jsr305-3.0.0.jar new file mode 100644 index 0000000000..cc39b7383d Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jsr305-3.0.0.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-affine-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-affine-1.1.11.jar new file mode 100644 index 0000000000..ba0c645408 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-affine-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-algebra-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-algebra-1.1.11.jar new file mode 100644 index 0000000000..5806ce3b7b Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-algebra-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-bandcombine-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-bandcombine-1.1.11.jar new file mode 100644 index 0000000000..ec2945ba69 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-bandcombine-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-bandmerge-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-bandmerge-1.1.11.jar new file mode 100644 index 0000000000..6d367d3d7f Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-bandmerge-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-bandselect-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-bandselect-1.1.11.jar new file mode 100644 index 0000000000..d3e9cd67e5 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-bandselect-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-binarize-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-binarize-1.1.11.jar new file mode 100644 index 0000000000..06e4c2c255 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-binarize-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-border-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-border-1.1.11.jar new file mode 100644 index 0000000000..411ec39830 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-border-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-buffer-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-buffer-1.1.11.jar new file mode 100644 index 0000000000..b01c37e91f Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-buffer-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-classifier-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-classifier-1.1.11.jar new file mode 100644 index 0000000000..f122ef7c9d Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-classifier-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-colorconvert-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-colorconvert-1.1.11.jar new file mode 100644 index 0000000000..a36fcbaa87 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-colorconvert-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-colorindexer-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-colorindexer-1.1.11.jar new file mode 100644 index 0000000000..7aa99f3695 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-colorindexer-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-contour-1.5.0.jar b/msi.gama.ext/geotools 21.4/jt-contour-1.5.0.jar new file mode 100644 index 0000000000..5bd1709ce6 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-contour-1.5.0.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-crop-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-crop-1.1.11.jar new file mode 100644 index 0000000000..481ec0e784 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-crop-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-errordiffusion-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-errordiffusion-1.1.11.jar new file mode 100644 index 0000000000..0e072de71a Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-errordiffusion-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-format-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-format-1.1.11.jar new file mode 100644 index 0000000000..ba87f31756 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-format-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-imagefunction-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-imagefunction-1.1.11.jar new file mode 100644 index 0000000000..8ce8b4dec2 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-imagefunction-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-iterators-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-iterators-1.1.11.jar new file mode 100644 index 0000000000..344ca27dfe Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-iterators-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-jiffle-op-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-jiffle-op-1.1.11.jar new file mode 100644 index 0000000000..5ac651afe1 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-jiffle-op-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-lookup-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-lookup-1.1.11.jar new file mode 100644 index 0000000000..02074566fa Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-lookup-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-mosaic-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-mosaic-1.1.11.jar new file mode 100644 index 0000000000..0fb60cfa07 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-mosaic-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-nullop-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-nullop-1.1.11.jar new file mode 100644 index 0000000000..7065f30676 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-nullop-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-orderdither-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-orderdither-1.1.11.jar new file mode 100644 index 0000000000..b2077a137d Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-orderdither-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-piecewise-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-piecewise-1.1.11.jar new file mode 100644 index 0000000000..70cf7dd5ed Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-piecewise-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-rangelookup-1.5.0.jar b/msi.gama.ext/geotools 21.4/jt-rangelookup-1.5.0.jar new file mode 100644 index 0000000000..eabe6a7165 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-rangelookup-1.5.0.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-rescale-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-rescale-1.1.11.jar new file mode 100644 index 0000000000..dba7fc6ed4 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-rescale-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-rlookup-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-rlookup-1.1.11.jar new file mode 100644 index 0000000000..4be9da33b7 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-rlookup-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-scale-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-scale-1.1.11.jar new file mode 100644 index 0000000000..979abae719 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-scale-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-scale2-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-scale2-1.1.11.jar new file mode 100644 index 0000000000..6b23f6872b Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-scale2-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-shadedrelief-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-shadedrelief-1.1.11.jar new file mode 100644 index 0000000000..3248494ffa Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-shadedrelief-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-stats-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-stats-1.1.11.jar new file mode 100644 index 0000000000..e7dedc069f Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-stats-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-translate-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-translate-1.1.11.jar new file mode 100644 index 0000000000..89d444e469 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-translate-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-utilities-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-utilities-1.1.11.jar new file mode 100644 index 0000000000..2f2e239fe5 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-utilities-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-utils-1.5.0.jar b/msi.gama.ext/geotools 21.4/jt-utils-1.5.0.jar new file mode 100644 index 0000000000..3522831746 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-utils-1.5.0.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-vectorbin-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-vectorbin-1.1.11.jar new file mode 100644 index 0000000000..fdcea1f6e3 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-vectorbin-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-vectorbinarize-1.5.0.jar b/msi.gama.ext/geotools 21.4/jt-vectorbinarize-1.5.0.jar new file mode 100644 index 0000000000..1998e325f7 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-vectorbinarize-1.5.0.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-vectorize-1.5.0.jar b/msi.gama.ext/geotools 21.4/jt-vectorize-1.5.0.jar new file mode 100644 index 0000000000..6c9a241756 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-vectorize-1.5.0.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-warp-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-warp-1.1.11.jar new file mode 100644 index 0000000000..11a11cfc7f Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-warp-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-zonal-1.1.11.jar b/msi.gama.ext/geotools 21.4/jt-zonal-1.1.11.jar new file mode 100644 index 0000000000..68ad14e190 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-zonal-1.1.11.jar differ diff --git a/msi.gama.ext/geotools 21.4/jt-zonalstats-1.5.0.jar b/msi.gama.ext/geotools 21.4/jt-zonalstats-1.5.0.jar new file mode 100644 index 0000000000..a3de5debd9 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/jt-zonalstats-1.5.0.jar differ diff --git a/msi.gama.ext/geotools 21.4/mysql-connector-java-5.1.46.jar b/msi.gama.ext/geotools 21.4/mysql-connector-java-5.1.46.jar new file mode 100644 index 0000000000..25532374cf Binary files /dev/null and b/msi.gama.ext/geotools 21.4/mysql-connector-java-5.1.46.jar differ diff --git a/msi.gama.ext/geotools 21.4/postgresql-42.2.5.jar b/msi.gama.ext/geotools 21.4/postgresql-42.2.5.jar new file mode 100644 index 0000000000..d89d4331a4 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/postgresql-42.2.5.jar differ diff --git a/msi.gama.ext/geotools 21.4/sqlite-jdbc-3.27.2.1.jar b/msi.gama.ext/geotools 21.4/sqlite-jdbc-3.27.2.1.jar new file mode 100644 index 0000000000..51f759c6b1 Binary files /dev/null and b/msi.gama.ext/geotools 21.4/sqlite-jdbc-3.27.2.1.jar differ diff --git a/msi.gama.ext/jsr 363/si-quantity-2.0.1.jar b/msi.gama.ext/jsr 363/si-quantity-2.0.1.jar new file mode 100644 index 0000000000..a5a89d8f42 Binary files /dev/null and b/msi.gama.ext/jsr 363/si-quantity-2.0.1.jar differ diff --git a/msi.gama.ext/jsr 363/si-units-java8-1.3.1.jar b/msi.gama.ext/jsr 363/si-units-java8-1.3.1.jar new file mode 100644 index 0000000000..21e2322c49 Binary files /dev/null and b/msi.gama.ext/jsr 363/si-units-java8-1.3.1.jar differ diff --git a/msi.gama.ext/jsr 363/systems-common-java8-1.3.jar b/msi.gama.ext/jsr 363/systems-common-java8-1.3.jar new file mode 100644 index 0000000000..a1cba292fc Binary files /dev/null and b/msi.gama.ext/jsr 363/systems-common-java8-1.3.jar differ diff --git a/msi.gama.ext/jsr 363/unit-api-2.1.1.jar b/msi.gama.ext/jsr 363/unit-api-2.1.1.jar new file mode 100644 index 0000000000..41b6bf97f2 Binary files /dev/null and b/msi.gama.ext/jsr 363/unit-api-2.1.1.jar differ diff --git a/msi.gama.ext/jsr 363/uom-lib-common-1.0.3.jar b/msi.gama.ext/jsr 363/uom-lib-common-1.0.3.jar new file mode 100644 index 0000000000..38a4fd858e Binary files /dev/null and b/msi.gama.ext/jsr 363/uom-lib-common-1.0.3.jar differ diff --git a/msi.gama.ext/jsr 363/uom-se-1.0.10.jar b/msi.gama.ext/jsr 363/uom-se-1.0.10.jar new file mode 100644 index 0000000000..e562f527f6 Binary files /dev/null and b/msi.gama.ext/jsr 363/uom-se-1.0.10.jar differ diff --git a/msi.gama.ext/jts 1.14/jars/jts-core-1.14.0.jar b/msi.gama.ext/jts 1.14/jars/jts-core-1.14.0.jar deleted file mode 100644 index a690bed698..0000000000 Binary files a/msi.gama.ext/jts 1.14/jars/jts-core-1.14.0.jar and /dev/null differ diff --git a/msi.gama.ext/jts 1.14/jars/jts-example-1.14.0.jar b/msi.gama.ext/jts 1.14/jars/jts-example-1.14.0.jar deleted file mode 100644 index f466e3d6b6..0000000000 Binary files a/msi.gama.ext/jts 1.14/jars/jts-example-1.14.0.jar and /dev/null differ diff --git a/msi.gama.ext/jts 1.14/license/LGPL b/msi.gama.ext/jts 1.14/license/LGPL deleted file mode 100644 index 9ef3d701d1..0000000000 --- a/msi.gama.ext/jts 1.14/license/LGPL +++ /dev/null @@ -1,503 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - diff --git a/msi.gama.ext/jts 1.14/src.zip b/msi.gama.ext/jts 1.14/src.zip deleted file mode 100644 index 87f715dc0f..0000000000 Binary files a/msi.gama.ext/jts 1.14/src.zip and /dev/null differ diff --git a/msi.gama.ext/jts-1.17.1/jts-core-1.17.1-sources.jar b/msi.gama.ext/jts-1.17.1/jts-core-1.17.1-sources.jar new file mode 100644 index 0000000000..cf06be14ea Binary files /dev/null and b/msi.gama.ext/jts-1.17.1/jts-core-1.17.1-sources.jar differ diff --git a/msi.gama.ext/jts-1.17.1/jts-core-1.17.1.jar b/msi.gama.ext/jts-1.17.1/jts-core-1.17.1.jar new file mode 100644 index 0000000000..d6b6ab5d80 Binary files /dev/null and b/msi.gama.ext/jts-1.17.1/jts-core-1.17.1.jar differ diff --git a/msi.gama.ext/jts-1.17.1/jts-io-common-1.17.1-sources.jar b/msi.gama.ext/jts-1.17.1/jts-io-common-1.17.1-sources.jar new file mode 100644 index 0000000000..2d765c6cae Binary files /dev/null and b/msi.gama.ext/jts-1.17.1/jts-io-common-1.17.1-sources.jar differ diff --git a/msi.gama.ext/jts-1.17.1/jts-io-common-1.17.1.jar b/msi.gama.ext/jts-1.17.1/jts-io-common-1.17.1.jar new file mode 100644 index 0000000000..974b04475f Binary files /dev/null and b/msi.gama.ext/jts-1.17.1/jts-io-common-1.17.1.jar differ diff --git a/msi.gama.ext/pom2.xml b/msi.gama.ext/pom2.xml index f244607f30..699e723489 100644 --- a/msi.gama.ext/pom2.xml +++ b/msi.gama.ext/pom2.xml @@ -63,7 +63,7 @@ 0.7-RC2 - com.vividsolutions + org.locationtech jts @@ -156,7 +156,7 @@ ${jt.version} - com.vividsolutions + org.locationtech jts @@ -167,7 +167,7 @@ ${jt.version} - com.vividsolutions + org.locationtech jts @@ -178,7 +178,7 @@ ${jt.version} - com.vividsolutions + org.locationtech jts @@ -189,7 +189,7 @@ ${jt.version} - com.vividsolutions + org.locationtech jts @@ -200,7 +200,7 @@ ${jt.version} - com.vividsolutions + org.locationtech jts @@ -211,7 +211,7 @@ ${jt.version} - com.vividsolutions + org.locationtech jts @@ -341,7 +341,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -352,7 +352,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -363,7 +363,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -374,7 +374,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -385,7 +385,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -396,7 +396,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -407,7 +407,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -418,7 +418,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -429,7 +429,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -440,7 +440,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -451,7 +451,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -462,7 +462,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -473,7 +473,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -484,7 +484,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -495,7 +495,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -506,7 +506,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -517,7 +517,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -528,7 +528,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -539,7 +539,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -550,7 +550,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -561,7 +561,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -572,7 +572,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -583,7 +583,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -594,7 +594,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -605,7 +605,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -616,7 +616,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -627,7 +627,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -638,7 +638,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -649,7 +649,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -660,7 +660,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -671,7 +671,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -682,7 +682,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -693,7 +693,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -704,7 +704,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -715,7 +715,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -726,7 +726,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -737,7 +737,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -748,7 +748,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -759,7 +759,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -770,7 +770,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -781,7 +781,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -792,7 +792,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -804,7 +804,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -816,7 +816,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -827,7 +827,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -846,7 +846,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -857,7 +857,7 @@ ${geotools.version} - com.vividsolutions + org.locationtech jts @@ -908,7 +908,7 @@ - com.vividsolutions + org.locationtech jts-core ${jts.version} diff --git a/msi.gama.ext/src/msi/gama/ext/Activator.java b/msi.gama.ext/src/msi/gama/ext/Activator.java index 38dfe8cd11..82322faa2e 100644 --- a/msi.gama.ext/src/msi/gama/ext/Activator.java +++ b/msi.gama.ext/src/msi/gama/ext/Activator.java @@ -17,8 +17,8 @@ import org.geotools.coverage.CoverageFactoryFinder; import org.geotools.factory.CommonFactoryFinder; -import org.geotools.factory.GeoTools; -import org.geotools.factory.Hints; +import org.geotools.util.factory.GeoTools; +import org.geotools.util.factory.Hints; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -45,9 +45,9 @@ public void start(final BundleContext bundleContext) throws Exception { jaiDef.setOperationRegistry(ConcurrentOperationRegistry.initializeRegistry()); } ImageIO.scanForPlugins(); -// Hints.putSystemDefault(Hints.FILTER_FACTORY, CommonFactoryFinder.getFilterFactory2(null)); -// Hints.putSystemDefault(Hints.STYLE_FACTORY, CommonFactoryFinder.getStyleFactory(null)); -// Hints.putSystemDefault(Hints.FEATURE_FACTORY, CommonFactoryFinder.getFeatureFactory(null)); + Hints.putSystemDefault(Hints.FILTER_FACTORY, CommonFactoryFinder.getFilterFactory2(null)); + Hints.putSystemDefault(Hints.STYLE_FACTORY, CommonFactoryFinder.getStyleFactory(null)); + Hints.putSystemDefault(Hints.FEATURE_FACTORY, CommonFactoryFinder.getFeatureFactory(null)); Hints.putSystemDefault(Hints.USE_JAI_IMAGEREAD, true); final Hints defHints = GeoTools.getDefaultHints(); // diff --git a/simtools.gaml.extensions.physics/src/simtools/gaml/extensions/physics/Physical3DWorldAgent.java b/simtools.gaml.extensions.physics/src/simtools/gaml/extensions/physics/Physical3DWorldAgent.java index 12efda6b32..7a122bfd57 100644 --- a/simtools.gaml.extensions.physics/src/simtools/gaml/extensions/physics/Physical3DWorldAgent.java +++ b/simtools.gaml.extensions.physics/src/simtools/gaml/extensions/physics/Physical3DWorldAgent.java @@ -22,7 +22,7 @@ import com.bulletphysics.collision.shapes.SphereShape; import com.bulletphysics.dynamics.RigidBody; import com.bulletphysics.util.ObjectArrayList; -import com.vividsolutions.jts.geom.Coordinate; +import org.locationtech.jts.geom.Coordinate; import msi.gama.common.interfaces.IKeyword; import msi.gama.metamodel.agent.IAgent; diff --git a/simtools.gaml.extensions.traffic/META-INF/MANIFEST.MF b/simtools.gaml.extensions.traffic/META-INF/MANIFEST.MF index a65839b796..ded1500706 100644 --- a/simtools.gaml.extensions.traffic/META-INF/MANIFEST.MF +++ b/simtools.gaml.extensions.traffic/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: simtools.gaml.extensions.traffic;singleton:=true Bundle-Version: 1.8.1.qualifier Require-Bundle: msi.gama.core, msi.gama.ext -Import-Package: com.vividsolutions.jts.geom +Import-Package: org.locationtech.jts.geom Export-Package: simtools.gaml.extensions.traffic Bundle-ClassPath: . Bundle-ActivationPolicy: lazy diff --git a/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/DrivingSkill.java b/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/DrivingSkill.java index 31a276d4f0..f7f72f0d5d 100644 --- a/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/DrivingSkill.java +++ b/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/DrivingSkill.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Set; -import com.vividsolutions.jts.geom.Coordinate; +import org.locationtech.jts.geom.Coordinate; import msi.gama.common.geometry.GeometryUtils; import msi.gama.common.interfaces.IKeyword; diff --git a/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/OldDrivingSkill.java b/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/OldDrivingSkill.java index efd28855bd..c83adb995d 100644 --- a/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/OldDrivingSkill.java +++ b/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/OldDrivingSkill.java @@ -13,8 +13,8 @@ import java.util.Collection; import java.util.Collections; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.GeometryUtils; import msi.gama.common.interfaces.IKeyword; diff --git a/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/RoadSkill.java b/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/RoadSkill.java index a72c7b9add..4e11b4d0bf 100644 --- a/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/RoadSkill.java +++ b/simtools.gaml.extensions.traffic/src/simtools/gaml/extensions/traffic/RoadSkill.java @@ -12,8 +12,8 @@ import java.util.List; -import com.vividsolutions.jts.algorithm.CGAlgorithms; -import com.vividsolutions.jts.geom.Coordinate; +import org.locationtech.jts.algorithm.CGAlgorithms; +import org.locationtech.jts.geom.Coordinate; import msi.gama.common.geometry.GeometryUtils; import msi.gama.metamodel.agent.IAgent; diff --git a/simtools.graphanalysis.fr/src/prefuse/layout/PrefuseStaticLayoutAbstract.java b/simtools.graphanalysis.fr/src/prefuse/layout/PrefuseStaticLayoutAbstract.java index bb41681ce9..7c9b8167f3 100644 --- a/simtools.graphanalysis.fr/src/prefuse/layout/PrefuseStaticLayoutAbstract.java +++ b/simtools.graphanalysis.fr/src/prefuse/layout/PrefuseStaticLayoutAbstract.java @@ -20,7 +20,7 @@ import java.util.Set; import java.util.logging.Logger; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.metamodel.shape.GamaPoint; import msi.gama.metamodel.shape.ILocation; diff --git a/ummisco.gama.java2d/src/ummisco/gama/java2d/Java2DDisplaySurface.java b/ummisco.gama.java2d/src/ummisco/gama/java2d/Java2DDisplaySurface.java index e6b181ff60..a0ba165b3d 100644 --- a/ummisco.gama.java2d/src/ummisco/gama/java2d/Java2DDisplaySurface.java +++ b/ummisco.gama.java2d/src/ummisco/gama/java2d/Java2DDisplaySurface.java @@ -50,7 +50,7 @@ import org.eclipse.swt.SWT; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.interfaces.IDisplaySurface; import msi.gama.common.interfaces.IGraphics; diff --git a/ummisco.gama.opengl/META-INF/MANIFEST.MF b/ummisco.gama.opengl/META-INF/MANIFEST.MF index f3f591fe82..07315ecbb8 100644 --- a/ummisco.gama.opengl/META-INF/MANIFEST.MF +++ b/ummisco.gama.opengl/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: msi.gama.ext, com.google.guava, ummisco.gama.annotations Bundle-ActivationPolicy: lazy -Import-Package: com.vividsolutions.jts.geom, +Import-Package: org.locationtech.jts.geom, org.apache.commons.lang;version="2.6.0", org.jfree.chart Export-Package: diff --git a/ummisco.gama.opengl/src/ummisco/gama/opengl/OpenGL.java b/ummisco.gama.opengl/src/ummisco/gama/opengl/OpenGL.java index 17580c4491..1eefb895f9 100644 --- a/ummisco.gama.opengl/src/ummisco/gama/opengl/OpenGL.java +++ b/ummisco.gama.opengl/src/ummisco/gama/opengl/OpenGL.java @@ -37,8 +37,8 @@ import com.jogamp.opengl.util.awt.TextRenderer; import com.jogamp.opengl.util.gl2.GLUT; import com.jogamp.opengl.util.texture.Texture; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Polygon; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Polygon; import jogamp.opengl.glu.tessellator.GLUtessellatorImpl; import msi.gama.common.geometry.Envelope3D; diff --git a/ummisco.gama.opengl/src/ummisco/gama/opengl/files/Gama3DSFile.java b/ummisco.gama.opengl/src/ummisco/gama/opengl/files/Gama3DSFile.java index 9eef199207..0344f3baac 100644 --- a/ummisco.gama.opengl/src/ummisco/gama/opengl/files/Gama3DSFile.java +++ b/ummisco.gama.opengl/src/ummisco/gama/opengl/files/Gama3DSFile.java @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.List; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.GeometryUtils; import msi.gama.metamodel.shape.GamaPoint; diff --git a/ummisco.gama.opengl/src/ummisco/gama/opengl/renderer/JOGLRenderer.java b/ummisco.gama.opengl/src/ummisco/gama/opengl/renderer/JOGLRenderer.java index 14ea2931e0..a44e7cb1cd 100644 --- a/ummisco.gama.opengl/src/ummisco/gama/opengl/renderer/JOGLRenderer.java +++ b/ummisco.gama.opengl/src/ummisco/gama/opengl/renderer/JOGLRenderer.java @@ -20,7 +20,7 @@ import com.jogamp.opengl.GL2; import com.jogamp.opengl.GLAutoDrawable; import com.jogamp.opengl.swt.GLCanvas; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.interfaces.IDisplaySurface; import msi.gama.common.interfaces.ILayer; diff --git a/ummisco.gama.opengl/src/ummisco/gama/opengl/renderer/caches/GeometryCache.java b/ummisco.gama.opengl/src/ummisco/gama/opengl/renderer/caches/GeometryCache.java index 63e3dc58ba..3fa6c1bb6a 100644 --- a/ummisco.gama.opengl/src/ummisco/gama/opengl/renderer/caches/GeometryCache.java +++ b/ummisco.gama.opengl/src/ummisco/gama/opengl/renderer/caches/GeometryCache.java @@ -34,8 +34,8 @@ import com.jogamp.common.nio.Buffers; import com.jogamp.opengl.GL; import com.jogamp.opengl.GL2; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.GeometryFilter; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.GeometryFilter; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.geometry.ICoordinates; diff --git a/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/GeometryDrawer.java b/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/GeometryDrawer.java index 94d7383bb3..84ec88ca68 100644 --- a/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/GeometryDrawer.java +++ b/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/GeometryDrawer.java @@ -20,8 +20,8 @@ import java.awt.Color; import com.jogamp.opengl.util.gl2.GLUT; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.Polygon; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Polygon; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.geometry.ICoordinates; diff --git a/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/GeometryObject.java b/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/GeometryObject.java index 5961397f60..c429781b8f 100644 --- a/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/GeometryObject.java +++ b/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/GeometryObject.java @@ -10,7 +10,7 @@ ********************************************************************************************************/ package ummisco.gama.opengl.scene; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.GeometryUtils; import msi.gama.metamodel.shape.GamaPoint; diff --git a/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/ModelScene.java b/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/ModelScene.java index 63499c2089..a34b240a55 100644 --- a/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/ModelScene.java +++ b/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/ModelScene.java @@ -11,7 +11,7 @@ package ummisco.gama.opengl.scene; import com.jogamp.opengl.GL2; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.interfaces.ILayer; import msi.gama.util.GamaMapFactory; diff --git a/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/layers/LayerObject.java b/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/layers/LayerObject.java index 7e73a04af4..f50087dd4d 100644 --- a/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/layers/LayerObject.java +++ b/ummisco.gama.opengl/src/ummisco/gama/opengl/scene/layers/LayerObject.java @@ -16,7 +16,7 @@ import com.google.common.collect.ImmutableList; import com.jogamp.opengl.GL2; -import com.vividsolutions.jts.geom.Geometry; +import org.locationtech.jts.geom.Geometry; import msi.gama.common.geometry.Scaling3D; import msi.gama.common.interfaces.IKeyword; diff --git a/ummisco.gama.opengl/src/ummisco/gama/opengl/view/SWTOpenGLDisplaySurface.java b/ummisco.gama.opengl/src/ummisco/gama/opengl/view/SWTOpenGLDisplaySurface.java index e331df2258..f6bd664303 100644 --- a/ummisco.gama.opengl/src/ummisco/gama/opengl/view/SWTOpenGLDisplaySurface.java +++ b/ummisco.gama.opengl/src/ummisco/gama/opengl/view/SWTOpenGLDisplaySurface.java @@ -42,7 +42,7 @@ import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.swt.GLCanvas; import com.jogamp.opengl.util.GLBuffers; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import msi.gama.common.geometry.Envelope3D; import msi.gama.common.interfaces.IDisplaySurface; diff --git a/ummisco.gama.serialize/models/Serialization/models/saveSimu.gsim b/ummisco.gama.serialize/models/Serialization/models/saveSimu.gsim index 7884467744..f92100348a 100644 --- a/ummisco.gama.serialize/models/Serialization/models/saveSimu.gsim +++ b/ummisco.gama.serialize/models/Serialization/models/saveSimu.gsim @@ -34,7 +34,7 @@ saveSimu 0.0 - + 0.0 100.0 @@ -56,7 +56,7 @@ saveSimu 100.0 BOX - + 0 @@ -316,7 +316,7 @@ saveSimu 0.0 - + 0 @@ -361,7 +361,7 @@ saveSimu 0.0 - + 0 @@ -406,7 +406,7 @@ saveSimu 0.0 - + 0 @@ -451,7 +451,7 @@ saveSimu 0.0 - + 0 @@ -506,7 +506,7 @@ saveSimu people0 - + 0 @@ -604,7 +604,7 @@ saveSimu people1 - + 0 diff --git a/ummisco.gama.serialize/src/ummisco/gama/serializer/gamaType/reference/ReferenceAgent.java b/ummisco.gama.serialize/src/ummisco/gama/serializer/gamaType/reference/ReferenceAgent.java index 82c2d46a20..4f347e66ae 100644 --- a/ummisco.gama.serialize/src/ummisco/gama/serializer/gamaType/reference/ReferenceAgent.java +++ b/ummisco.gama.serialize/src/ummisco/gama/serializer/gamaType/reference/ReferenceAgent.java @@ -4,7 +4,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.geometry.Envelope3D; import msi.gama.common.interfaces.BiConsumerWithPruning; diff --git a/ummisco.gama.ui.experiment/src/ummisco/gama/ui/views/inspectors/PopulationInspectView.java b/ummisco.gama.ui.experiment/src/ummisco/gama/ui/views/inspectors/PopulationInspectView.java index 74efe920b0..ebeef7da03 100644 --- a/ummisco.gama.ui.experiment/src/ummisco/gama/ui/views/inspectors/PopulationInspectView.java +++ b/ummisco.gama.ui.experiment/src/ummisco/gama/ui/views/inspectors/PopulationInspectView.java @@ -56,6 +56,7 @@ import msi.gama.common.util.FileUtils; import msi.gama.metamodel.agent.IAgent; import msi.gama.metamodel.population.IPopulation; +import msi.gama.metamodel.shape.GamaPoint; import msi.gama.metamodel.shape.ILocation; import msi.gama.outputs.IDisplayOutput; import msi.gama.outputs.InspectDisplayOutput; @@ -589,7 +590,7 @@ public int compare(final Object e1, final Object e2) { rc = stringComparator.compare(v1, v2); break; case IType.POINT: - rc = ((ILocation) v1).compareTo(v2); + rc = ((ILocation) v1).compareTo((ILocation)v2); break; default: rc = Cast.toGaml(v1).compareTo(Cast.toGaml(v2)); diff --git a/ummisco.gama.ui.navigator/src/ummisco/gama/ui/metadata/ImageDataLoader.java b/ummisco.gama.ui.navigator/src/ummisco/gama/ui/metadata/ImageDataLoader.java index c218fb8105..4893e46941 100644 --- a/ummisco.gama.ui.navigator/src/ummisco/gama/ui/metadata/ImageDataLoader.java +++ b/ummisco.gama.ui.navigator/src/ummisco/gama/ui/metadata/ImageDataLoader.java @@ -40,7 +40,6 @@ import org.geotools.coverage.grid.io.AbstractGridFormat; import org.geotools.coverage.grid.io.GridFormatFinder; import org.geotools.factory.CommonFactoryFinder; -import org.geotools.factory.Hints; import org.geotools.gce.geotiff.GeoTiffFormat; import org.geotools.gce.geotiff.GeoTiffReader; import org.geotools.geometry.DirectPosition2D; @@ -59,7 +58,7 @@ import org.opengis.filter.FilterFactory2; import org.opengis.referencing.crs.CoordinateReferenceSystem; -import com.vividsolutions.jts.geom.Envelope; +import org.locationtech.jts.geom.Envelope; import it.geosolutions.imageioimpl.plugins.tiff.TIFFImageReaderSpi; import msi.gama.common.geometry.Envelope3D; diff --git a/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/SwtMapPane.java b/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/SwtMapPane.java index ee9b6629b2..6e7fefc64d 100644 --- a/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/SwtMapPane.java +++ b/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/SwtMapPane.java @@ -41,12 +41,12 @@ import org.geotools.geometry.jts.JTS; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.map.Layer; +import org.geotools.map.MapBoundsEvent; +import org.geotools.map.MapBoundsListener; import org.geotools.map.MapContent; -import org.geotools.map.event.MapBoundsEvent; -import org.geotools.map.event.MapBoundsListener; -import org.geotools.map.event.MapLayerEvent; -import org.geotools.map.event.MapLayerListEvent; -import org.geotools.map.event.MapLayerListListener; +import org.geotools.map.MapLayerEvent; +import org.geotools.map.MapLayerListEvent; +import org.geotools.map.MapLayerListListener; import org.geotools.referencing.CRS; import org.geotools.referencing.crs.DefaultGeographicCRS; import org.geotools.renderer.GTRenderer; @@ -311,7 +311,7 @@ public void setCrs(final CoordinateReferenceSystem crs) { final CoordinateReferenceSystem targetCRS = crs; final MathTransform transform = CRS.findMathTransform(sourceCRS, targetCRS); - final com.vividsolutions.jts.geom.Envelope newJtsEnv = JTS.transform(rEnv, transform); + final org.locationtech.jts.geom.Envelope newJtsEnv = JTS.transform(rEnv, transform); final ReferencedEnvelope newEnvelope = new ReferencedEnvelope(newJtsEnv, targetCRS); content.getViewport().setBounds(newEnvelope); diff --git a/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/geotools/styling/SLDs.java b/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/geotools/styling/SLDs.java index 3b6b13f4cb..139040f000 100644 --- a/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/geotools/styling/SLDs.java +++ b/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/geotools/styling/SLDs.java @@ -40,12 +40,12 @@ import org.opengis.style.GraphicalSymbol; import org.opengis.style.SemanticType; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.MultiLineString; -import com.vividsolutions.jts.geom.MultiPoint; -import com.vividsolutions.jts.geom.MultiPolygon; -import com.vividsolutions.jts.geom.Point; -import com.vividsolutions.jts.geom.Polygon; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.MultiLineString; +import org.locationtech.jts.geom.MultiPoint; +import org.locationtech.jts.geom.MultiPolygon; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.geom.Polygon; /** * Utility class for working with Geotools SLD objects. diff --git a/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/geotools/styling/Utils.java b/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/geotools/styling/Utils.java index e523ebf956..4f2fdd8716 100644 --- a/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/geotools/styling/Utils.java +++ b/ummisco.gama.ui.viewers/src/ummisco/gama/ui/viewers/gis/geotools/styling/Utils.java @@ -16,7 +16,6 @@ import org.eclipse.swt.graphics.Rectangle; import org.geotools.data.simple.SimpleFeatureSource; import org.geotools.factory.CommonFactoryFinder; -import org.geotools.factory.GeoTools; import org.geotools.styling.FeatureTypeStyle; import org.geotools.styling.Fill; import org.geotools.styling.Graphic; @@ -28,13 +27,14 @@ import org.geotools.styling.Stroke; import org.geotools.styling.Style; import org.geotools.styling.StyleFactory; +import org.geotools.util.factory.GeoTools; import org.opengis.feature.simple.SimpleFeatureType; import org.opengis.filter.FilterFactory; -import com.vividsolutions.jts.geom.LineString; -import com.vividsolutions.jts.geom.MultiLineString; -import com.vividsolutions.jts.geom.MultiPolygon; -import com.vividsolutions.jts.geom.Polygon; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.MultiLineString; +import org.locationtech.jts.geom.MultiPolygon; +import org.locationtech.jts.geom.Polygon; /** * Utilities class.