reorder imports based on jts package change

build/maven/xmlcodegen/src/main/java/org/geotools/maven/xmlcodegen/TypeBinding.java

@@ -46,7 +46,7 @@ public String getName() {
     }
 
     /**
-     * @return fully-qualified binding class name, for example "com.vividsolutions.jts.geom.Point"
+     * @return fully-qualified binding class name, for example "org.locationtech.jts.geom.Point"
      */
     public String getBinding() {
         return binding;

docs/developer/procedures/add.rst

@@ -176,8 +176,8 @@ Examples of Updating JTS Jar
 
 2. Here is an example of how to deploy the JTS binary jar::
 
-      C:\java\geotools\trunk>mvn deploy:deploy-file -DgroupId=com.vividsolutions -DartifactId=jts -Dversion=1.13 -Dfile=C:\java\jts\lib\jts-1.13.jar -Dpackaging=jar -DrepositoryId=osgeo -Durl=dav:http://download.osgeo.org/webdav/geotools/
+      C:\java\geotools\trunk>mvn deploy:deploy-file -DgroupId=org.locationtech -DartifactId=jts -Dversion=1.13 -Dfile=C:\java\jts\lib\jts-1.13.jar -Dpackaging=jar -DrepositoryId=osgeo -Durl=dav:http://download.osgeo.org/webdav/geotools/
 
 3. And the source code (you will need to zip this up first since JTS does not provide a source download)::
 
-    C:\java\geotools\trunk>mvn deploy:deploy-file -DgroupId=com.vividsolutions -DartifactId=jts -Dversion=1.13 -Dfile=C:\java\jts\jts-1.13-src.zip -Dpackaging=java-source -DrepositoryId=osgeo -Durl=dav:http://download.osgeo.org/webdav/geotools/ -DgeneratePom=false
+    C:\java\geotools\trunk>mvn deploy:deploy-file -DgroupId=org.locationtech -DartifactId=jts -Dversion=1.13 -Dfile=C:\java\jts\jts-1.13-src.zip -Dpackaging=java-source -DrepositoryId=osgeo -Durl=dav:http://download.osgeo.org/webdav/geotools/ -DgeneratePom=false

docs/src/main/java/org/geotools/api/APIExamples.java

@@ -1,11 +1,11 @@
 package org.geotools.api;
 
-import com.vividsolutions.jts.geom.Envelope;
 import org.geotools.geometry.jts.JTS;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.geometry.jts.ReferencedEnvelope3D;
 import org.geotools.referencing.CRS;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.locationtech.jts.geom.Envelope;
 import org.opengis.geometry.BoundingBox;
 import org.opengis.geometry.DirectPosition;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -80,7 +80,7 @@ private void exampleBoundingBox() throws Exception {
     //
     private void exampleEnvelope() throws Exception {
         // exampleEnvelope start
-        com.vividsolutions.jts.geom.Envelope envelope = new Envelope(0, 10, 0, 20);
+        org.locationtech.jts.geom.Envelope envelope = new Envelope(0, 10, 0, 20);
         double xMin = envelope.getMinX();
         double yMin = envelope.getMinY();
 
@@ -212,7 +212,7 @@ private void exampleReferencedEnvelopeStaticMethods() throws Exception {
         CoordinateReferenceSystem crs = null; // can be 2D or 3D
         org.opengis.geometry.Envelope opengis_env =
                 null; // can be instance of ReferencedEnvelope(3D)
-        com.vividsolutions.jts.geom.Envelope jts_env =
+        org.locationtech.jts.geom.Envelope jts_env =
                 null; // can be instance of ReferencedEnvelope(3D)
         BoundingBox bbox = null; // can be instance of ReferencedEnvelope(3D)
 
@@ -226,15 +226,15 @@ private void exampleReferencedEnvelopeStaticMethods() throws Exception {
         // Envelope to determine type
         env = ReferencedEnvelope.create(opengis_env, crs);
 
-        // safely create ReferencedEnvelope from com.vividsolutions.jts.geom.Envelope, uses
+        // safely create ReferencedEnvelope from org.locationtech.jts.geom.Envelope, uses
         // dimension in Envelope to determine type
         env = ReferencedEnvelope.create(jts_env, crs);
 
         // safely reference org.opengis.geometry.Envelope as ReferencedEnvelope
         // --> if it is a ReferencedEnvelope(3D), simply cast it; if not, create a conversion
         env = ReferencedEnvelope.reference(opengis_env);
 
-        // safely reference com.vividsolutions.jts.geom.Envelope as ReferencedEnvelope
+        // safely reference org.locationtech.jts.geom.Envelope as ReferencedEnvelope
         // --> if it is a ReferencedEnvelope(3D), simply cast it; if not, create a conversion
         env = ReferencedEnvelope.reference(jts_env);
 

docs/src/main/java/org/geotools/cql/DataExamples.java

@@ -1,18 +1,18 @@
 /** */
 package org.geotools.cql;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.io.WKTReader;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import org.apache.commons.io.FileUtils;
 import org.geotools.data.DataUtilities;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
 import org.geotools.geometry.jts.JTSFactoryFinder;
 import org.geotools.util.URLs;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.io.WKTReader;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
 

docs/src/main/java/org/geotools/geometry/GeometryExamples.java

@@ -1,17 +1,17 @@
 package org.geotools.geometry;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
 import org.geotools.geometry.jts.CircularString;
 import org.geotools.geometry.jts.CurvedGeometryFactory;
 import org.geotools.geometry.jts.Geometries;
 import org.geotools.geometry.jts.JTSFactoryFinder;
 import org.geotools.geometry.jts.WKTReader2;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.impl.PackedCoordinateSequence;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
 
 public class GeometryExamples {
 

docs/src/main/java/org/geotools/grid/GridExamples.java

@@ -1,6 +1,5 @@
 package org.geotools.grid;
 
-import com.vividsolutions.jts.geom.Polygon;
 import java.awt.Color;
 import java.net.URL;
 import java.util.Arrays;
@@ -17,6 +16,7 @@
 import org.geotools.grid.ortholine.LineOrientation;
 import org.geotools.grid.ortholine.OrthoLineDef;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.locationtech.jts.geom.Polygon;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 

docs/src/main/java/org/geotools/grid/IntersectionBuilder.java

@@ -2,14 +2,14 @@
 
 // IntersectionBuilder start
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
 import java.io.IOException;
 import java.util.Map;
 import org.geotools.data.simple.SimpleFeatureSource;
 import org.geotools.factory.CommonFactoryFinder;
 import org.geotools.geometry.jts.JTSFactoryFinder;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.opengis.filter.Filter;
 import org.opengis.filter.FilterFactory2;

docs/src/main/java/org/geotools/jts/JTSExamples.java

@@ -1,7 +1,7 @@
 package org.geotools.jts;
 
-import com.vividsolutions.jts.geom.Coordinate;
 import org.geotools.geometry.jts.JTS;
+import org.locationtech.jts.geom.Coordinate;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
 public class JTSExamples {

docs/src/main/java/org/geotools/jts/SnapToLine.java

@@ -1,14 +1,5 @@
 package org.geotools.jts;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.index.SpatialIndex;
-import com.vividsolutions.jts.index.strtree.STRtree;
-import com.vividsolutions.jts.linearref.LinearLocation;
-import com.vividsolutions.jts.linearref.LocationIndexedLine;
 import java.io.File;
 import java.util.List;
 import java.util.Random;
@@ -19,6 +10,15 @@
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.swing.data.JFileDataStoreChooser;
 import org.geotools.util.NullProgressListener;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.index.SpatialIndex;
+import org.locationtech.jts.index.strtree.STRtree;
+import org.locationtech.jts.linearref.LinearLocation;
+import org.locationtech.jts.linearref.LocationIndexedLine;
 import org.opengis.feature.Feature;
 import org.opengis.feature.FeatureVisitor;
 import org.opengis.feature.simple.SimpleFeature;

docs/src/main/java/org/geotools/main/FilterExamples.java

@@ -1,8 +1,5 @@
 package org.geotools.main;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
 import java.awt.Rectangle;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
@@ -29,6 +26,9 @@
 import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.geotools.swing.JMapFrame;
 import org.geotools.swing.event.MapMouseEvent;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
 import org.opengis.feature.Feature;
 import org.opengis.feature.FeatureVisitor;
 import org.opengis.feature.simple.SimpleFeature;

docs/src/main/java/org/geotools/main/JoinExample.java

@@ -9,7 +9,6 @@
  */
 package org.geotools.main;
 
-import com.vividsolutions.jts.geom.Geometry;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
@@ -22,6 +21,7 @@
 import org.geotools.factory.CommonFactoryFinder;
 import org.geotools.factory.GeoTools;
 import org.geotools.swing.data.JFileDataStoreChooser;
+import org.locationtech.jts.geom.Geometry;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.opengis.filter.Filter;

docs/src/main/java/org/geotools/opengis/FeatureExamples.java

@@ -1,12 +1,12 @@
 package org.geotools.opengis;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
 import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
 import org.geotools.geometry.jts.JTSFactoryFinder;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
 

docs/src/main/java/org/geotools/referencing/ReferencingExamples.java

@@ -1,6 +1,5 @@
 package org.geotools.referencing;
 
-import com.vividsolutions.jts.geom.Coordinate;
 import java.awt.RenderingHints.Key;
 import java.awt.geom.Point2D;
 import java.util.Collections;
@@ -16,6 +15,7 @@
 import org.geotools.referencing.factory.ReferencingFactoryContainer;
 import org.geotools.referencing.operation.DefiningConversion;
 import org.geotools.referencing.wkt.Formattable;
+import org.locationtech.jts.geom.Coordinate;
 import org.opengis.metadata.Identifier;
 import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.referencing.FactoryException;

docs/src/main/java/org/geotools/tutorial/crs/CRSLab.java

@@ -10,7 +10,6 @@
 // docs start source
 package org.geotools.tutorial.crs;
 
-import com.vividsolutions.jts.geom.Geometry;
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.Serializable;
@@ -46,6 +45,7 @@
 import org.geotools.swing.JProgressWindow;
 import org.geotools.swing.action.SafeAction;
 import org.geotools.swing.data.JFileDataStoreChooser;
+import org.locationtech.jts.geom.Geometry;
 import org.opengis.feature.Feature;
 import org.opengis.feature.FeatureVisitor;
 import org.opengis.feature.simple.SimpleFeature;

docs/src/main/java/org/geotools/tutorial/csv/CSVFeatureReader.java

@@ -9,15 +9,15 @@
 package org.geotools.tutorial.csv;
 
 import com.csvreader.CsvReader;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
 import java.io.IOException;
 import java.util.NoSuchElementException;
 import org.geotools.data.FeatureReader;
 import org.geotools.data.Query;
 import org.geotools.data.store.ContentState;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
 import org.geotools.geometry.jts.JTSFactoryFinder;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
 import org.opengis.feature.IllegalAttributeException;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;

docs/src/main/java/org/geotools/tutorial/csv/CSVFeatureSource.java

@@ -10,7 +10,6 @@
 package org.geotools.tutorial.csv;
 
 import com.csvreader.CsvReader;
-import com.vividsolutions.jts.geom.Point;
 import java.io.IOException;
 import org.geotools.data.FeatureReader;
 import org.geotools.data.Query;
@@ -19,6 +18,7 @@
 import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.locationtech.jts.geom.Point;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.opengis.filter.Filter;

docs/src/main/java/org/geotools/tutorial/csv/CSVTest.java

@@ -11,7 +11,6 @@
 import static org.junit.Assert.assertTrue;
 
 import com.csvreader.CsvReader;
-import com.vividsolutions.jts.geom.Geometry;
 import java.io.File;
 import java.io.FileReader;
 import java.io.Serializable;
@@ -36,6 +35,7 @@
 import org.geotools.filter.text.cql2.CQL;
 import org.geotools.referencing.CRS;
 import org.junit.Test;
+import org.locationtech.jts.geom.Geometry;
 import org.opengis.feature.Property;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;

docs/src/main/java/org/geotools/tutorial/csv2/CSVDataStore.java

@@ -10,7 +10,6 @@
 
 import com.csvreader.CsvReader;
 import com.csvreader.CsvWriter;
-import com.vividsolutions.jts.geom.Point;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -26,6 +25,7 @@
 import org.geotools.feature.NameImpl;
 import org.geotools.referencing.CRS;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.locationtech.jts.geom.Point;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.opengis.feature.type.AttributeDescriptor;
 import org.opengis.feature.type.GeometryDescriptor;

docs/src/main/java/org/geotools/tutorial/csv2/CSVFeatureReader.java

@@ -9,15 +9,15 @@
 package org.geotools.tutorial.csv2;
 
 import com.csvreader.CsvReader;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
 import java.io.IOException;
 import java.util.NoSuchElementException;
 import org.geotools.data.FeatureReader;
 import org.geotools.data.Query;
 import org.geotools.data.store.ContentState;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
 import org.geotools.geometry.jts.JTSFactoryFinder;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
 import org.opengis.feature.IllegalAttributeException;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;

docs/src/main/java/org/geotools/tutorial/csv2/CSVFeatureSource.java

@@ -9,7 +9,6 @@
 package org.geotools.tutorial.csv2;
 
 import com.csvreader.CsvReader;
-import com.vividsolutions.jts.geom.Point;
 import java.io.IOException;
 import org.geotools.data.FeatureReader;
 import org.geotools.data.Query;
@@ -18,6 +17,7 @@
 import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.locationtech.jts.geom.Point;
 import org.opengis.feature.FeatureVisitor;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;

docs/src/main/java/org/geotools/tutorial/csv2/CSVFeatureWriter.java

@@ -9,7 +9,6 @@
 package org.geotools.tutorial.csv2;
 
 import com.csvreader.CsvWriter;
-import com.vividsolutions.jts.geom.Point;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -22,6 +21,7 @@
 import org.geotools.data.store.ContentState;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
+import org.locationtech.jts.geom.Point;
 import org.opengis.feature.Property;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;