Closed paths move location back to last unbroken segment

Author: swhitty

Examples/Sources/ViewController.swift

@@ -65,7 +65,7 @@ class ViewController: UIViewController {
 
     override func loadView() {
         let imageView = UIImageView(frame: UIScreen.main.bounds)
-        imageView.image = Image(named: "stylesheet.svg", in: .samples)?.rasterize()
+        imageView.image = Image(named: "path-close.svg", in: .samples)?.rasterize()
         imageView.contentMode = .scaleAspectFit
         imageView.backgroundColor = .white
         self.view = imageView

Samples/key.svg

@@ -70,17 +70,12 @@ extension LayerTree.Path {
 
     return location
   }
-  
+
   var lastStart: LayerTree.Point? {
-    let rev = segments.reversed().dropFirst()
-    guard
-      let closeIdx = rev.firstIndex(where: { $0.isClose }),
-      closeIdx != rev.startIndex else {
-        return segments.first?.location
-    }
-    
-    let point = rev.index(before: closeIdx)
-    return rev[point].location
+      guard let index = segments.lastIndex(where:\.isMove) else {
+          return segments.first?.location
+      }
+      return segments[index].location
   }
 }
 
@@ -92,6 +87,13 @@ private extension LayerTree.Path.Segment {
     }
     return true
   }
+
+  var isMove: Bool {
+    guard case .move = self else {
+      return false
+    }
+    return true
+  }
 
   var location: LayerTree.Point? {
     switch self {

Samples/path-close.svg

@@ -42,6 +42,12 @@ final class LayerTreePathTests: XCTestCase {
   func testLocation() {
     let path = Path()
     XCTAssertNil(path.location)
+
+    path.segments.append(move(10, 10))
+    XCTAssertEqual(path.location, Point(10, 10))
+
+    path.segments.append(line(20, 20))
+    XCTAssertEqual(path.location, Point(20, 20))
 
     path.segments.append(move(110, 90))
     XCTAssertEqual(path.location, Point(110, 90))