You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2022/11/24 15:11:42 UTC
[lucene] 02/02: Fix formatting after git cherry-pick
This is an automated email from the ASF dual-hosted git repository.
kwright pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 9dbc5e73818a49810bb07b3eba61e6fe8bacb9be
Author: Karl David Wright <kw...@apache.org>
AuthorDate: Thu Nov 24 02:10:12 2022 -0500
Fix formatting after git cherry-pick
---
.../java/org/apache/lucene/spatial3d/geom/GeoDegeneratePath.java | 6 ++----
.../spatial3d/src/java/org/apache/lucene/spatial3d/geom/Plane.java | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePath.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePath.java
index bba5a016c16..73ab6522475 100644
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePath.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePath.java
@@ -497,10 +497,8 @@ class GeoDegeneratePath extends GeoBasePath {
*/
public double pathCenterDistance(
final DistanceStyle distanceStyle, final double x, final double y, final double z) {
- for (final Membership m : cutoffPlanes) {
- if (!m.isWithin(x, y, z)) {
- return Double.POSITIVE_INFINITY;
- }
+ if (!isWithinSection(x, y, z)) {
+ return Double.POSITIVE_INFINITY;
}
return distanceStyle.toAggregationForm(distanceStyle.computeDistance(this.point, x, y, z));
}
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Plane.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Plane.java
index f9de81781b1..79719ba4119 100755
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Plane.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Plane.java
@@ -1662,8 +1662,7 @@ public class Plane extends Vector {
} else {
// Since a==b==0, any plane including the Z axis suffices.
// System.err.println(" Perpendicular to z");
- GeoPoint[] points =
- findIntersections(planetModel, normalYPlane, NO_BOUNDS, NO_BOUNDS);
+ GeoPoint[] points = findIntersections(planetModel, normalYPlane, NO_BOUNDS, NO_BOUNDS);
if (points.length == 0) {
points = findIntersections(planetModel, normalXPlane, NO_BOUNDS, NO_BOUNDS);
}
@@ -2209,8 +2208,7 @@ public class Plane extends Vector {
}
} else {
// Horizontal circle. Since a==b, any vertical plane suffices.
- GeoPoint[] points =
- findIntersections(planetModel, normalXPlane, NO_BOUNDS, NO_BOUNDS);
+ GeoPoint[] points = findIntersections(planetModel, normalXPlane, NO_BOUNDS, NO_BOUNDS);
if (points.length == 0) {
points = findIntersections(planetModel, normalYPlane, NO_BOUNDS, NO_BOUNDS);
}