Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More tidying to make lint happy

This commit is contained in:
Karl David Wright 2022-11-22 22:05:55 -05:00
parent 49c8a75917
commit 5fec8efe4e
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePath.java
View File

@ -463,6 +463,7 @@ class GeoDegeneratePath extends GeoBasePath {
* @param z is the point z.
* @return true of within.
*/
@Override
public boolean isWithin(final double x, final double y, final double z) {
return this.point.isIdentical(x, y, z);
}
@ -554,10 +555,10 @@ class GeoDegeneratePath extends GeoBasePath {
/**
* Get the bounds for a segment endpoint.
*
* @param planetModel is the planet model.
* @param bounds are the bounds to be modified.
*/
public void getBounds(final PlanetModel planetModel, Bounds bounds) {
@Override
public void getBounds(final Bounds bounds) {
bounds.addPoint(point);
}
@ -771,7 +772,6 @@ class GeoDegeneratePath extends GeoBasePath {
/**
* Compute interior path distance.
*
* @param planetModel is the planet model.
* @param distanceStyle is the distance style.
* @param x is the point x.
* @param y is the point y.
@ -831,7 +831,6 @@ class GeoDegeneratePath extends GeoBasePath {
/**
* Compute external distance.
*
* @param planetModel is the planet model.
* @param distanceStyle is the distance style.
* @param x is the point x.
* @param y is the point y.
@ -851,7 +850,6 @@ class GeoDegeneratePath extends GeoBasePath {
/**
* Determine if this endpoint intersects a specified plane.
*
* @param planetModel is the planet model.
* @param p is the plane.
* @param notablePoints are the points associated with the plane.
* @param bounds are any bounds which the intersection must lie within.
@ -883,7 +881,6 @@ class GeoDegeneratePath extends GeoBasePath {
/**
* Get the bounds for a segment endpoint.
*
* @param planetModel is the planet model.
* @param bounds are the bounds to be modified.
*/
@Override

14
lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoStandardPath.java
View File

@ -1146,20 +1146,6 @@ class GeoStandardPath extends GeoBasePath {
public String toString() {
return "CutoffSingleCircleSegmentEndpoint: " + super.toString();
}
@Override
public void getBounds(final Bounds bounds) {
super.getBounds(bounds);
bounds.addPlane(planetModel, circlePlane, cutoffPlane);
bounds.addPlane(planetModel, cutoffPlane, circlePlane);
bounds.addIntersection(planetModel, circlePlane, cutoffPlane);
bounds.addIntersection(planetModel, cutoffPlane, circlePlane);
}
@Override
public String toString() {
return "CutoffSingleCircleSegmentEndpoint: " + super.toString();
}
}
/**

4
lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.java
View File

@ -415,9 +415,9 @@ public class TestGeoPath extends LuceneTestCase {
// Construct a path with a width
final GeoPath legacyPath = GeoPathFactory.makeGeoPath(PlanetModel.SPHERE, 1e-6, pathPoints);
// Compute the inside distance to the atPoint using zero-width path
final double distance = thisPath.computeNearestDistance(DistanceStyle.ARC, carPoint);
// final double distance = thisPath.computeNearestDistance(DistanceStyle.ARC, carPoint);
// Compute the inside distance using legacy path
final double legacyDistance = legacyPath.computeNearestDistance(DistanceStyle.ARC, carPoint);
// final double legacyDistance = legacyPath.computeNearestDistance(DistanceStyle.ARC, carPoint);
// Compute the inside distance using the legacy formula
final double oldFormulaDistance = thisPath.computeDistance(DistanceStyle.ARC, carPoint);
// Compute the inside distance using the legacy formula with the legacy shape