Apache Lucene open-source search software
Resolve merge conflicts
Karl David Wright49c8a7591761
diff --cc lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoStandardPath.javaindex c761b7453b2,8f501b1406c..49080a6ce46--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoStandardPath.java+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoStandardPath.java@@@ -1061,19 -1110,41 +1111,55 @@@ class GeoStandardPath extends GeoBasePareturn geoShape.intersects(circlePlane, this.notablePoints, this.cutoffPlanes);}+ @Override+ public double nearestPathDistance(+ final DistanceStyle distanceStyle, final double x, final double y, final double z) {+ for (final Membership cutoff : cutoffPlanes) {+ if (!cutoff.isWithin(x, y, z)) {+ return Double.POSITIVE_INFINITY;+ }+ }+ return super.nearestPathDistance(distanceStyle, x, y, z);+ }++ @Override+ public double pathCenterDistance(+ final DistanceStyle distanceStyle, final double x, final double y, final double z) {+ for (final Membership cutoff : cutoffPlanes) {+ if (!cutoff.isWithin(x, y, z)) {+ return Double.POSITIVE_INFINITY;+ }+ }+ return super.pathCenterDistance(distanceStyle, x, y, z);+ }++ @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();+ }+++ @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();+ }}/**