From b5eeccfcd546db530d83f61b33e703630521e359 Mon Sep 17 00:00:00 2001
From: Reynaldo Morillo <reynaldo.morillo@uconn.edu>
Date: Tue, 10 Jan 2017 12:04:34 -0500
Subject: [PATCH] Fixed the point plotter. Just small error actually! Just need
 to make sure you're using the map variable you defined outside of the init
 function. Notice, that you created another map variable inside the init
 function.

---
 Main.html    | 12 ++++++++----
 MapScript.js |  3 +--
 Parser.js    |  9 ++++++---
 Slider.js    | 13 +++++++------
 4 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/Main.html b/Main.html
index 7b8d123..8e39e80 100644
--- a/Main.html
+++ b/Main.html
@@ -13,7 +13,7 @@
 
   <style>
     #map-canvas {
-      height: 100% 
+      height: 100%
     }
 
     #slider {
@@ -28,20 +28,24 @@
 </head>
 
 <body>
+  <!-- Control Panel -->
   <div class="col-xs-4">
     <h1>GPS Plotter</h1>
     <h5>Upload a CSV File:</h5>
     <input type="file" id="csv-file" name="files"/>
-    <script src="Parser.js"></script>
     <h5 id="sliderHeading" style="margin-top:30px"></h5>
     <div id="slider">
-      <script src="Slider.js"></script>
     </div>
   </div>
+
+  <!-- Map Area -->
   <div id="map-canvas" class="col-xs-8">
     <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB7kbzCC9vv9yxONLqYlravPF2tBW-HTuE&callback=initMap" async defer></script>
-    <script src="MapScript.js"></script>
   </div>
 
 </body>
+
+<script src="MapScript.js"></script>
+<script src="Parser.js"></script>
+<script src="Slider.js"></script>
 </html>
diff --git a/MapScript.js b/MapScript.js
index 43822b0..d883fe9 100644
--- a/MapScript.js
+++ b/MapScript.js
@@ -2,7 +2,7 @@ var map;
 var myLocation = {lat: 41.8077, lng: -72.2540};
 
 function initMap() {
-  var map = new google.maps.Map(document.getElementById('map-canvas'), {
+  map = new google.maps.Map(document.getElementById('map-canvas'), {
     zoom: 13,
     center: myLocation,
     rotateControl: true
@@ -20,7 +20,6 @@ function addMarker(lt, ln, prov)
 {
   // Troubleshooting call:
   //console.log("Latitude: " + lt + ". Longitude: " + ln);
-  
   var location = new google.maps.LatLng(lt, ln);
   var marker = new google.maps.Marker({
     position: location,
diff --git a/Parser.js b/Parser.js
index 73a3178..9a88f59 100644
--- a/Parser.js
+++ b/Parser.js
@@ -3,11 +3,12 @@ var data;
 function handleFile(evt) {
 
   var file = evt.target.files[0];
+  console.log(file);
 
   Papa.parse(file, {
     header: true,
     dynamicTyping: true,
-    complete: function(results) 
+    complete: function(results)
     {
       data = results;
       console.log(results.data);
@@ -24,11 +25,13 @@ function addMarkers(data)
     var lat = data.data[i].latitude;
     var lon = data.data[i].longitude;
     var prov = data.data[i].Provider;
-    addMarker(lat, lon, prov);
+    if (lat !== undefined & lon !== undefined) {
+        addMarker(lat, lon, prov);
+    }
   }
 }
 
-/* Troubleshooting Function 
+/* Troubleshooting Function
  function showLatLang(lat, lon)
 {
   console.log("Latitude: " + lat + ". Longitude: " + lon);
diff --git a/Slider.js b/Slider.js
index 1f4ba7d..7812b3f 100644
--- a/Slider.js
+++ b/Slider.js
@@ -1,18 +1,19 @@
 function addSlider(fileData) {
-	var minDate = new Date(fileData.data[0].local_time);
-	var maxDate = new Date(fileData.data[data.data.length - 1].local_time);
-
+	var minDate = new Date(parseInt(fileData.data[0].senseStartTimeMillis));
+	var maxDate = new Date(parseInt(fileData.data[data.data.length - 2].senseStartTimeMillis));
+	console.log(minDate);
+	console.log(maxDate);
 	$("#slider").dateRangeSlider({
-	  
+
 	  arrows: false,
 
 	  bounds: {
-		  min: minDate, 
+		  min: minDate,
 		  max: maxDate
 	  },
 
 	  defaultValues: {
-		  min: minDate, 
+		  min: minDate,
 		  max: maxDate
 	  }
 	});
