From 6a876c67104b1a2dab7afbbc615e1f0593fad59c Mon Sep 17 00:00:00 2001 From: "lucuma-steward[bot]" <106720676+lucuma-steward[bot]@users.noreply.github.com> Date: Sat, 3 Feb 2024 16:25:22 +0000 Subject: [PATCH 1/2] Update sbt-lucuma-lib to 0.11.12 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3ccbae4e..82d248db 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("edu.gemini" % "sbt-lucuma-lib" % "0.10.13") +addSbtPlugin("edu.gemini" % "sbt-lucuma-lib" % "0.11.12") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") From d80a588b58039810440c7938267c6df952a3c409 Mon Sep 17 00:00:00 2001 From: "lucuma-steward[bot]" <106720676+lucuma-steward[bot]@users.noreply.github.com> Date: Sat, 3 Feb 2024 16:25:57 +0000 Subject: [PATCH 2/2] Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook --- .github/workflows/ci.yml | 108 ++++++++---------- .mergify.yml | 8 +- .scalafmt-common.conf | 5 +- .../jts/algorithm/CGAlgorithms.scala | 2 +- .../jts/algorithm/CGAlgorithmsDD.scala | 2 +- .../locationtech/jts/algorithm/Centroid.scala | 8 +- .../jts/algorithm/ConvexHull.scala | 4 +- .../jts/algorithm/HCoordinate.scala | 2 +- .../jts/algorithm/MinimumDiameter.scala | 2 +- .../jts/algorithm/Orientation.scala | 6 +- .../jts/algorithm/PointLocation.scala | 2 +- .../jts/algorithm/PointLocator.scala | 2 +- .../locationtech/jts/geom/Coordinate.scala | 6 +- .../jts/geom/CoordinateArrays.scala | 8 +- .../jts/geom/CoordinateSequence.scala | 8 +- .../geom/CoordinateSequenceComparator.scala | 8 +- .../jts/geom/CoordinateSequences.scala | 4 +- .../org/locationtech/jts/geom/Geometry.scala | 6 +- .../jts/geom/GeometryCollection.scala | 2 +- .../jts/geom/GeometryFactory.scala | 2 +- .../locationtech/jts/geom/LineSegment.scala | 4 +- .../locationtech/jts/geom/LineString.scala | 2 +- .../jts/geom/MultiLineString.scala | 2 +- .../geom/impl/PackedCoordinateSequence.scala | 52 ++++----- .../PackedCoordinateSequenceFactory.scala | 2 +- .../jts/geom/util/AffineTransformation.scala | 4 +- .../jts/geom/util/GeometryEditor.scala | 2 +- .../jts/geom/util/GeometryExtracter.scala | 2 +- .../locationtech/jts/geomgraph/EdgeList.scala | 3 +- .../locationtech/jts/geomgraph/Quadrant.scala | 4 +- .../jts/index/kdtree/KdNode.scala | 2 +- .../jts/index/kdtree/KdNodeVisitor.scala | 2 +- .../jts/index/kdtree/KdTree.scala | 6 +- .../jts/index/strtree/AbstractSTRtree.scala | 2 +- .../jts/index/strtree/STRtree.scala | 2 +- .../org/locationtech/jts/io/Ordinate.scala | 4 +- .../org/locationtech/jts/io/WKTWriter.scala | 18 +-- .../scala/org/locationtech/jts/math/DD.scala | 9 +- .../jts/noding/FastNodingValidator.scala | 2 +- .../jts/noding/NodedSegmentString.scala | 2 +- .../jts/noding/NodingIntersectionFinder.scala | 2 +- .../org/locationtech/jts/noding/Octant.scala | 5 +- .../jts/noding/SegmentExtractingNoder.scala | 2 +- .../jts/noding/SinglePassNoder.scala | 2 +- .../jts/noding/ValidatingNoder.scala | 2 +- .../snap/SnappingIntersectionAdder.scala | 2 +- .../jts/noding/snap/SnappingNoder.scala | 6 +- .../noding/snaprounder/HotPixelIndex.scala | 8 +- .../snaprounder/MCIndexPointSnapper.scala | 4 +- .../SnapRoundingIntersectionNodder.scala | 2 +- .../snaprounder/SnapRoundingNorder.scala | 6 +- .../operation/buffer/OffsetCurveBuilder.scala | 2 +- .../buffer/OffsetCurveSetBuilder.scala | 2 +- .../buffer/SubgraphDepthLocater.scala | 8 +- .../jts/operation/distance/DistanceOp.scala | 10 +- .../operation/distance/FacetSequence.scala | 2 +- .../operation/overlayng/CoverageUnion.scala | 4 +- .../overlayng/EdgeNodingBuilder.scala | 4 +- .../operation/overlayng/EdgeSourceInfo.scala | 4 +- .../jts/operation/overlayng/LineBuilder.scala | 4 +- .../jts/operation/overlayng/LineLimiter.scala | 2 +- .../operation/overlayng/OverlayEdgeRing.scala | 2 +- .../operation/overlayng/OverlayGraph.scala | 6 +- .../operation/overlayng/OverlayLabel.scala | 8 +- .../operation/overlayng/OverlayLabeller.scala | 2 +- .../jts/operation/overlayng/OverlayNG.scala | 16 +-- .../operation/overlayng/OverlayNGRobust.scala | 4 +- .../jts/operation/overlayng/OverlayUtil.scala | 2 +- .../operation/overlayng/PrecisionUtil.scala | 2 +- .../jts/operation/overlayng/RingClipper.scala | 6 +- .../overlayng/RobustClipEnvelopComputer.scala | 2 +- .../jts/operation/relate/EdgeEndBundle.scala | 11 +- .../union/CascadedPolygonUnion.scala | 10 +- .../precision/GeometryPrecisionReducer.scala | 8 +- 74 files changed, 232 insertions(+), 251 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4e5fbcd..4e61b5d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,56 +15,42 @@ on: tags: [v*] env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +concurrency: + group: ${{ github.workflow }} @ ${{ github.ref }} + cancel-in-progress: true + jobs: build: name: Build and Test strategy: matrix: os: [ubuntu-latest] - scala: [3.2.2, 2.13.10] + scala: [3, 2.13] java: [temurin@17] project: [rootJS, rootJVM] runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Download Java (temurin@17) - id: download-java-temurin-17 - if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 17 - - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: jdkfile + distribution: temurin java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update - run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'show coverageEnabled' @@ -72,9 +58,13 @@ jobs: run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'temurin@17' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck lucumaScalafmtCheck lucumaScalafixCheck + - name: Check scalafix lints + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check' + - name: scalaJSLink if: matrix.project == 'rootJS' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult @@ -82,19 +72,19 @@ jobs: - name: Test run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test - - name: Check scalafix lints - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' - run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check' - - name: Check binary compatibility if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues + - name: Generate API documentation + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc + - name: Aggregate coverage reports run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' coverageReport coverageAggregate - name: Upload code coverage data - run: 'bash <(curl -s https://codecov.io/bash)' + uses: codecov/codecov-action@v4 publish: name: Publish Artifacts @@ -103,53 +93,47 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.2.2] java: [temurin@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Download Java (temurin@17) - id: download-java-temurin-17 - if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 17 - - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: jdkfile + distribution: temurin java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' - run: echo $PGP_SECRET | base64 -di | gpg --import + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + run: echo $PGP_SECRET | base64 -d -i - | gpg --import - name: Import signing key and strip passphrase if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != '' + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} run: | - echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg + echo "$PGP_SECRET" | base64 -d -i - > /tmp/signing-key.gpg echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1) - name: Publish - run: sbt '++ ${{ matrix.scala }}' tlCiRelease + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} + run: sbt tlCiRelease diff --git a/.mergify.yml b/.mergify.yml index 49ef909b..06f3f95f 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -13,10 +13,10 @@ pull_request_rules: - body~=labels:.*early-semver-patch - body~=labels:.*early-semver-minor - 'title=flake.lock: Update' - - status-success=Build and Test (ubuntu-latest, 3.2.2, temurin@17, rootJS) - - status-success=Build and Test (ubuntu-latest, 3.2.2, temurin@17, rootJVM) - - status-success=Build and Test (ubuntu-latest, 2.13.10, temurin@17, rootJS) - - status-success=Build and Test (ubuntu-latest, 2.13.10, temurin@17, rootJVM) + - status-success=Build and Test (ubuntu-latest, 3, temurin@17, rootJS) + - status-success=Build and Test (ubuntu-latest, 3, temurin@17, rootJVM) + - status-success=Build and Test (ubuntu-latest, 2.13, temurin@17, rootJS) + - status-success=Build and Test (ubuntu-latest, 2.13, temurin@17, rootJVM) actions: merge: {} - name: Label jts PRs diff --git a/.scalafmt-common.conf b/.scalafmt-common.conf index 0218680c..85cebd19 100644 --- a/.scalafmt-common.conf +++ b/.scalafmt-common.conf @@ -4,10 +4,11 @@ # this file by hand! Instead, if you wish to make changes, you should # make a PR to sbt-lucuma. -version = "3.7.2" +version = "3.7.17" style = default -runner.dialect = scala213source3 +runner.dialect = scala3 +runner.optimizer.maxVisitsPerToken = 20000 # Avoids SearchStateExploded exceptions maxColumn = 100 project.git = true diff --git a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/CGAlgorithms.scala b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/CGAlgorithms.scala index 714fabab..dbdc5308 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/CGAlgorithms.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/CGAlgorithms.scala @@ -110,7 +110,7 @@ object CGAlgorithms { * point to check for ring inclusion * @param ring * an array of coordinates representing the ring (which must have first point identical to last - * point) return the { @link Location} of p relative to the ring + * point) return the {@link Location} of p relative to the ring */ def locatePointInRing(p: Coordinate, ring: Array[Coordinate]): Int = RayCrossingCounter.locatePointInRing(p, ring) diff --git a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/CGAlgorithmsDD.scala b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/CGAlgorithmsDD.scala index c6ebbfdd..4a489d31 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/CGAlgorithmsDD.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/CGAlgorithmsDD.scala @@ -70,7 +70,7 @@ object CGAlgorithmsDD { * @return * 1 if q is counter-clockwise (left) from p1-p2 * @return - * -1 if q is clockwise (right) from p1-p2 + * -1 if q is clockwise (right) from p1-p2 * @return * 0 if q is collinear with p1-p2 */ diff --git a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/Centroid.scala b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/Centroid.scala index 0235232e..c511e2ab 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/Centroid.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/Centroid.scala @@ -120,8 +120,8 @@ class Centroid(val geom: Geometry) { def getCentroid: Coordinate = { /** - * The centroid is computed from the highest dimension components present in the input. - * I.e. areas dominate lineal geometry, which dominates points. Degenerate geometry are computed + * The centroid is computed from the highest dimension components present in the input. I.e. + * areas dominate lineal geometry, which dominates points. Degenerate geometry are computed * using their effective dimension (e.g. areas may degenerate to lines or points) */ val cent = new Coordinate @@ -200,7 +200,7 @@ class Centroid(val geom: Geometry) { * Adds the line segments defined by an array of coordinates to the linear centroid accumulators. * * @param pts - * an array of { @link Coordinate}s + * an array of {@link Coordinate} s */ private def addLineSegments(pts: Array[Coordinate]): Unit = { var lineLen = 0.0 @@ -225,7 +225,7 @@ class Centroid(val geom: Geometry) { * Adds a point to the point centroid accumulator. * * @param pt - * a { @link Coordinate} + * a {@link Coordinate} */ private def addPoint(pt: Coordinate): Unit = { ptCount += 1 diff --git a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/ConvexHull.scala b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/ConvexHull.scala index b2831f72..59d84aac 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/ConvexHull.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/ConvexHull.scala @@ -129,8 +129,8 @@ class ConvexHull(val pts: Array[Coordinate], var geomFactory: GeometryFactory) { * geometry contains the minimal number of points needed to represent the convex hull. In * particular, no more than two consecutive points will be collinear. * - * return if the convex hull contains 3 or more points, a { @link Polygon}; 2 points, a { @link - * LineString}; 1 point, a { @link Point}; 0 points, an empty { @link GeometryCollection}. + * return if the convex hull contains 3 or more points, a {@link Polygon} ; 2 points, a { @link + * LineString}; 1 point, a {@link Point} ; 0 points, an empty {@link GeometryCollection} . */ def getConvexHull: Geometry = { if (inputPts.length == 0) { diff --git a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/HCoordinate.scala b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/HCoordinate.scala index 5249def1..1d4ec72c 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/HCoordinate.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/HCoordinate.scala @@ -34,7 +34,7 @@ object HCoordinate { * to this routine. * * @deprecated - * use { @link Intersection#intersection(Coordinate, Coordinate, Coordinate, Coordinate)} + * use {@link Intersection#intersection(Coordinate, Coordinate, Coordinate, Coordinate)} */ @throws[NotRepresentableException] def intersection(p1: Coordinate, p2: Coordinate, q1: Coordinate, q2: Coordinate): Coordinate = { // unrolled computation diff --git a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/MinimumDiameter.scala b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/MinimumDiameter.scala index f1ccb5d4..38c64d32 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/MinimumDiameter.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/MinimumDiameter.scala @@ -140,7 +140,7 @@ class MinimumDiameter(val inputGeom: Geometry, val isConvex: Boolean) { /** * Gets a {link LineString} which is a minimum diameter * - * return a { @link LineString} which is a minimum diameter + * return a {@link LineString} which is a minimum diameter */ def getDiameter: LineString = { computeMinimumDiameter() diff --git a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/Orientation.scala b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/Orientation.scala index 09d9bb48..53a70b0a 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/Orientation.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/Orientation.scala @@ -60,9 +60,9 @@ object Orientation { * @param p2 * the final point of the line vector * @param q - * the point to compute the direction to return -1 ( { @link #CLOCKWISE} or { @link #RIGHT} ) if - * q is clockwise (right) from p1-p2; 1 ( { @link #COUNTERCLOCKWISE} or { @link #LEFT} ) if q is - * counter-clockwise (left) from p1-p2; 0 ( { @link #COLLINEAR} or { @link #STRAIGHT} ) if q is + * the point to compute the direction to return -1 ( {@link #CLOCKWISE} or {@link #RIGHT} ) if q + * is clockwise (right) from p1-p2; 1 ( {@link #COUNTERCLOCKWISE} or {@link #LEFT} ) if q is + * counter-clockwise (left) from p1-p2; 0 ( {@link #COLLINEAR} or {@link #STRAIGHT} ) if q is * collinear with p1-p2 */ def index(p1: Coordinate, p2: Coordinate, q: Coordinate): Int = diff --git a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/PointLocation.scala b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/PointLocation.scala index 63471b41..0450fae7 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/PointLocation.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/PointLocation.scala @@ -98,7 +98,7 @@ object PointLocation { * point to check for ring inclusion * @param ring * an array of coordinates representing the ring (which must have first point identical to last - * point) return the { @link Location} of p relative to the ring + * point) return the {@link Location} of p relative to the ring */ def locateInRing(p: Coordinate, ring: Array[Coordinate]): Int = RayCrossingCounter.locatePointInRing(p, ring) diff --git a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/PointLocator.scala b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/PointLocator.scala index 4d1a1716..b9704dd9 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/algorithm/PointLocator.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/algorithm/PointLocator.scala @@ -56,7 +56,7 @@ class PointLocator(boundaryRule: BoundaryNodeRule = BoundaryNodeRule.OGC_SFS_BOU * handles both single-element and multi-element Geometries. The algorithm for multi-part * Geometries takes into account the SFS Boundary Determination Rule. * - * return the { @link Location} of the point relative to the input Geometry + * return the {@link Location} of the point relative to the input Geometry */ def locate(p: Coordinate, geom: Geometry): Int = { if (geom.isEmpty) return Location.EXTERIOR diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/Coordinate.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/Coordinate.scala index 50dacff1..6a9272af 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/Coordinate.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/Coordinate.scala @@ -132,7 +132,7 @@ object Coordinate { * Compares two {link Coordinate}s along to the number of dimensions specified. * * @param o1 - * a { @link Coordinate} + * a {@link Coordinate} * @param o2 * a {link Coordinate} return -1, 0, or 1 depending on whether o1 is less than, equal to, or * greater than 02 @@ -375,8 +375,8 @@ class Coordinate(var x: Double, var y: Double, var z: Double) * * @param o * the Coordinate with which this Coordinate is being compared return - * -1, zero, or 1 as this Coordinate is less than, equal to, or greater than the - * specified Coordinate + * -1, zero, or 1 as this Coordinate is less than, equal to, or greater than the + * specified Coordinate */ override def compareTo(o: Coordinate): Int = { val other = o.asInstanceOf[Coordinate] diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateArrays.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateArrays.scala index 40f8eecf..64e2c189 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateArrays.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateArrays.scala @@ -169,9 +169,9 @@ object CoordinateArrays { * Finds a point in a list of points which is not contained in another list of points * * @param testPts - * the { @link Coordinate}s to test + * the {@link Coordinate} s to test * @param pts - * an array of { @link Coordinate}s to test the input points against return a { @link + * an array of {@link Coordinate} s to test the input points against return a { @link * Coordinate} from testPts which is not in pts, ' or * null */ @@ -514,8 +514,8 @@ object CoordinateArrays { /** * Shifts the positions of the coordinates until the coordinate at - * indexOfFirstCoordinate is first.

