Skip to content

Commit f0977fe

Browse files
abhinavdangetiabhinavdangeti
committed
Reroute golang/geo imports to blevesearch/geo
1 parent d718384 commit f0977fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+148
-152
lines changed

‎geojson/geojson_s2_util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
index "github.com/blevesearch/bleve_index_api"
2222
"github.com/blevesearch/geo/s2"
23-
"github.com/golang/geo/s1"
23+
"github.com/blevesearch/geo/s1"
2424
)
2525

2626
// ------------------------------------------------------------------------

‎go.mod

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ module github.com/blevesearch/geo
33
go 1.21.0
44

55
require (
6-
github.com/blevesearch/bleve_index_api v1.1.6
7-
github.com/golang/geo v0.0.0-20210211234256-740aa86cb551
6+
github.com/blevesearch/bleve_index_api v1.2.8
7+
github.com/google/go-cmp v0.7.0
88
github.com/json-iterator/go v0.0.0-20171115153421-f7279a603ede
99
)
1010

1111
require (
1212
github.com/google/gofuzz v1.2.0 // indirect
1313
github.com/stretchr/testify v1.7.1 // indirect
14-
github.com/google/go-cmp v0.7.0 // indirect
15-
)
14+
)

‎go.sum

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
2-
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
3-
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
4-
github.com/blevesearch/bleve_index_api v1.1.6 h1:orkqDFCBuNU2oHW9hN2YEJmet+TE9orml3FCGbl1cKk=
5-
github.com/blevesearch/bleve_index_api v1.1.6/go.mod h1:PbcwjIcRmjhGbkS/lJCpfgVSMROV6TRubGGAODaK1W8=
1+
github.com/blevesearch/bleve_index_api v1.2.8 h1:Y98Pu5/MdlkRyLM0qDHostYo7i+Vv1cDNhqTeR4Sy6Y=
2+
github.com/blevesearch/bleve_index_api v1.2.8/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
63
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
74
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8-
github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo=
9-
github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
5+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
6+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
107
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
118
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
129
github.com/json-iterator/go v0.0.0-20171115153421-f7279a603ede h1:YrgBGwxMRK0Vq0WSCWFaZUnTsrA/PZE/xs1QZh+/edg=

‎r2/rect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"fmt"
1919
"math"
2020

21-
"github.com/golang/geo/r1"
21+
"github.com/blevesearch/geo/r1"
2222
)
2323

2424
// Point represents a point in ℝ².

‎r2/rect_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"reflect"
2323
"testing"
2424

25-
"github.com/golang/geo/r1"
25+
"github.com/blevesearch/geo/r1"
2626
)
2727

2828
var (

‎r3/vector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"fmt"
1919
"math"
2020

21-
"github.com/golang/geo/s1"
21+
"github.com/blevesearch/geo/s1"
2222
)
2323

2424
// Vector represents a point in ℝ³.

‎s1/example_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"fmt"
1919
"math"
2020

21-
"github.com/golang/geo/s1"
21+
"github.com/blevesearch/geo/s1"
2222
)
2323

2424
func ExampleInterval_DirectedHausdorffDistance() {

‎s2/builder_snapper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package s2
1717
import (
1818
"math"
1919

20-
"github.com/golang/geo/s1"
20+
"github.com/blevesearch/geo/s1"
2121
)
2222

2323
// A Snapper restricts the locations of the output vertices. For

‎s2/builder_snapper_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package s2
1717
import (
1818
"testing"
1919

20-
"github.com/golang/geo/s1"
20+
"github.com/blevesearch/geo/s1"
2121
)
2222

2323
func TestIdentitySnapper(t *testing.T) {

‎s2/cap.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"io"
2020
"math"
2121

22-
"github.com/golang/geo/r1"
23-
"github.com/golang/geo/s1"
22+
"github.com/blevesearch/geo/r1"
23+
"github.com/blevesearch/geo/s1"
2424
)
2525

2626
var (

‎s2/cap_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"math"
1919
"testing"
2020

21-
"github.com/golang/geo/r3"
22-
"github.com/golang/geo/s1"
21+
"github.com/blevesearch/geo/r3"
22+
"github.com/blevesearch/geo/s1"
2323
)
2424

2525
const (

‎s2/cell.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"io"
1919
"math"
2020

21-
"github.com/golang/geo/r1"
22-
"github.com/golang/geo/r2"
23-
"github.com/golang/geo/r3"
24-
"github.com/golang/geo/s1"
21+
"github.com/blevesearch/geo/r1"
22+
"github.com/blevesearch/geo/r2"
23+
"github.com/blevesearch/geo/r3"
24+
"github.com/blevesearch/geo/s1"
2525
)
2626

2727
// CellBoundary represents canonical identifiers for the boundaries of the cell.

‎s2/cell_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"testing"
2020
"unsafe"
2121

22-
"github.com/golang/geo/r2"
23-
"github.com/golang/geo/s1"
22+
"github.com/blevesearch/geo/r2"
23+
"github.com/blevesearch/geo/s1"
2424
)
2525

