MB-66210: LineString and MultiLineString changes

Author: Likith101

geojson/geojson_s2_util.go

@@ -39,33 +39,36 @@ func polylineIntersectsPoint(pls []*s2.Polyline,
 	return false
 }
 
+// check if any of the polyline vertices lie inside or
+// on the boundary of any of the polygons. Then check if
+// any of the polylines intersect with any of the edges of
+// the polygons
 func polylineIntersectsPolygons(pls []*s2.Polyline,
 	s2pgns []*s2.Polygon) bool {
-	// Early exit if the polygon contains any of the line's vertices.
+	idx := s2.NewShapeIndex()
+	for _, pgn := range s2pgns {
+		idx.Add(pgn)
+	}
+
+	containsQuery := s2.NewContainsPointQuery(idx, s2.VertexModelClosed)
 	for _, pl := range pls {
-		for i := 0; i < pl.NumEdges(); i++ {
-			edge := pl.Edge(i)
-			for _, s2pgn := range s2pgns {
-				if s2pgn.IntersectsCell(s2.CellFromPoint(edge.V0)) ||
-					s2pgn.IntersectsCell(s2.CellFromPoint(edge.V1)) {
-					return true
-				}
+		for _, point := range *pl {
+			if containsQuery.Contains(point) {
+				return true
 			}
 		}
 	}
 
 	for _, pl := range pls {
 		for _, s2pgn := range s2pgns {
-			for i := 0; i < pl.NumEdges(); i++ {
-				for i := 0; i < s2pgn.NumEdges(); i++ {
-					edgeB := s2pgn.Edge(i)
-					latLng1 := s2.LatLngFromPoint(edgeB.V0)
-					latLng2 := s2.LatLngFromPoint(edgeB.V1)
-					pl2 := s2.PolylineFromLatLngs([]s2.LatLng{latLng1, latLng2})
-
-					if pl.Intersects(pl2) {
-						return true
-					}
+			for i := 0; i < s2pgn.NumEdges(); i++ {
+				edgeB := s2pgn.Edge(i)
+				latLng1 := s2.LatLngFromPoint(edgeB.V0)
+				latLng2 := s2.LatLngFromPoint(edgeB.V1)
+				pl2 := s2.PolylineFromLatLngs([]s2.LatLng{latLng1, latLng2})
+
+				if pl.Intersects(pl2) {
+					return true
 				}
 			}
 		}
@@ -143,24 +146,20 @@ func rectangleIntersectsWithLineStrings(s2rect *s2.Rect,
 	polylines []*s2.Polyline) bool {
 	// Early exit path if the envelope contains any of the linestring's vertices.
 	for _, pl := range polylines {
-		for i := 0; i < pl.NumEdges(); i++ {
-			edge := pl.Edge(i)
-			if s2rect.IntersectsCell(s2.CellFromPoint(edge.V0)) ||
-				s2rect.IntersectsCell(s2.CellFromPoint(edge.V1)) {
+		for _, point := range *pl {
+			if s2rect.ContainsPoint(point) {
 				return true
 			}
 		}
 	}
 
 	for _, pl := range polylines {
-		for i := 0; i < pl.NumEdges(); i++ {
-			for j := 0; j < 4; j++ {
-				pl2 := s2.PolylineFromLatLngs([]s2.LatLng{s2rect.Vertex(j),
-					s2rect.Vertex((j + 1) % 4)})
+		for i := 0; i < 4; i++ {
+			pl2 := s2.PolylineFromLatLngs([]s2.LatLng{s2rect.Vertex(i),
+				s2rect.Vertex((i + 1) % 4)})
 
-				if pl.Intersects(pl2) {
-					return true
-				}
+			if pl.Intersects(pl2) {
+				return true
 			}
 		}
 	}

geojson/geojson_shapes_impl.go

@@ -298,6 +298,7 @@ func (ls *LineString) Intersects(other index.GeoJSON) (bool, error) {
 }
 
 func (ls *LineString) Contains(other index.GeoJSON) (bool, error) {
+	ls.init()
 	return checkLineStringsContainsShape([]*s2.Polyline{ls.pl}, other)
 }
 
@@ -366,6 +367,7 @@ func (p *MultiLineString) Intersects(other index.GeoJSON) (bool, error) {
 }
 
 func (p *MultiLineString) Contains(other index.GeoJSON) (bool, error) {
+	p.init()
 	return checkLineStringsContainsShape(p.pls, other)
 }
 
@@ -1063,7 +1065,6 @@ func checkLineStringsIntersectsShape(pls []*s2.Polyline, shapeIn,
 	if p2, ok := other.(*MultiPoint); ok {
 		// check the intersection for any point in the collection.
 		for _, point := range p2.s2points {
-
 			if polylineIntersectsPoint(pls, point) {
 				return true, nil
 			}
@@ -1132,7 +1133,9 @@ func checkLineStringsIntersectsShape(pls []*s2.Polyline, shapeIn,
 			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
+				if distance <= c.s2cap.Radius() {
+					return true, nil
+				}
 			}
 		}
 
@@ -1154,6 +1157,27 @@ func checkLineStringsIntersectsShape(pls []*s2.Polyline, shapeIn,
 // points and multipoints for the linestring vertices.
 func checkLineStringsContainsShape(pls []*s2.Polyline,
 	other index.GeoJSON) (bool, error) {
+	// check if the other shape is a point.
+	if p2, ok := other.(*Point); ok {
+		if polylineIntersectsPoint(pls, p2.s2point) {
+			return true, nil
+		}
+
+		return false, nil
+	}
+
+	// check if the other shape is a multipoint.
+	if p2, ok := other.(*MultiPoint); ok {
+		// check the containment for every point in the collection.
+		for _, point := range p2.s2points {
+			if !polylineIntersectsPoint(pls, point) {
+				return false, nil
+			}
+		}
+
+		return true, nil
+	}
+
 	return false, nil
 }