Fixed incorrect reading of track segments and track points

Author: RCCoop

Sources/RCGPX/Internal/GPXTrack+Internals.swift

@@ -24,15 +24,17 @@ extension GPXTrack: GPXElement {
         gpxDescription = xml["desc"].value
 
         segments = try xml
-            .all(withValue: Segment.xmlTag)?
+            .children
+            .filter { $0.name == Segment.xmlTag }
             .map { try Segment(xml: $0) }
-            ?? []
     }
 
     var xmlElement: AEXMLElement {
         let element = AEXMLElement(name: Self.xmlTag)
         element.addChild(name: "name", value: name)
-        element.addChild(name: "desc", value: gpxDescription)
+        if let desc = gpxDescription {
+            element.addChild(name: "desc", value: desc)
+        }
         element.addChildren(segments.map(\.xmlElement))
         return element
     }
@@ -46,7 +48,7 @@ extension GPXTrack.Segment: GPXElement {
     }
 
     init(xml: AEXMLElement) throws {
-        let pointChildren = xml.all(withValue: GPXTrack.Point.xmlTag) ?? []
+        let pointChildren = xml.children.filter { $0.name == GPXTrack.Point.xmlTag }
         trackPoints = try pointChildren.map { try GPXTrack.Point(xml: $0) }
     }
 

Tests/RCGPXTests/RCGPXTests.swift

@@ -36,16 +36,37 @@
                 XCTAssertEqual(gpxWpt.elevation ?? 0.0, knownTraits.elev, accuracy: 0.0001)
             }
 
-            //Tracks
+            //Tracks (number of segments)
             let knownTracks: [String : Int] = [
                 "Barrett Spur 1" : 2,
                 "Barrett Spur 2" : 3
             ]
+            let trackPointCounts: [String : Int] = [
+                "Barrett Spur 1" : 99,
+                "Barrett Spur 2" : 98
+            ]
             let trackNamesKnown = Set(knownTracks.keys)
             let trackNamesFound = Set(document.tracks.map(\.name))
             XCTAssertEqual(trackNamesKnown, trackNamesFound)
 
+            // Segments
+            for foundTrack in document.tracks {
+                XCTAssertEqual(knownTracks[foundTrack.name], foundTrack.segments.count)
+                XCTAssertEqual(trackPointCounts[foundTrack.name], foundTrack.allTrackPoints().count)
+            }
+            
+        }
+        
+        func testGpxWriting() throws {
+            guard let document = getTestDocument(name: "GPSVisSample") else {
+                XCTFail("Oh no! Can't open GPSVisSample file")
+                return
+            }
+
+            let gpxString = document.gpxString()
+            print(gpxString)
         }
+        
     }
 
     //MARK: Helper Functions