Updating LineString for multiple points.

The linestring could contain two or more points as per the
geoJSON standard and hence updating the utility methods
to handle that case.

Author: sreekanth-cb

geojson/geojson_s2_util.go

@@ -78,12 +78,13 @@ func geometryCollectionIntersectsShape(gc *GeometryCollection,
 func polygonsIntersectsLinestrings(s2pgn *s2.Polygon,
 	pls []*s2.Polyline) bool {
 	for _, pl := range pls {
-		if len(*pl) == 2 {
-			a := []float64{(*pl)[0].X, (*pl)[0].Y}
-			b := []float64{(*pl)[1].X, (*pl)[1].Y}
+		for i := 0; i < pl.NumEdges(); i++ {
+			edge := pl.Edge(i)
+			a := []float64{edge.V0.X, edge.V0.Y}
+			b := []float64{edge.V1.X, edge.V1.Y}
 
-			for i := 0; i < s2pgn.NumEdges(); i++ {
-				edgeB := s2pgn.Edge(i)
+			for j := 0; j < s2pgn.NumEdges(); j++ {
+				edgeB := s2pgn.Edge(j)
 
 				c := []float64{edgeB.V0.X, edgeB.V0.Y}
 				d := []float64{edgeB.V1.X, edgeB.V1.Y}
@@ -103,9 +104,9 @@ func polygonsContainsLineStrings(s2pgns []*s2.Polygon,
 	linesWithIn := make(map[int]struct{})
 nextLine:
 	for lineIndex, pl := range pls {
-		if len(*pl) == 2 {
-			start := (*pl)[0]
-			end := (*pl)[1]
+		for i := 0; i < len(*pl)-1; i++ {
+			start := (*pl)[i]
+			end := (*pl)[i+1]
 
 			// check whether both the end vertices are inside the polygon.
 			for _, s2pgn := range s2pgns {

geojson/geojson_shapes_impl.go

@@ -256,9 +256,10 @@ func NewGeoJsonLinestring(points [][]float64) index.GeoJSON {
 
 func (ls *LineString) init() {
 	if ls.pl == nil {
-		latlngs := make([]s2.LatLng, 2)
-		latlngs[0] = s2.LatLngFromDegrees(ls.Vertices[0][1], ls.Vertices[0][0])
-		latlngs[1] = s2.LatLngFromDegrees(ls.Vertices[1][1], ls.Vertices[1][0])
+		latlngs := make([]s2.LatLng, len(ls.Vertices))
+		for i, vertex := range ls.Vertices {
+			latlngs[i] = s2.LatLngFromDegrees(vertex[1], vertex[0])
+		}
 		ls.pl = s2.PolylineFromLatLngs(latlngs)
 	}
 }
@@ -1088,9 +1089,11 @@ func checkLineStringsIntersectsShape(pls []*s2.Polyline, shapeIn,
 	if c, ok := other.(*Circle); ok {
 		centre := c.s2cap.Center()
 		for _, pl := range pls {
-			edge := pl.Edge(0)
-			distance := s2.DistanceFromSegment(centre, edge.V0, edge.V1)
-			return distance <= c.s2cap.Radius(), nil
+			for i := 0; i < pl.NumEdges(); i++ {
+				edge := pl.Edge(i)
+				distance := s2.DistanceFromSegment(centre, edge.V0, edge.V1)
+				return distance <= c.s2cap.Radius(), nil
+			}
 		}
 
 		return false, nil
@@ -1099,18 +1102,20 @@ func checkLineStringsIntersectsShape(pls []*s2.Polyline, shapeIn,
 	// check if the other shape is a envelope.
 	if e, ok := other.(*Envelope); ok {
 		for _, pl := range pls {
-			edge := pl.Edge(0)
-			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) {
-					return true, nil
+			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) {
+						return true, nil
+					}
 				}
 			}
 		}