Syncing with S2 C++ code

Author: benguild

s2/edge_query.go

@@ -697,7 +697,7 @@ func (e *EdgeQuery) initCovering() {
 	if next.CellID() != last.CellID() {
 		// The index has at least two cells. Choose a level such that the entire
 		// index can be spanned with at most 6 cells (if the index spans multiple
-		// faces) or 4 cells (it the index spans a single face).
+		// faces) or 4 cells (if the index spans a single face).
 		level, ok := next.CellID().CommonAncestorLevel(last.CellID())
 		if !ok {
 			level = 0
@@ -721,7 +721,6 @@ func (e *EdgeQuery) initCovering() {
 			cellLast.Prev()
 			e.addInitialRange(cellFirst, cellLast)
 		}
-
 	}
 	e.addInitialRange(next, last)
 }

s2/edge_query_test.go

@@ -541,82 +541,3 @@ func fractionToRadius(fraction, radiusKm float64) s1.Angle {
 	}
 	return s1.Angle(fraction) * kmToAngle(radiusKm)
 }
-
-func TestEdgeQueryOptimized(t *testing.T) {
-	index := NewShapeIndex()
-
-	locations := []struct {
-		name string
-		lat  float64
-		lng  float64
-	}{
-		{"Face0", 20, 20},   // Africa - face 0
-		{"Face1", 40, 90},   // Central Asia - face 1
-		{"Face3", 0, 170},   // Pacific - face 3
-		{"Face4", 40, -100}, // North America - face 4
-	}
-
-	shapeIDToName := make(map[int32]string)
-	for _, loc := range locations {
-		center := PointFromLatLng(LatLngFromDegrees(loc.lat, loc.lng))
-		shapeID := index.Add(PolygonFromLoops([]*Loop{RegularLoop(
-			center,
-			CapFromCenterAngle(center, s1.Degree).Radius(),
-			8,
-		)}))
-		shapeIDToName[shapeID] = loc.name
-	}
-
-	queryPoint := PointFromLatLng(LatLngFromDegrees(0, 10))
-
-	// Run with optimized algorithm (the default)
-	optsOptimized := NewClosestEdgeQueryOptions()
-	optsOptimized = optsOptimized.IncludeInteriors(true)
-	resultsOptimized := NewClosestEdgeQuery(index, optsOptimized).FindEdges(
-		NewMinDistanceToPointTarget(queryPoint),
-	)
-
-	seenOptimized := make(map[int32]bool)
-	for _, r := range resultsOptimized {
-		seenOptimized[r.ShapeID()] = true
-	}
-
-	// Run with brute force for comparison
-	optsBruteForce := NewClosestEdgeQueryOptions()
-	optsBruteForce = optsBruteForce.IncludeInteriors(true)
-	optsBruteForce = optsBruteForce.UseBruteForce(true)
-	resultsBruteForce := NewClosestEdgeQuery(index, optsBruteForce).FindEdges(
-		NewMinDistanceToPointTarget(queryPoint),
-	)
-
-	seenBruteForce := make(map[int32]bool)
-	for _, r := range resultsBruteForce {
-		seenBruteForce[r.ShapeID()] = true
-	}
-
-	// Check if any shapes are missing from the optimized results
-	t.Logf("Optimized found %d shapes, brute force found %d shapes",
-		len(seenOptimized), len(seenBruteForce))
-
-	var missing []string
-	for id, name := range shapeIDToName {
-		if !seenOptimized[id] && seenBruteForce[id] {
-			missing = append(missing, name)
-		}
-	}
-
-	if len(missing) > 0 {
-		t.Errorf(
-			"Optimized algorithm missed shapes that brute force found: %v",
-			missing,
-		)
-	}
-
-	if len(seenOptimized) != len(seenBruteForce) {
-		t.Errorf(
-			"Optimized found %d shapes, brute force found %d shapes; should be equal",
-			len(seenOptimized),
-			len(seenBruteForce),
-		)
-	}
-}