diff --git a/MIGRATION.md b/MIGRATION.md index 6635888895..3d485cc675 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -18,7 +18,7 @@ During that transition, the Java package names and Maven GAVs have changed. For | Maven GroupId | com.vividsolutions | org.locationtech.jts | | Package names | com.vividsolutions.jts.* | org.locationtech.jts.* | -To upgrade a Maven project (or another build tool using Maven dependency management), one can do a find and replace on ```pom.xml``` files (or similiar build files). In the source code, one could do a find and replace on the package names. As a concrete example, one could use these two commands to handle most of the migration. +To upgrade a Maven project (or another build tool using Maven dependency management), one can do a find and replace on ```pom.xml``` files (or similar build files). In the source code, one could do a find and replace on the package names. As a concrete example, one could use these two commands to handle most of the migration. ``` git grep -l com.vividsolutions | grep pom.xml | xargs sed -i "s/com.vividsolutions/org.locationtech.jts/g" diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/TriangulationFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/TriangulationFunctions.java index 5c35cf2aa6..691388bda2 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/function/TriangulationFunctions.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/function/TriangulationFunctions.java @@ -70,7 +70,7 @@ public static Geometry delaunayTrianglesWithToleranceNoError(Geometry geom, doub } catch (LocateFailureException ex) { System.out.println(ex); - // ignore this exception and drop thru + // ignore this exception and drop through } /** * Get the triangles created up until the error diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditPanel.java index a4eb5193f2..699d482cd5 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditPanel.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditPanel.java @@ -212,7 +212,7 @@ public String getToolTipText(MouseEvent event) { // if (event.getPoint().x < 100) return null; Coordinate pt = viewport.toModelCoordinate(event.getPoint()); double toleranceInModel = AppConstants.TOLERANCE_PIXELS / getViewport().getScale(); - // avoid wierd scale issues + // avoid weird scale issues if (toleranceInModel <= 0.0) return null; return GeometryLocationsWriter.writeLocation(getLayerList(), pt, toleranceInModel); // return viewport.toModel(event.getPoint()).toString(); diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java index 73dc078147..b5e0fc08e8 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java @@ -278,7 +278,7 @@ public int getLength(Geometry geometry){ * Removed LEDatastream refs and replaced with EndianData[in/out]putstream * * Revision 1.1 2002/08/27 21:04:58 dblasby - * orginal + * original * * Revision 1.2 2002/03/05 10:23:59 jmacgill * made sure geometries were created using the factory methods diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java index 1c0974db5d..6c75d38e7e 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java @@ -54,7 +54,7 @@ public Geometry read(EndianDataInputStream file,GeometryFactory geometryFactory, actualReadWords += 2; if (shapeType != myShapeType) - throw new InvalidShapefileException("pointhandler.read() - handler's shapetype doesnt match file's"); + throw new InvalidShapefileException("pointhandler.read() - handler's shapetype doesn't match file's"); double x = file.readDoubleLE(); double y = file.readDoubleLE(); diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java index e06a3f43da..8dff808ec3 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java @@ -222,7 +222,7 @@ public Geometry read( EndianDataInputStream file , GeometryFactory geometryFacto Geometry result = geometryFactory.createMultiPolygon(polygons); // if (!(result.isValid() )) - // System.out.println("geom isnt valid"); + // System.out.println("geom isn't valid"); return result; } @@ -389,7 +389,7 @@ public int getLength(Geometry geometry){ * Removed LEDatastream refs and replaced with EndianData[in/out]putstream * * Revision 1.1 2002/08/27 21:04:58 dblasby - * orginal + * original * * Revision 1.3 2002/03/05 10:51:01 andyt * removed use of factory from write method diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapefileException.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapefileException.java index f9a904d307..d5553f1f0e 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapefileException.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/ShapefileException.java @@ -22,7 +22,7 @@ /** * Thrown when an error relating to the shapefile - * occures + * occurs */ public class ShapefileException extends Exception{ public ShapefileException(){ diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/io/SVGWriter.java b/modules/app/src/main/java/org/locationtech/jtstest/util/io/SVGWriter.java index e734b9c327..3be1f70a2e 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/util/io/SVGWriter.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/util/io/SVGWriter.java @@ -57,7 +57,7 @@ public class SVGWriter */ private static DecimalFormat createFormatter(PrecisionModel precisionModel) { // the default number of decimal places is 16, which is sufficient - // to accomodate the maximum precision of a double. + // to accommodate the maximum precision of a double. int decimalPlaces = precisionModel.getMaximumSignificantDigits(); // specify decimal separator explicitly to avoid problems in other locales DecimalFormatSymbols symbols = new DecimalFormatSymbols(); diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/SineStarFactory.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/SineStarFactory.java index b514ee6607..31c3bee043 100644 --- a/modules/core/src/main/java/org/locationtech/jts/geom/util/SineStarFactory.java +++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/SineStarFactory.java @@ -102,7 +102,7 @@ public Geometry createSineStar() Coordinate[] pts = new Coordinate[nPts + 1]; int iPt = 0; for (int i = 0; i < nPts; i++) { - // the fraction of the way thru the current arm - in [0,1] + // the fraction of the way through the current arm - in [0,1] double ptArcFrac = (i / (double) nPts) * numArms; double armAngFrac = ptArcFrac - Math.floor(ptArcFrac); diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/union/package.html b/modules/core/src/main/java/org/locationtech/jts/operation/union/package.html index a07bb16b3f..1c503d089a 100644 --- a/modules/core/src/main/java/org/locationtech/jts/operation/union/package.html +++ b/modules/core/src/main/java/org/locationtech/jts/operation/union/package.html @@ -7,7 +7,7 @@ -Classes to perform efficent unioning of collections of geometries. +Classes to perform efficient unioning of collections of geometries. diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/EnhancedPrecisionOp.java b/modules/core/src/main/java/org/locationtech/jts/precision/EnhancedPrecisionOp.java index b86b34e9af..6021a6a9aa 100644 --- a/modules/core/src/main/java/org/locationtech/jts/precision/EnhancedPrecisionOp.java +++ b/modules/core/src/main/java/org/locationtech/jts/precision/EnhancedPrecisionOp.java @@ -47,7 +47,7 @@ public static Geometry intersection(Geometry geom0, Geometry geom1) try { CommonBitsOp cbo = new CommonBitsOp(true); Geometry resultEP = cbo.intersection(geom0, geom1); - // check that result is a valid geometry after the reshift to orginal precision + // check that result is a valid geometry after the reshift to original precision if (! resultEP.isValid()) throw originalEx; return resultEP; @@ -82,7 +82,7 @@ public static Geometry union(Geometry geom0, Geometry geom1) try { CommonBitsOp cbo = new CommonBitsOp(true); Geometry resultEP = cbo.union(geom0, geom1); - // check that result is a valid geometry after the reshift to orginal precision + // check that result is a valid geometry after the reshift to original precision if (! resultEP.isValid()) throw originalEx; return resultEP; @@ -117,7 +117,7 @@ public static Geometry difference(Geometry geom0, Geometry geom1) try { CommonBitsOp cbo = new CommonBitsOp(true); Geometry resultEP = cbo.difference(geom0, geom1); - // check that result is a valid geometry after the reshift to orginal precision + // check that result is a valid geometry after the reshift to original precision if (! resultEP.isValid()) throw originalEx; return resultEP; @@ -152,7 +152,7 @@ public static Geometry symDifference(Geometry geom0, Geometry geom1) try { CommonBitsOp cbo = new CommonBitsOp(true); Geometry resultEP = cbo.symDifference(geom0, geom1); - // check that result is a valid geometry after the reshift to orginal precision + // check that result is a valid geometry after the reshift to original precision if (! resultEP.isValid()) throw originalEx; return resultEP; @@ -190,7 +190,7 @@ public static Geometry buffer(Geometry geom, double distance) try { CommonBitsOp cbo = new CommonBitsOp(true); Geometry resultEP = cbo.buffer(geom, distance); - // check that result is a valid geometry after the reshift to orginal precision + // check that result is a valid geometry after the reshift to original precision if (! resultEP.isValid()) throw originalEx; return resultEP; diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/PrecisionReducerCoordinateOperation.java b/modules/core/src/main/java/org/locationtech/jts/precision/PrecisionReducerCoordinateOperation.java index 25f4d28868..38eba68f78 100644 --- a/modules/core/src/main/java/org/locationtech/jts/precision/PrecisionReducerCoordinateOperation.java +++ b/modules/core/src/main/java/org/locationtech/jts/precision/PrecisionReducerCoordinateOperation.java @@ -66,7 +66,7 @@ public Coordinate[] edit(Coordinate[] coordinates, Geometry geom) { if (removeCollapsed) collapsedCoords = null; - // return null or orginal length coordinate array + // return null or original length coordinate array if (noRepeatedCoords.length < minLength) { return collapsedCoords; } diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/SimpleGeometryPrecisionReducer.java b/modules/core/src/main/java/org/locationtech/jts/precision/SimpleGeometryPrecisionReducer.java index 73c5f98308..7c667e24e8 100644 --- a/modules/core/src/main/java/org/locationtech/jts/precision/SimpleGeometryPrecisionReducer.java +++ b/modules/core/src/main/java/org/locationtech/jts/precision/SimpleGeometryPrecisionReducer.java @@ -141,7 +141,7 @@ public Coordinate[] edit(Coordinate[] coordinates, Geometry geom) Coordinate[] collapsedCoords = reducedCoords; if (removeCollapsed) collapsedCoords = null; - // return null or orginal length coordinate array + // return null or orignal length coordinate array if (noRepeatedCoords.length < minLength) { return collapsedCoords; } diff --git a/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedLineIntersectsPerfTest.java b/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedLineIntersectsPerfTest.java index 87047380cb..1581a615b7 100644 --- a/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedLineIntersectsPerfTest.java +++ b/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedLineIntersectsPerfTest.java @@ -102,7 +102,7 @@ public void test(Geometry g, List lines) public int testOriginal(Geometry g, List lines) { - System.out.println("Using orginal JTS algorithm"); + System.out.println("Using original JTS algorithm"); int count = 0; for (Iterator i = lines.iterator(); i.hasNext(); ) { LineString line = (LineString) i.next(); diff --git a/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedPolygonIntersectsPerfTest.java b/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedPolygonIntersectsPerfTest.java index b13a323b96..0e96d90eff 100644 --- a/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedPolygonIntersectsPerfTest.java +++ b/modules/core/src/test/java/test/jts/perf/geom/prep/PreparedPolygonIntersectsPerfTest.java @@ -158,7 +158,7 @@ public void test(Geometry g, List lines) public int testOriginal(int iter, Geometry g, List lines) { - if (iter == 0) System.out.println("Using orginal JTS algorithm"); + if (iter == 0) System.out.println("Using original JTS algorithm"); int count = 0; for (Iterator i = lines.iterator(); i.hasNext(); ) { LineString line = (LineString) i.next(); diff --git a/modules/tests/src/test/resources/testxml/general/TestRectanglePredicate.xml b/modules/tests/src/test/resources/testxml/general/TestRectanglePredicate.xml index c4a56d78b7..254f1e7518 100644 --- a/modules/tests/src/test/resources/testxml/general/TestRectanglePredicate.xml +++ b/modules/tests/src/test/resources/testxml/general/TestRectanglePredicate.xml @@ -56,7 +56,7 @@ - L overlaps thru Y axis side + L overlaps through Y axis side POLYGON((0 0, 100 0, 100 100, 0 100, 0 0)) @@ -67,7 +67,7 @@ - L overlaps thru X axis side + L overlaps through X axis side POLYGON((0 0, 100 0, 100 100, 0 100, 0 0))