From 27fc6fa5c9101db895f43e1046ca84a5342f0d64 Mon Sep 17 00:00:00 2001
From: Vincent Neo <23420208+vincentneo@users.noreply.github.com>
Date: Wed, 13 Feb 2019 11:16:57 +0800
Subject: [PATCH] access control updates

---
 Classes/GPXBounds.swift       |  8 ++++----
 Classes/GPXCopyright.swift    |  6 +++---
 Classes/GPXEmail.swift        |  4 ++--
 Classes/GPXParser.swift       |  2 +-
 Classes/GPXPerson.swift       |  6 +++---
 Classes/GPXPoint.swift        | 24 ++++++++++++++++++++----
 Classes/GPXPointSegment.swift |  2 +-
 Classes/GPXRoute.swift        | 18 +++++++++---------
 8 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/Classes/GPXBounds.swift b/Classes/GPXBounds.swift
index 73e4626..0c5a33d 100644
--- a/Classes/GPXBounds.swift
+++ b/Classes/GPXBounds.swift
@@ -9,10 +9,10 @@ import Foundation
 
 open class GPXBounds: GPXElement {
 
-    var minLatitude: Double?
-    var maxLatitude: Double?
-    var minLongitude: Double?
-    var maxLongitude: Double?
+    public var minLatitude: Double?
+    public var maxLatitude: Double?
+    public var minLongitude: Double?
+    public var maxLongitude: Double?
     
     // MARK:- Instance
     
diff --git a/Classes/GPXCopyright.swift b/Classes/GPXCopyright.swift
index 480a075..1e235f2 100644
--- a/Classes/GPXCopyright.swift
+++ b/Classes/GPXCopyright.swift
@@ -9,9 +9,9 @@ import Foundation
 
 open class GPXCopyright: GPXElement {
     
-    var year: Date?
-    var license: String?
-    var author: String?
+    public var year: Date?
+    public var license: String?
+    public var author: String?
     
     // MARK:- Instance
     
diff --git a/Classes/GPXEmail.swift b/Classes/GPXEmail.swift
index a728c0a..327721c 100644
--- a/Classes/GPXEmail.swift
+++ b/Classes/GPXEmail.swift
@@ -10,8 +10,8 @@ import Foundation
 /// An email address. Broken into two parts (id and domain) to help prevent email harvesting.
 open class GPXEmail: GPXElement {
     
-    var emailID: String?
-    var domain: String?
+    public var emailID: String?
+    public var domain: String?
     
     // MARK:- Instance
     
diff --git a/Classes/GPXParser.swift b/Classes/GPXParser.swift
index 8317063..c2d4b99 100644
--- a/Classes/GPXParser.swift
+++ b/Classes/GPXParser.swift
@@ -9,7 +9,7 @@ import Foundation
 
 open class GPXParser: NSObject, XMLParserDelegate {
     
-    var parser: XMLParser
+    private var parser: XMLParser
     
     // MARK:- Initializers
     
diff --git a/Classes/GPXPerson.swift b/Classes/GPXPerson.swift
index 5765743..945c3b3 100644
--- a/Classes/GPXPerson.swift
+++ b/Classes/GPXPerson.swift
@@ -9,9 +9,9 @@ import Foundation
 
 open class GPXPerson: GPXElement {
     
-    var name: String?
-    var email: GPXEmail?
-    var link: GPXLink?
+    public var name: String?
+    public var email: GPXEmail?
+    public var link: GPXLink?
     
     // MARK:- Instance
     
diff --git a/Classes/GPXPoint.swift b/Classes/GPXPoint.swift
index 6fe85ca..d370596 100644
--- a/Classes/GPXPoint.swift
+++ b/Classes/GPXPoint.swift
@@ -10,10 +10,10 @@ import Foundation
 
 open class GPXPoint: GPXElement {
 
-    var elevation: Double? = Double()
-    var time: Date = Date()
-    var latitude: Double? = Double()
-    var longitude: Double? = Double()
+    public var elevation: Double?
+    public var time: Date?
+    public var latitude: Double?
+    public var longitude: Double?
     
     // MARK:- Instance
     
@@ -22,10 +22,26 @@ open class GPXPoint: GPXElement {
     }
     
     public init(latitude: Double, longitude: Double) {
+        super.init()
         self.latitude = latitude
         self.longitude = longitude
     }
     
+    init(dictionary: [String : String]) {
+        super.init()
+        self.latitude = number(from: dictionary["lat"])
+        self.longitude = number(from: dictionary["lon"])
+        self.elevation = number(from: dictionary["ele"])
+        self.time = ISO8601DateParser.parse(dictionary["time"])
+    }
+    
+    func number(from string: String?) -> Double? {
+        guard let NonNilString = string else {
+            return nil
+        }
+        return Double(NonNilString)
+    }
+    
     // MARK:- Tag
     
     override func tagName() -> String {
diff --git a/Classes/GPXPointSegment.swift b/Classes/GPXPointSegment.swift
index e2d83d7..f9c9dbe 100644
--- a/Classes/GPXPointSegment.swift
+++ b/Classes/GPXPointSegment.swift
@@ -9,7 +9,7 @@ import Foundation
 
 open class GPXPointSegment: GPXElement {
     
-    var points = [GPXPoint]()
+    public var points = [GPXPoint]()
     
     // MARK:- Instance
     
diff --git a/Classes/GPXRoute.swift b/Classes/GPXRoute.swift
index 61e6343..96ebef4 100644
--- a/Classes/GPXRoute.swift
+++ b/Classes/GPXRoute.swift
@@ -9,15 +9,15 @@ import Foundation
 
 open class GPXRoute: GPXElement {
     
-    var name: String?
-    var comment: String?
-    var desc: String?
-    var source: String?
-    var link: GPXLink?
-    var type: String?
-    var extensions: GPXExtensions?
-    var routepoints = [GPXRoutePoint]()
-    var number: Int?
+    public var name: String?
+    public var comment: String?
+    public var desc: String?
+    public var source: String?
+    public var link: GPXLink?
+    public var type: String?
+    public var extensions: GPXExtensions?
+    public var routepoints = [GPXRoutePoint]()
+    public var number: Int?
     
     // MARK:- Instance