From 256b2d777e310f7cc8cfff5141b82a94d804da8f Mon Sep 17 00:00:00 2001
From: Maciej Maj <maciejmaj@me.com>
Date: Wed, 3 Apr 2019 20:26:28 +0200
Subject: [PATCH 1/4] Added timer, before XML library

---
 Arc-app-export-converter/Program.cs      | 3 ++-
 ConverterLibrary/ConverterLibrary.csproj | 1 +
 ConverterLibrary/ElevationCalculator.cs  | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 ConverterLibrary/ElevationCalculator.cs

diff --git a/Arc-app-export-converter/Program.cs b/Arc-app-export-converter/Program.cs
index 32a8894..4f4d97a 100644
--- a/Arc-app-export-converter/Program.cs
+++ b/Arc-app-export-converter/Program.cs
@@ -13,7 +13,7 @@ public static void Main() {
 			Console.WriteLine("Places initialised");
 		}
 		SetupWeight();
-
+		DateTime startTime = DateTime.Now;
 		foreach (var item in ReturnFilePath()) {
 			Console.ForegroundColor = ConsoleColor.DarkGray;
 			Console.WriteLine();
@@ -28,6 +28,7 @@ public static void Main() {
 
 		// On finish
 		PlacesManager.SavePlaces();
+		Console.WriteLine(DateTime.Now - startTime);
 	}
 
 	static void SetupWeight() {
diff --git a/ConverterLibrary/ConverterLibrary.csproj b/ConverterLibrary/ConverterLibrary.csproj
index 646adfc..a36c1a6 100644
--- a/ConverterLibrary/ConverterLibrary.csproj
+++ b/ConverterLibrary/ConverterLibrary.csproj
@@ -40,6 +40,7 @@
     <Compile Include="JsonParser.cs" />
     <Compile Include="PlacesManager.cs" />
     <Compile Include="XmlReader.cs" />
+    <Compile Include="ElevationCalculator.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/ConverterLibrary/ElevationCalculator.cs b/ConverterLibrary/ElevationCalculator.cs
new file mode 100644
index 0000000..176cf19
--- /dev/null
+++ b/ConverterLibrary/ElevationCalculator.cs
@@ -0,0 +1,4 @@
+using System;
+public class ElevationCalculator {
+
+}

From 6cbd528fd1b481a0e791d673c863c36123d2cc5d Mon Sep 17 00:00:00 2001
From: Maciej Maj <maciejmaj@me.com>
Date: Wed, 3 Apr 2019 22:18:40 +0200
Subject: [PATCH 2/4] New library implementation

---
 Arc-app-export-converter/Program.cs      |  6 ++---
 ConverterLibrary/ConverterLibrary.csproj |  5 +++-
 ConverterLibrary/XmlReader.cs            | 34 ++++++++++++++++++++----
 ConverterLibrary/packages.config         |  3 ++-
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/Arc-app-export-converter/Program.cs b/Arc-app-export-converter/Program.cs
index 4f4d97a..2ae6557 100644
--- a/Arc-app-export-converter/Program.cs
+++ b/Arc-app-export-converter/Program.cs
@@ -21,9 +21,9 @@ public static void Main() {
 			XmlReader xr = new XmlReader(item, true, weight);
 
 
-			// Split into days
-			List<XmlReader> daysInXml = XmlReader.Split(xr);
-			JsonParser.Parse(daysInXml, xr.originalName + ".json", true);
+			//// Split into days
+			//List<XmlReader> daysInXml = XmlReader.Split(xr);
+			//JsonParser.Parse(daysInXml, xr.originalName + ".json", true);
 		}
 
 		// On finish
diff --git a/ConverterLibrary/ConverterLibrary.csproj b/ConverterLibrary/ConverterLibrary.csproj
index a36c1a6..ab2c57c 100644
--- a/ConverterLibrary/ConverterLibrary.csproj
+++ b/ConverterLibrary/ConverterLibrary.csproj
@@ -29,7 +29,10 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="GpxTools">
+      <HintPath>..\packages\GpxTools.macharius40.1.0.2\lib\netstandard2.0\GpxTools.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/ConverterLibrary/XmlReader.cs b/ConverterLibrary/XmlReader.cs
index daa8c48..5d839a6 100644
--- a/ConverterLibrary/XmlReader.cs
+++ b/ConverterLibrary/XmlReader.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using GpxTools;
 
 public class XmlTimeline {
 
@@ -245,12 +246,35 @@ public class XmlReader {
 	// Activity and places loading
 	public XmlReader(string path, bool isPath, float weight) {
 		this.weight = weight;
-		if (isPath) {
-			originalName = path.Replace(".gpx", "");
-			LoadFile(path);
-		} else {
-			LoadString(path);
+		string allText = File.ReadAllText(path);
+		byte[] byteArray = Encoding.UTF8.GetBytes(allText);
+		MemoryStream stream = new MemoryStream(byteArray);
+		GpxReader gpxReader = new GpxReader(stream);
+		while (gpxReader.Read()) {
+			switch (gpxReader.ObjectType) {
+				case GpxObjectType.Metadata:
+					//gpxReader.Metadata;
+					break;
+				case GpxObjectType.WayPoint:
+					//gpxReader.WayPoint;
+					break;
+				case GpxObjectType.Route:
+					//gpxReader.Route;
+					break;
+				case GpxObjectType.Track:
+					//gpxReader.Track;
+					break;
+			}
 		}
+		GpxAnalyser analyser = new GpxAnalyser(gpxReader);
+		Console.WriteLine(gpxReader.Read());
+
+		//if (isPath) {
+		//	originalName = path.Replace(".gpx", "");
+		//	LoadFile(path);
+		//} else {
+		//	LoadString(path);
+		//}
 	}
 	public XmlReader(List<XmlTimeline.TimelineItem> timelineItems) {
 		for (int i = 0; i < 10; i++) {
diff --git a/ConverterLibrary/packages.config b/ConverterLibrary/packages.config
index 5762754..a8a6430 100644
--- a/ConverterLibrary/packages.config
+++ b/ConverterLibrary/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
+  <package id="GpxTools.macharius40" version="1.0.2" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
 </packages>
\ No newline at end of file

From f3989f741ed648a9234e747ab6aae9105f8e0fa1 Mon Sep 17 00:00:00 2001
From: Maciej Maj <maciejmaj@me.com>
Date: Wed, 3 Apr 2019 23:34:39 +0200
Subject: [PATCH 3/4] Working migration

---
 Arc-app-export-converter/Program.cs |   4 +-
 ConverterLibrary/JsonParser.cs      |   2 +-
 ConverterLibrary/XmlReader.cs       | 179 ++++++++--------------------
 3 files changed, 55 insertions(+), 130 deletions(-)

diff --git a/Arc-app-export-converter/Program.cs b/Arc-app-export-converter/Program.cs
index 2ae6557..1e493e5 100644
--- a/Arc-app-export-converter/Program.cs
+++ b/Arc-app-export-converter/Program.cs
@@ -22,8 +22,8 @@ public static void Main() {
 
 
 			//// Split into days
-			//List<XmlReader> daysInXml = XmlReader.Split(xr);
-			//JsonParser.Parse(daysInXml, xr.originalName + ".json", true);
+			List<XmlReader> daysInXml = XmlReader.Split(xr);
+			JsonParser.Parse(daysInXml, xr.originalName + ".json", true);
 		}
 
 		// On finish
diff --git a/ConverterLibrary/JsonParser.cs b/ConverterLibrary/JsonParser.cs
index aefbbe8..815349a 100644
--- a/ConverterLibrary/JsonParser.cs
+++ b/ConverterLibrary/JsonParser.cs
@@ -238,7 +238,7 @@ static void WriteToFile(string json, string fileName) {
 		sw.Write(json);
 		sw.Close();
 		Console.ForegroundColor = ConsoleColor.DarkGreen;
-		Console.WriteLine(string.Format("Json file created!"));
+		Console.WriteLine(string.Format("Json file created!\n") + fileName);
 	}
 }
 
diff --git a/ConverterLibrary/XmlReader.cs b/ConverterLibrary/XmlReader.cs
index 5d839a6..da2ed4c 100644
--- a/ConverterLibrary/XmlReader.cs
+++ b/ConverterLibrary/XmlReader.cs
@@ -77,13 +77,19 @@ public DateTime StartTime {
 	public class Coordinates {
 		public double lat;
 		public double lon;
-		public string ele = null;
+		public double? ele = null;
 		public DateTime? time = null;
 
 		public Coordinates(string lat, string lon) {
 			this.lat = Convert.ToDouble(lat);
 			this.lon = Convert.ToDouble(lon);
 		}
+		public Coordinates(double lat, double lon, double? ele, DateTime? time) {
+			this.lat = lat;
+			this.lon = lon;
+			this.ele = ele;
+			this.time = time;
+		}
 		public Coordinates(double lat, double lon) {
 			this.lat = lat;
 			this.lon = lon;
@@ -98,7 +104,7 @@ public class Place {
 		public Coordinates position;
 		public DateTime? startTime;
 		public DateTime? endTime;
-		public string ele;
+		public double? ele;
 		public string link;
 
 		public int Duration {
@@ -112,10 +118,11 @@ public int Duration {
 			}
 		}
 
-		public Place(Coordinates position, string name, DateTime? startTime = null, string ele = null, string link = null) {
+		public Place(Coordinates position, string name, DateTime? startTime = null, double? ele = null, string link = null) {
 			this.position = position;
 			this.startTime = startTime;
 			this.name = name;
+			this.ele = ele;
 			this.link = link;
 		}
 
@@ -246,35 +253,16 @@ public class XmlReader {
 	// Activity and places loading
 	public XmlReader(string path, bool isPath, float weight) {
 		this.weight = weight;
-		string allText = File.ReadAllText(path);
+
+		string allText = "";
+		if (isPath) {
+			allText = File.ReadAllText(path);
+			originalName = path.Replace(".gpx", "");
+		} else
+			allText = path;
 		byte[] byteArray = Encoding.UTF8.GetBytes(allText);
 		MemoryStream stream = new MemoryStream(byteArray);
-		GpxReader gpxReader = new GpxReader(stream);
-		while (gpxReader.Read()) {
-			switch (gpxReader.ObjectType) {
-				case GpxObjectType.Metadata:
-					//gpxReader.Metadata;
-					break;
-				case GpxObjectType.WayPoint:
-					//gpxReader.WayPoint;
-					break;
-				case GpxObjectType.Route:
-					//gpxReader.Route;
-					break;
-				case GpxObjectType.Track:
-					//gpxReader.Track;
-					break;
-			}
-		}
-		GpxAnalyser analyser = new GpxAnalyser(gpxReader);
-		Console.WriteLine(gpxReader.Read());
-
-		//if (isPath) {
-		//	originalName = path.Replace(".gpx", "");
-		//	LoadFile(path);
-		//} else {
-		//	LoadString(path);
-		//}
+		Load(stream);
 	}
 	public XmlReader(List<XmlTimeline.TimelineItem> timelineItems) {
 		for (int i = 0; i < 10; i++) {
@@ -286,27 +274,27 @@ public XmlReader(List<XmlTimeline.TimelineItem> timelineItems) {
 		SetXmlDate();
 	}
 
-	public void Load(StreamReader sr) {
+	public void Load(Stream stream) {
 		for (int i = 0; i < 10; i++) {
 			activitySummary[i] = new List<XmlTimeline.Activity>();
 		}
 
-		// Ignore first 2 lines
-		sr.ReadLine();
-		sr.ReadLine();
-
 		// Loop
 		timelineItems.Clear();
-		while (true) {
-			string line = sr.ReadLine().Replace("\t", "");
-			if (line.StartsWith("<wpt", StringComparison.Ordinal))
-				GetPlace(line, sr);
-			else if (line.StartsWith("<trk", StringComparison.Ordinal))
-				GetMove(sr);
-			else if (line.StartsWith("</gpx", StringComparison.Ordinal))
-				break;
-		};
-		sr.Close();
+		GpxReader gpxReader = new GpxReader(stream);
+		while (gpxReader.Read()) {
+			switch (gpxReader.ObjectType) {
+				case GpxObjectType.Metadata:
+					//gpxReader.Metadata;
+					break;
+				case GpxObjectType.WayPoint:
+					GetPlace(gpxReader.WayPoint);
+					break;
+				case GpxObjectType.Track:
+					GetMove(gpxReader.Track);
+					break;
+			}
+		}
 		SetStartEnd();
 		SetSummary();
 		SetXmlDate();
@@ -314,91 +302,40 @@ public void Load(StreamReader sr) {
 		//Display();
 	}
 
-	public void LoadString(string text) {
-		MemoryStream mStrm = new MemoryStream(Encoding.UTF8.GetBytes(text));
-		StreamReader tempSteamR = new StreamReader(mStrm, System.Text.Encoding.UTF8, true);
-		Load(tempSteamR);
-	}
-	public void LoadFile(string path) {
-		StreamReader sr = new StreamReader(path);
-		Load(sr);
-	}
-
-	void GetPlace(string line, StreamReader sr) {
-		if (line.EndsWith("/>"))
-			return;
-		XmlTimeline.Coordinates location = HelpMethods.GetLatLon(line);
-
-		// time
-		DateTime? startTime = null;
-
+	void GetPlace(GpxTools.Gpx.GpxWayPoint waypoint) {
+		// location
+		XmlTimeline.Coordinates location = new XmlTimeline.Coordinates(waypoint.Latitude, waypoint.Longitude);
 		// time
-		string tempLine = sr.ReadLine().Replace("\t", "");
-		if (tempLine.StartsWith("<time>")) {
-			startTime = HelpMethods.ParseIso8601(
-			HelpMethods.LeaveCenterFromString(
-				tempLine,
-				"<time>",
-				"</time>"));
-			tempLine = sr.ReadLine().Replace("\t", "");
-		}
-
+		DateTime? startTime = waypoint.Time;
 		// ele
-		string ele = "";
-		tempLine = sr.ReadLine().Replace("\t", "");
-		if (tempLine.StartsWith("<ele>")) {
-			ele = HelpMethods.LeaveCenterFromString(tempLine, "<ele>", "</ele>");
-			tempLine = sr.ReadLine().Replace("\t", "");
-		}
-
+		double? ele = waypoint.Elevation;
 		// name (if exist)
-		string name = "";
-		if (tempLine.StartsWith("<name>")) {
-			name = HelpMethods.LeaveCenterFromString(tempLine.Replace("&amp;", "&").Replace("&lt;", "<").Replace("&gt;", ">").Replace("&quot;", "\"").Replace("&apos;", "'"), "<name>", "</name>");
-			tempLine = sr.ReadLine().Replace("\t", "");
-		}
+		string name = waypoint.Name;
 		string link = "";
-		if (tempLine.StartsWith("<link")) {
-			link = HelpMethods.LeaveCenterFromString(tempLine, "<link href=\"", "\" />");
-			tempLine = sr.ReadLine().Replace("\t", "");
-		}
-
+		if (waypoint.Links.Count > 0)
+			link = waypoint.Links[0].Href;
 		// If previous is place
 		if (timelineItems.Count >= 1 && timelineItems.Last().type == XmlTimeline.TimelineItemType.place)
 			timelineItems.Last().place.endTime = startTime;
-
 		//if (timelineItems.Count >= 1 && timelineItems.Last().type == XmlTimeline.TimelineItemType.activity)
 		//	startTime = timelineItems.Last().activity.endTime;
 		timelineItems.Add(new XmlTimeline.TimelineItem(new XmlTimeline.Place(location, name, startTime, ele, link)));
 	}
-	void GetMove(StreamReader sr) {
+	void GetMove(GpxTools.Gpx.GpxTrack track) {
+
 		// Type
-		string line = sr.ReadLine().Replace("\t", "");
-		if (line == "<trkseg />") {
-			sr.ReadLine();
-			return;
-		}
 		ActivityType type = ActivityType.car;
-		if (line.StartsWith("<type>", StringComparison.CurrentCulture)) {
-			line = HelpMethods.LeaveCenterFromString(line, "<type>", "</type>");
-			Enum.TryParse(line, out type);
+		Enum.TryParse(track.Type, out type);
 
-			// Track points
-			line = sr.ReadLine().Replace("\t", "");
-		}
-		if (line == "<trkseg />") {
-			sr.ReadLine();
-			return;
-		}
+		// Track points
 		List<XmlTimeline.Coordinates> coords = new List<XmlTimeline.Coordinates>();
-		while (true) {
-			line = sr.ReadLine().Replace("\t", "");
-			if (line == "</trkseg>")
-				break;
-			else {
-				AddWaypoint(line, sr, coords);
-			}
+		GpxTools.Gpx.GpxPointCollection<GpxTools.Gpx.GpxPoint> points = new GpxTools.Gpx.GpxPointCollection<GpxTools.Gpx.GpxPoint>();
+			
+		points = track.ToGpxPoints();
+		foreach (var item in points) {
+			coords.Add(new XmlTimeline.Coordinates(item.Latitude, item.Longitude, item.Elevation, item.Time));
 		}
+
 		if (coords.Count >= 2) {
 			if (timelineItems.Count > 0 &&
 				timelineItems[timelineItems.Count - 1].type == XmlTimeline.TimelineItemType.activity &&
@@ -409,21 +346,8 @@ void GetMove(StreamReader sr) {
 				AddTimeToPreviousPlace(newActivity);
 				timelineItems.Add(new XmlTimeline.TimelineItem(newActivity));
 				AddTimeToPreviousPlace(newActivity);
-				//activitySummary[(int)type].Add(newActivity);
 			}
 		}
-		sr.ReadLine();
-	}
-	void AddWaypoint(string line, StreamReader sr, List<XmlTimeline.Coordinates> coords) {
-		XmlTimeline.Coordinates location = HelpMethods.GetLatLon(line);
-		location.ele = HelpMethods.LeaveCenterFromString(sr.ReadLine().Replace("\t", ""), "<ele>", "</ele>");
-		location.time = HelpMethods.ParseIso8601(
-			HelpMethods.LeaveCenterFromString(
-				sr.ReadLine().Replace("\t", ""),
-				"<time>",
-				"</time>"));
-		sr.ReadLine();
-		coords.Add(location);
 	}
 	void AddTimeToPreviousPlace(XmlTimeline.Activity activity) {
 		if (timelineItems.Count >= 1) {
@@ -486,6 +410,7 @@ void Display() {
 		}
 		Console.WriteLine();
 		Console.ForegroundColor = ConsoleColor.DarkGray;
+		Console.WriteLine("Lenght: " + summary.Length);
 		foreach (var item in summary) {
 			if (item.duration > 0)
 				Console.WriteLine(item.ToString());

From d714a3962719a3e1c1aa971519d009fa29629e36 Mon Sep 17 00:00:00 2001
From: Maciej Maj <maciejmaj@me.com>
Date: Sat, 6 Apr 2019 10:30:13 +0200
Subject: [PATCH 4/4] Fixed loading places without time

---
 ConverterLibrary/XmlReader.cs | 43 +++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/ConverterLibrary/XmlReader.cs b/ConverterLibrary/XmlReader.cs
index da2ed4c..0840784 100644
--- a/ConverterLibrary/XmlReader.cs
+++ b/ConverterLibrary/XmlReader.cs
@@ -34,12 +34,15 @@ public override string ToString() {
 		}
 
 		//Time
-		public DateTime ReturnDate() {
+		public DateTime? ReturnDate() {
 			DateTime tempDate = new DateTime();
 			if (type == TimelineItemType.activity)
 				tempDate = activity.startTime;
-			else
+			else {
+				if (!place.startTime.HasValue)
+					return null;
 				tempDate = place.startTime.Value;
+			}
 			return new DateTime(tempDate.Year, tempDate.Month, tempDate.Day, 12, 0, 0, tempDate.Kind);
 		}
 
@@ -315,10 +318,14 @@ void GetPlace(GpxTools.Gpx.GpxWayPoint waypoint) {
 		if (waypoint.Links.Count > 0)
 			link = waypoint.Links[0].Href;
 		// If previous is place
-		if (timelineItems.Count >= 1 && timelineItems.Last().type == XmlTimeline.TimelineItemType.place)
-			timelineItems.Last().place.endTime = startTime;
-		//if (timelineItems.Count >= 1 && timelineItems.Last().type == XmlTimeline.TimelineItemType.activity)
-		//	startTime = timelineItems.Last().activity.endTime;
+		if (timelineItems.Count >= 1 && timelineItems.Last().type == XmlTimeline.TimelineItemType.place) {
+			if (!timelineItems.Last().place.endTime.HasValue && startTime.HasValue)
+				timelineItems.Last().place.endTime = startTime;
+			else {
+				startTime = timelineItems.Last().place.startTime;
+			}
+		} else if (timelineItems.Count >= 1 && timelineItems.Last().type == XmlTimeline.TimelineItemType.activity && !startTime.HasValue)
+			startTime = timelineItems.Last().activity.endTime;
 		timelineItems.Add(new XmlTimeline.TimelineItem(new XmlTimeline.Place(location, name, startTime, ele, link)));
 	}
 	void GetMove(GpxTools.Gpx.GpxTrack track) {
@@ -353,19 +360,33 @@ void AddTimeToPreviousPlace(XmlTimeline.Activity activity) {
 		if (timelineItems.Count >= 1) {
 			if (timelineItems.Last().type == XmlTimeline.TimelineItemType.place)
 				timelineItems.Last().place.endTime = activity.startTime;
+			if (timelineItems.Count >= 2)
+				if (timelineItems[timelineItems.Count - 2].type == XmlTimeline.TimelineItemType.place && !timelineItems[timelineItems.Count - 2].place.endTime.HasValue)
+					timelineItems[timelineItems.Count - 2].place.endTime = activity.startTime;
 		}
 	}
 
 	// End calculations
 	void SetStartEnd() {
 		if (timelineItems.First().type == XmlTimeline.TimelineItemType.place && !timelineItems.First().place.startTime.HasValue) {
-			DateTime time = timelineItems.First().place.endTime.Value;
+			DateTime time = new DateTime();
+			if (timelineItems.First().place.endTime.HasValue)
+				time = timelineItems.First().place.endTime.Value;
+			else if (timelineItems[1].type == XmlTimeline.TimelineItemType.place && timelineItems[1].place.startTime.HasValue)
+				time = timelineItems[1].place.startTime.Value;
+			else if (timelineItems[1].type == XmlTimeline.TimelineItemType.activity)
+				time = timelineItems[1].activity.startTime;
 			DateTime newTime = new DateTime(time.Year, time.Month, time.Day, 0, 0, 0, time.Kind);
 			timelineItems.First().place.startTime = newTime;
 		}
-
 		if (timelineItems.Last().type == XmlTimeline.TimelineItemType.place && !timelineItems.Last().place.endTime.HasValue) {
-			DateTime time = timelineItems.Last().place.startTime.Value;
+			DateTime time = new DateTime();
+			if (timelineItems.Last().place.startTime.HasValue)
+				time = timelineItems.Last().place.startTime.Value;
+			else if (timelineItems[timelineItems.Count - 2].type == XmlTimeline.TimelineItemType.place && timelineItems[timelineItems.Count - 2].place.endTime.HasValue)
+				time = timelineItems[timelineItems.Count - 2].place.endTime.Value;
+			else if (timelineItems[timelineItems.Count - 2].type == XmlTimeline.TimelineItemType.activity)
+				time = timelineItems[timelineItems.Count - 2].activity.endTime;
 			DateTime newTime = new DateTime(time.Year, time.Month, time.Day, 23, 59, 59, time.Kind);
 			timelineItems.Last().place.endTime = newTime;
 		}
@@ -437,7 +458,9 @@ public static List<XmlReader> Split(XmlReader xml) {
 				currentDate = item.ReturnDate();
 			}
 
-			if (currentDate == item.ReturnDate()) {
+			if (item.ReturnDate() == null) {
+
+			} if (currentDate == item.ReturnDate()) {
 				tempList.Add(item);
 				lastItem = item;
 			} else {