Switching from "radiusKm" to units

Author: benguild

s2/edge_query_closest_test.go

@@ -20,6 +20,7 @@ import (
 
 	"github.com/golang/geo/r3"
 	"github.com/golang/geo/s1"
+	"github.com/google/go-units/unit"
 )
 
 func TestClosestEdgeQueryNoEdges(t *testing.T) {
@@ -238,7 +239,7 @@ func BenchmarkEdgeQueryFindEdges(b *testing.B) {
 				targetType:               queryTypePoint,
 				numTargetEdges:           0,
 				chooseTargetFromIndex:    false,
-				radiusKm:                 1000,
+				radius:                   1000 * unit.Kilometer,
 				maxDistanceFraction:      -1,
 				maxErrorFraction:         -1,
 				targetRadiusFraction:     0.0,
@@ -254,7 +255,7 @@ func BenchmarkEdgeQueryFindEdges(b *testing.B) {
 				targetType:               queryTypePoint,
 				numTargetEdges:           0,
 				chooseTargetFromIndex:    false,
-				radiusKm:                 1000,
+				radius:                   1000 * unit.Kilometer,
 				maxDistanceFraction:      -1,
 				maxErrorFraction:         -1,
 				targetRadiusFraction:     0.0,
@@ -271,7 +272,7 @@ func BenchmarkEdgeQueryFindEdges(b *testing.B) {
 				targetType:               queryTypePoint,
 				numTargetEdges:           0,
 				chooseTargetFromIndex:    false,
-				radiusKm:                 1000,
+				radius:                   1000 * unit.Kilometer,
 				maxDistanceFraction:      -1,
 				maxErrorFraction:         0.1,
 				targetRadiusFraction:     0.0,
@@ -288,7 +289,7 @@ func BenchmarkEdgeQueryFindEdges(b *testing.B) {
 				targetType:               queryTypePoint,
 				numTargetEdges:           0,
 				chooseTargetFromIndex:    false,
-				radiusKm:                 1000,
+				radius:                   1000 * unit.Kilometer,
 				maxDistanceFraction:      -1,
 				maxErrorFraction:         0.01,
 				targetRadiusFraction:     0.0,
@@ -302,7 +303,7 @@ func BenchmarkEdgeQueryFindEdges(b *testing.B) {
 				targetType:               queryTypeEdge,
 				numTargetEdges:           0,
 				chooseTargetFromIndex:    false,
-				radiusKm:                 1000,
+				radius:                   1000 * unit.Kilometer,
 				maxDistanceFraction:      -1,
 				maxErrorFraction:         -1,
 				targetRadiusFraction:     -1.0,
@@ -316,7 +317,7 @@ func BenchmarkEdgeQueryFindEdges(b *testing.B) {
 				targetType:               queryTypeCell,
 				numTargetEdges:           0,
 				chooseTargetFromIndex:    false,
-				radiusKm:                 1000,
+				radius:                   1000 * unit.Kilometer,
 				maxDistanceFraction:      -1,
 				maxErrorFraction:         -1,
 				targetRadiusFraction:     -1.0,

s2/edge_query_test.go

@@ -340,7 +340,7 @@ func benchmarkEdgeQueryFindClosest(b *testing.B, bmOpts *edgeQueryBenchmarkOptio
 	index := NewShapeIndex()
 	opts := NewClosestEdgeQueryOptions().MaxResults(1).IncludeInteriors(bmOpts.includeInteriors)
 
-	radius := s1.EarthAngleFromLength(unit.Length(bmOpts.radiusKm) * unit.Kilometer)
+	radius := s1.EarthAngleFromLength(bmOpts.radius)
 	if bmOpts.maxDistanceFraction > 0 {
 		opts.DistanceLimit(s1.ChordAngleFromAngle(s1.Angle(bmOpts.maxDistanceFraction) * radius))
 	}
@@ -389,7 +389,7 @@ type edgeQueryBenchmarkOptions struct {
 	targetType               queryTargetType
 	numTargetEdges           int
 	chooseTargetFromIndex    bool
-	radiusKm                 float64
+	radius                   unit.Length
 	maxDistanceFraction      float64
 	maxErrorFraction         float64
 	targetRadiusFraction     float64
@@ -401,8 +401,8 @@ type edgeQueryBenchmarkOptions struct {
 // use in an edge query.
 //
 // Approximately numIndexEdges will be generated by the requested generator and
-// inserted. The geometry is generated within a Cap of the radius specified
-// by radiusKm (the index radius). Parameters with fraction in their
+// inserted. The geometry is generated within a Cap of the specified radius
+// (the index radius). Parameters with fraction in their
 // names are expressed as a fraction of this radius.
 //
 // Also generates a set of target geometries for the query, based on the
@@ -438,7 +438,7 @@ func generateEdgeQueryWithTargets(opts *edgeQueryBenchmarkOptions, query *EdgeQu
 	opts.randomSeed++
 	indexCap := CapFromCenterAngle(
 		randomPoint(r),
-		s1.EarthAngleFromLength(unit.Length(opts.radiusKm)*unit.Kilometer),
+		s1.EarthAngleFromLength(opts.radius),
 	)
 
 	query.Reset()
@@ -455,10 +455,10 @@ func generateEdgeQueryWithTargets(opts *edgeQueryBenchmarkOptions, query *EdgeQu
 	}
 
 	for i := 0; i < numTargets; i++ {
-		targetDist := fractionToRadius(opts.centerSeparationFraction, opts.radiusKm)
+		targetDist := fractionToRadius(opts.centerSeparationFraction, opts.radius)
 		targetCap := CapFromCenterAngle(
 			sampleBoundaryFromCap(CapFromCenterAngle(indexCap.Center(), targetDist)),
-			fractionToRadius(opts.targetRadiusFraction, opts.radiusKm),
+			fractionToRadius(opts.targetRadiusFraction, opts.radius),
 		)
 
 		switch opts.targetType {
@@ -539,9 +539,9 @@ func sampleCellFromIndex(index *ShapeIndex) CellID {
 	return iter.CellID()
 }
 
-func fractionToRadius(fraction, radiusKm float64) s1.Angle {
+func fractionToRadius(fraction float64, radius unit.Length) s1.Angle {
 	if fraction < 0 {
 		fraction = -randomFloat64() * fraction
 	}
-	return s1.EarthAngleFromLength(unit.Length(fraction*radiusKm) * unit.Kilometer)
+	return s1.EarthAngleFromLength(unit.Length(fraction) * radius)
 }