Project import generated by Copybara.

PiperOrigin-RevId: 795216560

Author: S2 Authors

README.md

@@ -57,6 +57,36 @@ varying degrees of completeness and maturity. This Java implementation is
 heavily used within Google and is generally mature, aside from the newest
 features, but is not as complete as C++.
 
+## 2025 Q3 Release Highlights
+
+*   S2Polygon operations have migrated from the old implementations to
+    S2BooleanOperation, matching the C++ implementation. The old implementations
+    are still available, as fragile tests or code may depend on their specific
+    behaviors, but are deprecated and will eventually be removed.
+
+*   S2BufferOperation, S2WindingOperation, and supporting classes have been
+    ported from C++.
+
+*   Bug fixes & correctness improvements in S2ContainPointQuery, S2EdgeUtil,
+    S2Builder, and S2Predicates.
+
+*   Renamed S2EdgeQuery to S2CrossingEdgeQuery, matching the C++ implementation.
+
+*   Substantial reworking of S2DensityClusterQuery.
+
+*   Renamed S2Point.ORIGIN to S2Point.ZERO
+
+*   More migration from the internal "primitives" library to FastUtil.
+
+*   Many improvements, clarifications, and corrections to Javadoc.
+
+*   Migrated from com.google.common.base.Objects to java.util.Objects
+
+*   Internal migration from deprecated S2EdgeUtil.getClosestPoint() to
+    project().
+
+*   S2EdgeUtil.getMinDistanceMaxError() renamed getUpdateMinDistanceMaxError().
+
 ## 2025 Q2 Release Highlights
 
 Over 100 additional classes have been ported from C++, as well as more methods

benchmarks/src/com/google/common/geometry/S2ContainsVertexQueryBenchmark.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright 2025 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.common.geometry.benchmarks;
+
+import static com.google.common.geometry.TestDataGenerator.DEFAULT_LOOP_RADIUS;
+import static java.util.concurrent.TimeUnit.MICROSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import com.google.common.geometry.S2ContainsVertexQuery;
+import com.google.common.geometry.S2Loop;
+import com.google.common.geometry.S2Point;
+import com.google.common.geometry.S2Polygon;
+import java.util.ArrayList;
+import java.util.List;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+/**
+ * A simple benchmark for S2ContainsVertexQuery.
+ */
+public class S2ContainsVertexQueryBenchmark {
+
+  private S2ContainsVertexQueryBenchmark() {}
+
+  /**
+   * Benchmark state consisting of a polygon of many triangles, all around a common center point,
+   * forming a fan or windmill shape.
+   */
+  @State(Scope.Thread)
+  @BenchmarkMode(Mode.AverageTime)
+  @OutputTimeUnit(MICROSECONDS)
+  @Warmup(iterations = 3, time = 5, timeUnit = SECONDS)
+  @Measurement(iterations = 5, time = 5, timeUnit = SECONDS)
+  public static class PolygonState extends S2BenchmarkBaseState {
+    @Param({"4", "8", "64", "512", "4096", "32768"})
+    int numTriangles;
+
+    private S2Polygon polygon;
+    private S2Point center;
+
+    @Setup(Level.Trial)
+    @Override
+    public void setup() {
+      super.setup();
+      center = data.getRandomPoint();
+      List<S2Point> regularVertices = S2Loop.makeRegularVertices(
+          center, DEFAULT_LOOP_RADIUS, numTriangles * 2);
+
+      List<S2Loop> loops = new ArrayList<>();
+      for (int tri = 0; tri < numTriangles; tri++) {
+        List<S2Point> loopVertices = new ArrayList<>();
+        loopVertices.add(center);
+        loopVertices.add(regularVertices.get(tri * 2 + 0));
+        loopVertices.add(regularVertices.get(tri * 2 + 1));
+        loops.add(new S2Loop(loopVertices));
+      }
+
+      polygon = new S2Polygon(loops);
+    }
+
+    /**
+     * Measures the average time to create an S2ContainsVertexQuery, add all the incoming and
+     * outgoing edges of the polygon (w.r.t. the center point), and determine if the center point is
+     * contained or not.
+     */
+    @Benchmark
+    public int query() {
+      S2ContainsVertexQuery query = new S2ContainsVertexQuery(center);
+
+      for (S2Loop loop : polygon.getLoops()) {
+        // Loop vertex 0 is the center point.
+        query.addOutgoing(loop.vertex(1)); // The first loop edge is outgoing from the center.
+        // The edge from vertex 1 to vertex 2 isn't incident on the center.
+        query.addIncoming(loop.vertex(2)); // The third loop edge is incoming to the center.
+      }
+
+      return query.containsSign();
+    }
+  }
+
+
+}

…metry/primitives/IntVectorBenchmark.java …metry/primitives/IntVectorBenchmark.javagoogle3/javatests/com/google/common/geometry/primitives/IntVectorBenchmark.java renamed to benchmarks/src/com/google/common/geometry/primitives/IntVectorBenchmark.java google3/javatests/com/google/common/geometry/primitives/IntVectorBenchmark.java renamed to benchmarks/src/com/google/common/geometry/primitives/IntVectorBenchmark.java

@@ -15,8 +15,8 @@
  */
 package com.google.common.geometry;
 
-import com.google.common.base.Objects;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /** A point consisting of BigDecimal coordinates. */
 final class BigPoint implements Comparable<BigPoint> {
@@ -109,6 +109,6 @@ public boolean equals(Object that) {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(x, y, z);
+    return Objects.hash(x, y, z);
   }
 }