If {@code ensureRing} is {@code true}, first - * and last coordinate of the returned array are equal. + * indexOfFirstCoordinate is first.

If {@code ensureRing} is {@code true} , + * first and last coordinate of the returned array are equal. * * @param coordinates * the array to rearrange diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequence.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequence.scala index eea8ed3a..8c7a8391 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequence.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequence.scala @@ -92,7 +92,7 @@ trait CoordinateSequence extends Cloneable { * Checks {link #getDimension()} and {link #getMeasures()} to determine if {link #getZ(int)} is * supported. * - * return true if { @link #getZ(int)} is supported. + * return true if {@link #getZ(int)} is supported. */ def hasZ: Boolean = (getDimension - getMeasures) > 2 @@ -101,7 +101,7 @@ trait CoordinateSequence extends Cloneable { * if {link #getMeasures()} > 0. See {link #getMeasures()} to determine the number of measures * present. * - * return true if { @link #getM(int)} is supported. + * return true if {@link #getM(int)} is supported. * @see * #getMeasures() * @see @@ -147,7 +147,7 @@ trait CoordinateSequence extends Cloneable { * @param index * the index of the coordinate to copy * @param coord - * a { @link Coordinate} to receive the value + * a {@link Coordinate} to receive the value */ def getCoordinate(index: Int, coord: Coordinate): Unit @@ -243,7 +243,7 @@ trait CoordinateSequence extends Cloneable { * * return a copy of the coordinate sequence containing copies of all points * @deprecated - * Recommend { @link #copy()} + * Recommend {@link #copy()} */ protected def clone: Object diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequenceComparator.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequenceComparator.scala index 16000907..e45adb39 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequenceComparator.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequenceComparator.scala @@ -74,9 +74,9 @@ class CoordinateSequenceComparator(dimensionLimit: Int = Int.MaxValue) * Compares two {link CoordinateSequence}s for relative order. * * @param o1 - * a { @link CoordinateSequence} + * a {@link CoordinateSequence} * @param o2 - * a { @link CoordinateSequence} return -1, 0, or 1 depending on whether o1 is less than, equal + * a {@link CoordinateSequence} return -1, 0, or 1 depending on whether o1 is less than, equal * to, or greater than o2 */ override def compare(s1: CoordinateSequence, s2: CoordinateSequence): Int = { @@ -113,9 +113,9 @@ class CoordinateSequenceComparator(dimensionLimit: Int = Int.MaxValue) * dimensions. * * @param s1 - * a { @link CoordinateSequence} + * a {@link CoordinateSequence} * @param s2 - * a { @link CoordinateSequence} + * a {@link CoordinateSequence} * @param i * the index of the coordinate to test * @param dimension diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequences.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequences.scala index fcd2ea5c..cc05bf16 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequences.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/CoordinateSequences.scala @@ -292,7 +292,7 @@ object CoordinateSequences { /** * Returns the index of the minimum coordinate of a part of the coordinate sequence (defined by - * {@code from} and {@code to}, using the usual lexicographic comparison. + * {@code from} and {@code to} , using the usual lexicographic comparison. * * @param seq * the coordinate sequence to search @@ -357,7 +357,7 @@ object CoordinateSequences { * @param indexOfFirstCoordinate * the index of the coordinate to make first * @param ensureRing - * makes sure that { @code } will be a closed ring upon exit + * makes sure that {@code} will be a closed ring upon exit */ def scroll(seq: CoordinateSequence, indexOfFirstCoordinate: Int, ensureRing: Boolean): Unit = { val i = indexOfFirstCoordinate diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/Geometry.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/Geometry.scala index d388d572..87b303c8 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/Geometry.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/Geometry.scala @@ -299,7 +299,7 @@ abstract class Geometry( * The returned coordinate should not be assumed to be an actual Coordinate object used in the * internal representation. * - * return a { @link Coordinate} which is a vertex of this Geometry. return null if + * return a {@link Coordinate} which is a vertex of this Geometry. return null if * this Geometry is empty */ def getCoordinate: Coordinate @@ -422,7 +422,7 @@ abstract class Geometry( * contribute zero "weight" to the centroid).

The centroid of an empty geometry is POINT * EMPTY. * - * return a { @link Point} which is the centroid of this Geometry + * return a {@link Point} which is the centroid of this Geometry */ def getCentroid: Point = { if (isEmpty) return factory.createPoint @@ -436,7 +436,7 @@ abstract class Geometry( * Otherwise, the point may lie on the boundary of the geometry.

The interior point of an * empty geometry is POINT EMPTY. * - * return a { @link Point} which is in the interior of this Geometry + * return a {@link Point} which is in the interior of this Geometry */ def getInteriorPoint: Point = { if (isEmpty) return factory.createPoint diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/GeometryCollection.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/GeometryCollection.scala index 8cacbf02..9ba1ff03 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/GeometryCollection.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/GeometryCollection.scala @@ -272,7 +272,7 @@ class GeometryCollection( * Creates a {link GeometryCollection} with every component reversed. The order of the components * in the collection are not reversed. * - * return a { @link GeometryCollection} in the reverse order + * return a {@link GeometryCollection} in the reverse order */ override def reverse: GeometryCollection = super.reverse.asInstanceOf[GeometryCollection] diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/GeometryFactory.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/GeometryFactory.scala index 5d761169..f34a0b3b 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/GeometryFactory.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/GeometryFactory.scala @@ -368,7 +368,7 @@ class GeometryFactory( * an array (without null elements), or an empty array, or null return a MultiPoint * object * @deprecated - * Use { @link GeometryFactory#createMultiPointFromCoords} instead + * Use {@link GeometryFactory#createMultiPointFromCoords} instead */ def createMultiPoint(coordinates: Array[Coordinate]): MultiPoint = createMultiPoint( if (coordinates != null) getCoordinateSequenceFactory.create(coordinates) diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/LineSegment.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/LineSegment.scala index 6e9ed428..f7ab7891 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/LineSegment.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/LineSegment.scala @@ -128,8 +128,8 @@ class LineSegment(var p0: Coordinate, var p1: Coordinate) * * @param seg * the LineSegment to compare return 1 if seg is to the left of this segment return - * -1 if seg is to the right of this segment return 0 if seg is - * collinear to or crosses this segment + * -1 if seg is to the right of this segment return 0 if seg is + * collinear to or crosses this segment */ def orientationIndex(seg: LineSegment): Int = { val orient0 = Orientation.index(p0, p1, seg.p0) diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/LineString.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/LineString.scala index c7fbe4ac..14b8433b 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/LineString.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/LineString.scala @@ -128,7 +128,7 @@ class LineString(fac: GeometryFactory) extends Geometry(fac) with Lineal { /** * Creates a {link LineString} whose coordinates are in the reverse order of this objects * - * return a { @link LineString} with coordinates in the reverse order + * return a {@link LineString} with coordinates in the reverse order * @deprecated */ override def reverse: LineString = super.reverse.asInstanceOf[LineString] diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/MultiLineString.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/MultiLineString.scala index ea1e4ca6..ab8929ed 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/MultiLineString.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/MultiLineString.scala @@ -88,7 +88,7 @@ class MultiLineString(lineStrings: Array[LineString], factory: GeometryFactory) * Creates a {link MultiLineString} in the reverse order to this object. Both the order of the * component LineStrings and the order of their coordinate sequences are reversed. * - * return a { @link MultiLineString} in the reverse order + * return a {@link MultiLineString} in the reverse order * @deprecated */ override def reverse: MultiLineString = super.reverse.asInstanceOf[MultiLineString] diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/impl/PackedCoordinateSequence.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/impl/PackedCoordinateSequence.scala index cc067fab..4b63bf7e 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/impl/PackedCoordinateSequence.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/impl/PackedCoordinateSequence.scala @@ -57,9 +57,9 @@ object PackedCoordinateSequence { * @param coords * an array of double values that contains the ordinate values of the sequence * @param dimension - * the total number of ordinates that make up a { @link Coordinate} in this sequence. + * the total number of ordinates that make up a {@link Coordinate} in this sequence. * @param measures - * the number of measure-ordinates each { @link Coordinate} in this sequence has. + * the number of measure-ordinates each {@link Coordinate} in this sequence has. */ if (coords.length % dimension != 0) throw new IllegalArgumentException( @@ -72,9 +72,9 @@ object PackedCoordinateSequence { * @param coords * an array of float values that contains the ordinate values of the sequence * @param dimension - * the total number of ordinates that make up a { @link Coordinate} in this sequence. + * the total number of ordinates that make up a {@link Coordinate} in this sequence. * @param measures - * the number of measure-ordinates each { @link Coordinate} in this sequence has. + * the number of measure-ordinates each {@link Coordinate} in this sequence has. */ def this(coords: Array[scala.Float], dimension: Int, measures: Int) = this(coords.map(_.toDouble), dimension, measures) @@ -83,11 +83,11 @@ object PackedCoordinateSequence { * Builds a new packed coordinate sequence out of a coordinate array * * @param coordinates - * an array of { @link Coordinate}s + * an array of {@link Coordinate} s * @param dimension - * the total number of ordinates that make up a { @link Coordinate} in this sequence. + * the total number of ordinates that make up a {@link Coordinate} in this sequence. * @param measures - * the number of measure-ordinates each { @link Coordinate} in this sequence has. + * the number of measure-ordinates each {@link Coordinate} in this sequence has. */ def this(coordinates: Array[Coordinate], dimension: Int, measures: Int) = this(toDoubleArray(coordinates, dimension), dimension, measures) @@ -96,9 +96,9 @@ object PackedCoordinateSequence { * Builds a new packed coordinate sequence out of a coordinate array * * @param coordinates - * an array of { @link Coordinate}s + * an array of {@link Coordinate} s * @param dimension - * the total number of ordinates that make up a { @link Coordinate} in this sequence. + * the total number of ordinates that make up a {@link Coordinate} in this sequence. */ def this(coordinates: Array[Coordinate], dimension: Int) = this(coordinates, dimension, Math.max(0, dimension - 3)) @@ -107,7 +107,7 @@ object PackedCoordinateSequence { * Builds a new packed coordinate sequence out of a coordinate array * * @param coordinates - * an array of { @link Coordinate}s + * an array of {@link Coordinate} s */ def this(coordinates: Array[Coordinate]) = this(coordinates, 3, 0) @@ -118,9 +118,9 @@ object PackedCoordinateSequence { * @param size * the number of coordinates in this sequence * @param dimension - * the total number of ordinates that make up a { @link Coordinate} in this sequence. + * the total number of ordinates that make up a {@link Coordinate} in this sequence. * @param measures - * the number of measure-ordinates each { @link Coordinate} in this sequence has. + * the number of measure-ordinates each {@link Coordinate} in this sequence has. */ def this(size: Int, dimension: Int, measures: Int) = this(new Array[scala.Double](size * dimension), dimension, measures) @@ -251,9 +251,9 @@ object PackedCoordinateSequence { * @param coords * an array of float values that contains the ordinate values of the sequence * @param dimension - * the total number of ordinates that make up a { @link Coordinate} in this sequence. + * the total number of ordinates that make up a {@link Coordinate} in this sequence. * @param measures - * the number of measure-ordinates each { @link Coordinate} in this sequence has. + * the number of measure-ordinates each {@link Coordinate} in this sequence has. */ if (coords.length % dimension != 0) @@ -267,9 +267,9 @@ object PackedCoordinateSequence { * @param coords * an array of double values that contains the ordinate values of the sequence * @param dimension - * the total number of ordinates that make up a { @link Coordinate} in this sequence. + * the total number of ordinates that make up a {@link Coordinate} in this sequence. * @param measures - * the number of measure-ordinates each { @link Coordinate} in this sequence has. + * the number of measure-ordinates each {@link Coordinate} in this sequence has. */ def this(coords: Array[scala.Double], dimension: Int, measures: Int) = this(coords.map(_.toFloat), dimension, measures) @@ -278,11 +278,11 @@ object PackedCoordinateSequence { * Constructs a packed coordinate sequence out of a coordinate array * * @param coordinates - * an array of { @link Coordinate}s + * an array of {@link Coordinate} s * @param dimension - * the total number of ordinates that make up a { @link Coordinate} in this sequence. + * the total number of ordinates that make up a {@link Coordinate} in this sequence. * @param measures - * the number of measure-ordinates each { @link Coordinate} in this sequence has. + * the number of measure-ordinates each {@link Coordinate} in this sequence has. */ def this(coordinates: Array[Coordinate], dimension: Int, measures: Int) = this(toFloatArray(coordinates, dimension), dimension, measures) @@ -291,9 +291,9 @@ object PackedCoordinateSequence { * Builds a new packed coordinate sequence out of a coordinate array * * @param coordinates - * an array of { @link Coordinate}s + * an array of {@link Coordinate} s * @param dimension - * the total number of ordinates that make up a { @link Coordinate} in this sequence. + * the total number of ordinates that make up a {@link Coordinate} in this sequence. */ def this(coordinates: Array[Coordinate], dimension: Int) = this(coordinates, dimension, Math.max(0, dimension - 3)) @@ -304,9 +304,9 @@ object PackedCoordinateSequence { * @param size * the number of coordinates in this sequence * @param dimension - * the total number of ordinates that make up a { @link Coordinate} in this sequence. + * the total number of ordinates that make up a {@link Coordinate} in this sequence. * @param measures - * the number of measure-ordinates each { @link Coordinate} in this sequence has. + * the number of measure-ordinates each {@link Coordinate} in this sequence has. */ def this(size: Int, dimension: Int, measures: Int) = this(new Array[scala.Float](size * dimension), dimension, measures) @@ -386,9 +386,9 @@ abstract class PackedCoordinateSequence protected ( * Creates an instance of this class * * @param dimension - * the total number of ordinates that make up a { @link Coordinate} in this sequence. + * the total number of ordinates that make up a {@link Coordinate} in this sequence. * @param measures - * the number of measure-ordinates each { @link Coordinate} in this sequence has. + * the number of measure-ordinates each {@link Coordinate} in this sequence has. */ extends CoordinateSequence with Serializable { @@ -516,7 +516,7 @@ abstract class PackedCoordinateSequence protected ( * Coordinate object * * @param index - * the coordinate index return the { @link Coordinate} at the given index + * the coordinate index return the {@link Coordinate} at the given index */ protected def getCoordinateInternal(index: Int): Coordinate diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/impl/PackedCoordinateSequenceFactory.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/impl/PackedCoordinateSequenceFactory.scala index 66dc92ac..aabedf05 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/impl/PackedCoordinateSequenceFactory.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/impl/PackedCoordinateSequenceFactory.scala @@ -57,7 +57,7 @@ class PackedCoordinateSequenceFactory(val `type`: Int) /** * Creates a new PackedCoordinateSequenceFactory of the given type. Acceptable type values are - * {@linkplain PackedCoordinateSequenceFactory# FLOAT}or {@linkplain + * {@linkplain PackedCoordinateSequenceFactory# FLOAT} or {@linkplain * PackedCoordinateSequenceFactory# DOUBLE} */ extends CoordinateSequenceFactory diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/util/AffineTransformation.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/util/AffineTransformation.scala index bd5198f9..f6600f6c 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/geom/util/AffineTransformation.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/util/AffineTransformation.scala @@ -414,8 +414,8 @@ class AffineTransformation() * of the inverse is equal to the inverse of the matrix for the transformation. It is computed as * follows:

 1 inverse(A) = --- x adjoint(A) det
    *
-   * \= 1 | m11 -m01 m01*m12-m02*m11 |
-   * --- x | -m10 m00 -m00*m12+m10*m02 | det | 0 0 m00*m11-m10*m01 |
+   * \= 1 | m11 -m01 m01*m12-m02*m11 | --- x | -m10 m00 -m00*m12+m10*m02 | det | 0 0 m00*m11-m10*m01
+   * \|
    *
    * \= | m11/det -m01/det m01*m12-m02*m11/det |
    * | -m10/det   m00/det  -m00*m12+m10*m02/det |
diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/util/GeometryEditor.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/util/GeometryEditor.scala
index 1a99c184..83d24e47 100644
--- a/modules/jts/src/main/scala/org/locationtech/jts/geom/util/GeometryEditor.scala
+++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/util/GeometryEditor.scala
@@ -201,7 +201,7 @@ class GeometryEditor(var factory: GeometryFactory) {
    * @param geometry
    *   the Geometry to edit
    * @param operation
-   *   the edit operation to carry out return a new { @link Geometry} which is the result of the
+   *   the edit operation to carry out return a new {@link Geometry} which is the result of the
    *   editing (which may be empty)
    */
   def edit(geometry: Geometry, operation: GeometryEditor.GeometryEditorOperation): Geometry = { // nothing to do
diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geom/util/GeometryExtracter.scala b/modules/jts/src/main/scala/org/locationtech/jts/geom/util/GeometryExtracter.scala
index a73b42bb..ad3cf478 100644
--- a/modules/jts/src/main/scala/org/locationtech/jts/geom/util/GeometryExtracter.scala
+++ b/modules/jts/src/main/scala/org/locationtech/jts/geom/util/GeometryExtracter.scala
@@ -78,7 +78,7 @@ object GeometryExtracter {
 
   /**
    * Extracts the components of geometryType from a {@link Geometry} and adds them to the
-   * provided {@link List}.
+   * provided {@link List} .
    *
    * @param geom
    *   the geometry from which to extract
diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geomgraph/EdgeList.scala b/modules/jts/src/main/scala/org/locationtech/jts/geomgraph/EdgeList.scala
index be01f047..e725a5a5 100644
--- a/modules/jts/src/main/scala/org/locationtech/jts/geomgraph/EdgeList.scala
+++ b/modules/jts/src/main/scala/org/locationtech/jts/geomgraph/EdgeList.scala
@@ -69,8 +69,7 @@ class EdgeList() {
   /**
    * If the edge e is already in the list, return its index.
    *
-   * return index, if e is already in the list
-   * -1 otherwise
+   * return index, if e is already in the list -1 otherwise
    */
   def findEdgeIndex(e: Edge): Int = {
     var i = 0
diff --git a/modules/jts/src/main/scala/org/locationtech/jts/geomgraph/Quadrant.scala b/modules/jts/src/main/scala/org/locationtech/jts/geomgraph/Quadrant.scala
index 0ab9874b..f97dfec7 100644
--- a/modules/jts/src/main/scala/org/locationtech/jts/geomgraph/Quadrant.scala
+++ b/modules/jts/src/main/scala/org/locationtech/jts/geomgraph/Quadrant.scala
@@ -19,8 +19,8 @@ package org.locationtech.jts.geom
  */
 
 /**
- * Utility functions for working with quadrants, which are numbered as follows: 
 1 | 0
- * --+-- 2 | 3 
+ * Utility functions for working with quadrants, which are numbered as follows:
 1 | 0 --+-- 2
+ * \| 3 
* * @version 1.7 */ diff --git a/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdNode.scala b/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdNode.scala index 73d837de..e77ec00a 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdNode.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdNode.scala @@ -18,7 +18,7 @@ import org.locationtech.jts.geom.Coordinate */ /** - * A node of a {@link KdTree}, which represents one or more points in the same location. + * A node of a {@link KdTree} , which represents one or more points in the same location. * * @author * dskea diff --git a/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdNodeVisitor.scala b/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdNodeVisitor.scala index 144b4899..864760cc 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdNodeVisitor.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdNodeVisitor.scala @@ -16,7 +16,7 @@ package org.locationtech.jts.index.kdtree */ /** - * A visitor for {@link KdNode}s in a {@link KdTree} index. + * A visitor for {@link KdNode} s in a {@link KdTree} index. * * @version 1.7 */ diff --git a/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdTree.scala b/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdTree.scala index 88c1454f..1e14d04f 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdTree.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/index/kdtree/KdTree.scala @@ -39,7 +39,7 @@ import java.util object KdTree { /** - * Converts a collection of {@link KdNode}s to an array of {@link Coordinate}s. + * Converts a collection of {@link KdNode} s to an array of {@link Coordinate} s. * * @param kdnodes * a collection of nodes @@ -49,8 +49,8 @@ object KdTree { def toCoordinates(kdnodes: util.Collection[_]): Array[Coordinate] = toCoordinates(kdnodes, false) /** - * Converts a collection of {@link KdNode}s to an array of {@link Coordinate}s, specifying whether - * repeated nodes should be represented by multiple coordinates. + * Converts a collection of {@link KdNode} s to an array of {@link Coordinate} s, specifying + * whether repeated nodes should be represented by multiple coordinates. * * @param kdnodes * a collection of nodes diff --git a/modules/jts/src/main/scala/org/locationtech/jts/index/strtree/AbstractSTRtree.scala b/modules/jts/src/main/scala/org/locationtech/jts/index/strtree/AbstractSTRtree.scala index f83b3337..9dc2973e 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/index/strtree/AbstractSTRtree.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/index/strtree/AbstractSTRtree.scala @@ -382,7 +382,7 @@ abstract class AbstractSTRtree(var nodeCapacity: Int) /** * @param level - * -1 to get items + * -1 to get items */ private def boundablesAtLevel( level: Int, diff --git a/modules/jts/src/main/scala/org/locationtech/jts/index/strtree/STRtree.scala b/modules/jts/src/main/scala/org/locationtech/jts/index/strtree/STRtree.scala index c949c4bf..ba0a3d85 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/index/strtree/STRtree.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/index/strtree/STRtree.scala @@ -396,7 +396,7 @@ class STRtree(val nodeCapacityArg: Int) } /** - * Finds k items in this tree which are the top k nearest neighbors to the given {@code item}, + * Finds k items in this tree which are the top k nearest neighbors to the given {@code item} , * using {@code itemDist} as the distance metric. A Branch-and-Bound tree traversal algorithm is * used to provide an efficient search. This method implements the KNN algorithm described in the * following paper:

Roussopoulos, Nick, Stephen Kelley, and Frédéric Vincent. "Nearest diff --git a/modules/jts/src/main/scala/org/locationtech/jts/io/Ordinate.scala b/modules/jts/src/main/scala/org/locationtech/jts/io/Ordinate.scala index 3d1c9a58..fbd98a08 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/io/Ordinate.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/io/Ordinate.scala @@ -17,8 +17,8 @@ package org.locationtech.jts.io /** * An enumeration of possible Well-Known-Text or Well-Known-Binary ordinates.

Intended to be - * used as an {@code EnumSet}, optimized create methods have been provided for {@link # - * createXY ( )}, {@link # createXYM ( )}, {@link # createXYZ ( )} and {@link # createXYZM ( )}. + * used as an {@code EnumSet} , optimized create methods have been provided for {@link # + * createXY ( )}, {@link # createXYM ( )} , {@link # createXYZ ( )} and {@link # createXYZM ( )} . */ object Ordinate extends Enumeration { type Ordinate = Value diff --git a/modules/jts/src/main/scala/org/locationtech/jts/io/WKTWriter.scala b/modules/jts/src/main/scala/org/locationtech/jts/io/WKTWriter.scala index f620eb53..210ac43e 100644 --- a/modules/jts/src/main/scala/org/locationtech/jts/io/WKTWriter.scala +++ b/modules/jts/src/main/scala/org/locationtech/jts/io/WKTWriter.scala @@ -36,7 +36,7 @@ import scala.annotation.nowarn */ /** - * Writes the Well-Known Text representation of a {@link Geometry}. The Well-Known Text format is + * Writes the Well-Known Text representation of a {@link Geometry} . The Well-Known Text format is * defined in the OGC Simple Features * Specification for SQL. See {@link WKTReader} for a formal specification of the format * syntax.

The WKTWriter outputs coordinates rounded to the precision model. Only @@ -53,7 +53,7 @@ import scala.annotation.nowarn object WKTWriter { /** - * Generates the WKT for a POINT specified by a {@link Coordinate}. + * Generates the WKT for a POINT specified by a {@link Coordinate} . * * @param p0 * the point coordinate @@ -63,7 +63,7 @@ object WKTWriter { def toPoint(p0: Coordinate): String = WKTConstants.POINT + " ( " + format(p0) + " )" /** - * Generates the WKT for a LINESTRING specified by a {@link CoordinateSequence}. + * Generates the WKT for a LINESTRING specified by a {@link CoordinateSequence} . * * @param seq * the sequence to write @@ -87,7 +87,7 @@ object WKTWriter { } /** - * Generates the WKT for a LINESTRING specified by a {@link CoordinateSequence}. + * Generates the WKT for a LINESTRING specified by a {@link CoordinateSequence} . * * @param coord * the sequence to write @@ -111,7 +111,7 @@ object WKTWriter { } /** - * Generates the WKT for a LINESTRING specified by two {@link Coordinate}s. + * Generates the WKT for a LINESTRING specified by two {@link Coordinate} s. * * @param p0 * the first coordinate @@ -174,7 +174,7 @@ object WKTWriter { class WKTWriter(val outputDimension: Int) { /** - * Creates a writer that writes {@link Geometry}s with the given output dimension (2 to 4). The + * Creates a writer that writes {@link Geometry} s with the given output dimension (2 to 4). The * output follows the following rules:

This implementation uses algorithms originally designed + * variously by Knuth, Kahan, Dekker, and Linnainmaa. Douglas Priest developed the first C + * implementation of these techniques. Other more recent C++ implementation are due to Keith M. + * Briggs and David Bailey et al. * *

References