draft: replaced old intersects logic

Author: metonymic-smokey

geojson/geojson_s2_util.go

@@ -142,18 +142,11 @@ func rectangleIntersectsWithLineStrings(s2rect *s2.Rect,
 	polylines []*s2.Polyline) bool {
 	for _, pl := range polylines {
 		for i := 0; i < pl.NumEdges(); i++ {
-			edgeA := pl.Edge(i)
-			a := []float64{edgeA.V0.X, edgeA.V0.Y}
-			b := []float64{edgeA.V1.X, edgeA.V1.Y}
-
 			for j := 0; j < 4; j++ {
-				v1 := s2.PointFromLatLng(s2rect.Vertex(j))
-				v2 := s2.PointFromLatLng(s2rect.Vertex((j + 1) % 4))
-
-				c := []float64{v1.X, v1.Y}
-				d := []float64{v2.X, v2.Y}
+				pgnLine := s2.PolylineFromLatLngs([]s2.LatLng{s2rect.Vertex(j),
+					s2rect.Vertex((j + 1) % 4)})
 
-				if doIntersect(a, b, c, d) {
+				if pl.Intersects(pgnLine) {
 					return true
 				}
 			}

geojson/geojson_shapes_impl.go

@@ -1145,17 +1145,11 @@ func checkLineStringsIntersectsShape(pls []*s2.Polyline, shapeIn,
 	if e, ok := other.(*Envelope); ok {
 		for _, pl := range pls {
 			for i := 0; i < pl.NumEdges(); i++ {
-				edge := pl.Edge(i)
-				latlng1 := s2.LatLngFromPoint(edge.V0)
-				latlng2 := s2.LatLngFromPoint(edge.V1)
-				a := []float64{latlng1.Lng.Degrees(), latlng1.Lat.Degrees()}
-				b := []float64{latlng2.Lng.Degrees(), latlng2.Lat.Degrees()}
 				for j := 0; j < 4; j++ {
 					v1 := e.r.Vertex(j)
 					v2 := e.r.Vertex((j + 1) % 4)
-					c := []float64{v1.Lng.Degrees(), v1.Lat.Degrees()}
-					d := []float64{v2.Lng.Degrees(), v2.Lat.Degrees()}
-					if doIntersect(a, b, c, d) {
+					pgnLine := s2.PolylineFromLatLngs([]s2.LatLng{v1, v2})
+					if pl.Intersects(pgnLine) {
 						return true, nil
 					}
 				}