Reversed overlapping, self overlapping

Outdooractive · Jul 25, 2024 · 5f31fb1 · 5f31fb1
1 parent e3fd74b
commit 5f31fb1
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 9 deletions.
diff --git a/Sources/GISTools/Algorithms/LineOverlap.swift b/Sources/GISTools/Algorithms/LineOverlap.swift
@@ -59,6 +59,19 @@ extension LineSegment {
             {
                 return .otherPartialOverlapAtStart
             }
+            else if other.first != first,
+                    checkIsOnSegment(other.first),
+                    other.checkIsOnSegment(first)
+            {
+                return .otherPartialOverlapAtStart
+            }
+            else if other.second != second,
+                    checkIsOnSegment(other.second),
+                    other.checkIsOnSegment(second)
+            {
+                return .otherPartialOverlapAtEnd
+
+            }
         }
         else if tolerance > 0.0 {
             if other.nearestCoordinateOnSegment(from: first).distance <= tolerance,
@@ -83,6 +96,19 @@ extension LineSegment {
             {
                 return .otherPartialOverlapAtStart
             }
+            else if other.first.distance(from: first) > tolerance,
+                    nearestCoordinateOnSegment(from: other.first).distance <= tolerance,
+                    other.nearestCoordinateOnSegment(from: first).distance <= tolerance
+            {
+                return .otherPartialOverlapAtStart
+            }
+            else if other.second.distance(from: second) > tolerance,
+                    nearestCoordinateOnSegment(from: other.second).distance <= tolerance,
+                    other.nearestCoordinateOnSegment(from: second).distance <= tolerance
+            {
+                return .otherPartialOverlapAtEnd
+
+            }
         }
 
         return .notEqual
@@ -101,15 +127,16 @@ extension GeoJson {
     /// Returns the overlapping segments between the receiver and the other geometry.
     ///
     /// - Parameters:
-    ///    - other: The other geometry, or `nil` for overlapping segments within the receiver
+    ///    - other: The other geometry, or `nil` for overlapping segments with the receiver itself
     ///    - tolerance: The tolerance, in meters
     public func overlappingSegments(
-        with other: GeoJson,
+        with other: GeoJson?,
         tolerance: CLLocationDistance = 0.0)
         -> [SegmentOverlapResult]
     {
         let tolerance = abs(tolerance)
-        let other = other.projected(to: projection)
+        let isSelfMatching = other == nil
+        let other = other?.projected(to: projection) ?? self
 
         var result: [SegmentOverlapResult] = []
 
@@ -120,7 +147,17 @@ extension GeoJson {
 
             let matches = tree.search(inBoundingBox: boundingBox)
 
+            var hadSelfSegmentMatch = false
+
             for match in matches {
+                if isSelfMatching,
+                   !hadSelfSegmentMatch,
+                   segment == match
+                {
+                    hadSelfSegmentMatch = true
+                    continue
+                }
+
                 let comparison = segment.compare(other: match, tolerance: tolerance)
 
                 guard comparison != .notEqual else { continue }
@@ -135,7 +172,7 @@ extension GeoJson {
         return result
     }
 
-    /// Returns the overlapping segments within the receiver.
+    /// Returns the overlapping segments with the receiver itself.
     ///
     /// - Parameters:
     ///    - tolerance: The tolerance, in meters

diff --git a/Sources/GISTools/GeoJson/LineSegment.swift b/Sources/GISTools/GeoJson/LineSegment.swift
@@ -1,5 +1,5 @@
 #if !os(Linux)
-import CoreLocation
+    import CoreLocation
 #endif
 import Foundation
 
@@ -39,7 +39,7 @@ extension LineSegment {
 
     /// The receiver's two coordinates.
     public var coordinates: [Coordinate3D] {
-        return [first, second]
+        [first, second]
     }
 
 }
@@ -90,7 +90,7 @@ extension LineSegment {
 extension LineSegment: BoundingBoxRepresentable {
 
     public func calculateBoundingBox() -> BoundingBox? {
-        return BoundingBox(coordinates: coordinates)
+        BoundingBox(coordinates: coordinates)
     }
 
     public func intersects(_ otherBoundingBox: BoundingBox) -> Bool {
@@ -131,12 +131,12 @@ extension LineSegment: BoundingBoxRepresentable {
 
 extension LineSegment: Equatable {
 
-    public static func ==(
+    public static func == (
         lhs: LineSegment,
         rhs: LineSegment)
         -> Bool
     {
-        return lhs.first == rhs.first
+        lhs.first == rhs.first
             && lhs.second == rhs.second
     }
 

diff --git a/Tests/GISToolsTests/Algorithms/LineOverlapTests.swift b/Tests/GISToolsTests/Algorithms/LineOverlapTests.swift
@@ -198,4 +198,24 @@ final class LineOverlapTests: XCTestCase {
         XCTAssertEqual(overlapping.count, 3)
     }
 
+    func testSelfOverlap3WithSegments() {
+        let lineString = LineString([
+            Coordinate3D(latitude: 0.0, longitude: 0.0),
+            Coordinate3D(latitude: 2.0, longitude: 0.0),
+            Coordinate3D(latitude: 2.0, longitude: 2.0),
+            Coordinate3D(latitude: 1.0, longitude: 2.0),
+            Coordinate3D(latitude: 1.0, longitude: 0.0),
+            Coordinate3D(latitude: 3.0, longitude: 0.0),
+            Coordinate3D(latitude: 3.0, longitude: -2.0),
+            Coordinate3D(latitude: 2.0, longitude: -2.0),
+            Coordinate3D(latitude: 2.0, longitude: 0.0),
+            Coordinate3D(latitude: 0.0, longitude: 0.0),
+        ])!
+
+        let overlapping = lineString.overlappingSegments(with: nil)
+        overlapping.forEach({ print("\($0.kind): \($0.segment.coordinates), other: \($0.other.coordinates)") })
+
+        XCTAssertEqual(overlapping.count, 6)
+    }
+
 }