2626
// maxCellSize is the upper bounds on the number of bytes we want the Cell object to ever be.
@@ -559,7 +559,7 @@ func TestCellContainsPoint(t *testing.T) {
559559

560560
func TestCellContainsPointConsistentWithS2CellIDFromPoint(t *testing.T) {
561561
// TODO: Is it still about 1% flaky with a random seed.
562-
// TODO(rsned): https://github.com/golang/geo/issues/120
562+
// TODO(rsned): https://github.com/blevesearch/geo/issues/120
563563

564564
// Construct many points that are nearly on a Cell edge, and verify that
565565
// CellFromCellID(cellIDFromPoint(p)).Contains(p) is always true.
@@ -731,7 +731,7 @@ func maxDistanceToEdgeBruteForce(cell Cell, a, b Point) s1.ChordAngle {
731731

732732
func TestCellDistanceToEdge(t *testing.T) {
733733
// TODO: Is it still about 0.1% flaky with a random seed.
734-
// TODO(rsned): https://github.com/golang/geo/issues/120
734+
// TODO(rsned): https://github.com/blevesearch/geo/issues/120
735735

736736
for iter := 0; iter < 1000; iter++ {
737737
cell := CellFromCellID(randomCellID())

‎s2/cellid.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"strconv"
2424
"strings"
2525

26-
"github.com/golang/geo/r1"
27-
"github.com/golang/geo/r2"
28-
"github.com/golang/geo/r3"
29-
"github.com/golang/geo/s1"
26+
"github.com/blevesearch/geo/r1"
27+
"github.com/blevesearch/geo/r2"
28+
"github.com/blevesearch/geo/r3"
29+
"github.com/blevesearch/geo/s1"
3030
)
3131

3232
// CellID uniquely identifies a cell in the S2 cell decomposition.

‎s2/cellid_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"reflect"
2020
"testing"
2121

22-
"github.com/golang/geo/r2"
23-
"github.com/golang/geo/s1"
22+
"github.com/blevesearch/geo/r2"
23+
"github.com/blevesearch/geo/s1"
2424
)
2525

2626
func TestCellIDFromFace(t *testing.T) {

‎s2/cellunion.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"io"
2020
"sort"
2121

22-
"github.com/golang/geo/s1"
22+
"github.com/blevesearch/geo/s1"
2323
)
2424

2525
// A CellUnion is a collection of CellIDs.

‎s2/cellunion_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"reflect"
2121
"testing"
2222

23-
"github.com/golang/geo/r1"
24-
"github.com/golang/geo/s1"
23+
"github.com/blevesearch/geo/r1"
24+
"github.com/blevesearch/geo/s1"
2525
)
2626

2727
func TestCellUnionDuplicateCellsNotValid(t *testing.T) {
@@ -376,7 +376,7 @@ func addCells(id CellID, selected bool, input *[]CellID, expected *[]CellID, t *
376376
// TODO(rsned): This test has been split out into several smaller test cases in C++.
377377
// It might make sense to refactor this to stay more inline with what's current.
378378
func TestCellUnionNormalizePseudoRandom(t *testing.T) {
379-
// TODO(rsned): https://github.com/golang/geo/issues/120
379+
// TODO(rsned): https://github.com/blevesearch/geo/issues/120
380380
// Test is still flaky without a fixed seed. Specify one for now until
381381
// issue 120 is fully resolved.
382382
random = rand.New(rand.NewSource(1))

‎s2/centroids.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package s2
1717
import (
1818
"math"
1919

20-
"github.com/golang/geo/r3"
20+
"github.com/blevesearch/geo/r3"
2121
)
2222

2323
// There are several notions of the "centroid" of a triangle. First, there

‎s2/centroids_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"math"
1919
"testing"
2020

21-
"github.com/golang/geo/r3"
21+
"github.com/blevesearch/geo/r3"
2222
)
2323

2424
func TestCentroidsPlanarCentroid(t *testing.T) {

‎s2/contains_point_query_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"reflect"
1919
"testing"
2020

21-
"github.com/golang/geo/s1"
21+
"github.com/blevesearch/geo/s1"
2222
)
2323

2424
func TestContainsPointQueryVertexModelOpen(t *testing.T) {

‎s2/contains_vertex_query_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package s2
1717
import (
1818
"testing"
1919

20-
"github.com/golang/geo/s1"
20+
"github.com/blevesearch/geo/s1"
2121
)
2222

2323
func TestContainsVertexQueryUndetermined(t *testing.T) {

‎s2/convex_hull_query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package s2
1717
import (
1818
"sort"
1919

20-
"github.com/golang/geo/r3"
20+
"github.com/blevesearch/geo/r3"
2121
)
2222

2323
// ConvexHullQuery builds the convex hull of any collection of points,

‎s2/convex_hull_query_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"math"
1919
"testing"
2020

21-
"github.com/golang/geo/s1"
21+
"github.com/blevesearch/geo/s1"
2222
)
2323

2424
func TestConvexHullQueryNoPoints(t *testing.T) {

‎s2/crossing_edge_query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package s2
1717
import (
1818
"sort"
1919

20-
"github.com/golang/geo/r2"
20+
"github.com/blevesearch/geo/r2"
2121
)
2222

2323
// CrossingEdgeQuery is used to find the Edge IDs of Shapes that are crossed by

‎s2/crossing_edge_query_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"reflect"
2020
"testing"
2121

22-
"github.com/golang/geo/s1"
22+
"github.com/blevesearch/geo/s1"
2323
)
2424

2525
func perturbAtDistance(distance s1.Angle, a0, b0 Point) Point {

‎s2/distance_target.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package s2
1616

1717
import (
18-
"github.com/golang/geo/s1"
18+
"github.com/blevesearch/geo/s1"
1919
)
2020

2121
// The distance interface represents a set of common methods used by algorithms

‎s2/edge_clipping.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ package s2
2727
import (
2828
"math"
2929

30-
"github.com/golang/geo/r1"
31-
"github.com/golang/geo/r2"
32-
"github.com/golang/geo/r3"
30+
"github.com/blevesearch/geo/r1"
31+
"github.com/blevesearch/geo/r2"
32+
"github.com/blevesearch/geo/r3"
3333
)
3434

3535
const (

‎s2/edge_clipping_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"math"
2020
"testing"
2121

22-
"github.com/golang/geo/r1"
23-
"github.com/golang/geo/r2"
24-
"github.com/golang/geo/r3"
25-
"github.com/golang/geo/s1"
22+
"github.com/blevesearch/geo/r1"
23+
"github.com/blevesearch/geo/r2"
24+
"github.com/blevesearch/geo/r3"
25+
"github.com/blevesearch/geo/s1"
2626
)
2727

2828
func TestEdgeClippingIntersectsFace(t *testing.T) {

‎s2/edge_crosser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"math"
2020
"testing"
2121

22-
"github.com/golang/geo/r3"
22+
"github.com/blevesearch/geo/r3"
2323
)
2424

2525
func TestEdgeCrosserCrossings(t *testing.T) {

‎s2/edge_crossings.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"fmt"
1919
"math"
2020

21-
"github.com/golang/geo/r3"
22-
"github.com/golang/geo/s1"
21+
"github.com/blevesearch/geo/r3"
22+
"github.com/blevesearch/geo/s1"
2323
)
2424

2525
const (

‎s2/edge_crossings_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"math"
1919
"testing"
2020

21-
"github.com/golang/geo/s1"
21+
"github.com/blevesearch/geo/s1"
2222
)
2323

2424
// The various Crossing methods are tested via s2edge_crosser_test

‎s2/edge_distances.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package s2
2020
import (
2121
"math"
2222

23-
"github.com/golang/geo/s1"
23+
"github.com/blevesearch/geo/s1"
2424
)
2525

2626
// DistanceFromSegment returns the distance of point X from line segment AB.

‎s2/edge_distances_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"math"
1919
"testing"
2020

21-
"github.com/golang/geo/r3"
22-
"github.com/golang/geo/s1"
21+
"github.com/blevesearch/geo/r3"
22+
"github.com/blevesearch/geo/s1"
2323
)
2424

2525
func TestEdgeDistancesCheckDistance(t *testing.T) {

‎s2/edge_query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package s2
1717
import (
1818
"sort"
1919

20-
"github.com/golang/geo/s1"
20+
"github.com/blevesearch/geo/s1"
2121
)
2222

2323
// EdgeQueryOptions holds the options for controlling how EdgeQuery operates.

‎s2/edge_query_closest_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"fmt"
1919
"testing"
2020

21-
"github.com/golang/geo/r3"
22-
"github.com/golang/geo/s1"
21+
"github.com/blevesearch/geo/r3"
22+
"github.com/blevesearch/geo/s1"
2323
)
2424

2525
func TestClosestEdgeQueryNoEdges(t *testing.T) {

0 commit comments

Comments
 (0)