Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed the legend bug. Now the images display. When I test it on my la…
…ptop I need to adjust the for loops for some reason (off by 1).
  • Loading branch information
rjm11010 committed Jan 17, 2017
1 parent 212c0d0 commit 0fc8467
Show file tree
Hide file tree
Showing 8 changed files with 22,196 additions and 9 deletions.
1 change: 1 addition & 0 deletions .~lock.day.csv#
@@ -0,0 +1 @@
,reynaldo,reynaldo-desktop,12.01.2017 23:05,file:///home/reynaldo/.config/libreoffice/4;
22 changes: 15 additions & 7 deletions MapScript.js
Expand Up @@ -16,7 +16,7 @@ function initMap() {
function classify(fileData) {
var classSet = new Set();
classArr = [];
for(var i=0; i < fileData.data.length; i++) {
for(var i=0; i < fileData.data.length-1; i++) {
classSet.add(fileData.data[i].class);
}
for (let item of classSet.values()) {
Expand Down Expand Up @@ -55,9 +55,18 @@ function randomizeColors() {
function addLegend(colors) {
document.getElementById("legend-heading").innerHTML = "Legend:" + "<br />";
for (var i = 0; i < classArr.length; i++) {
// Create a container for the image and text
var row = document.createElement("div");
// Add image to container
var img = document.createElement('img');
img.src = "http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + colors[i];
document.getElementById("legend-content").innerHTML += img + ":" + classArr[i] + "<br />";
row.appendChild(img);
// Add text to container
var row_text = document.createElement('span'); // NOTE: Span allows you to add in line elements!
row_text.innerHTML = ": " + classArr[i] + '<br>';
row.appendChild(row_text);
// Add container to legend
document.getElementById("legend-content").appendChild(row);
};
}

Expand All @@ -66,12 +75,12 @@ function updateMapCenter(fileData) {
var centerLon = 0;
var centerLatTotal = 0;
var centerLonTotal = 0;
for(var i=0; i<fileData.data.length; i++) {
for(var i=0; i<fileData.data.length-1; i++) {
centerLatTotal += fileData.data[i].latitude;
centerLonTotal += fileData.data[i].longitude;
}
centerLat = centerLatTotal / (fileData.data.length);
centerLon = centerLonTotal / (fileData.data.length);
centerLat = centerLatTotal / (fileData.data.length-1);
centerLon = centerLonTotal / (fileData.data.length-1);
var newCenter = {lat: centerLat, lng: centerLon};
map.setCenter(newCenter);
map.setZoom(10);
Expand All @@ -80,7 +89,7 @@ function updateMapCenter(fileData) {
// This method is only called when the initial CSV file is uploaded
function addMarkers(data) {
markersArr = [];
for (var i = 0; i<data.data.length ; i++) {
for (var i = 0; i<data.data.length-1 ; i++) {
var lat = data.data[i].latitude;
var lon = data.data[i].longitude;
var prov = data.data[i].Provider;
Expand Down Expand Up @@ -113,4 +122,3 @@ function updateMarkers(timeStart, timeEnd) {
}
}
}

4 changes: 2 additions & 2 deletions Slider.js
@@ -1,9 +1,9 @@
function addSlider(fileData) {
minDateMillis = parseInt(fileData.data[0].senseStartTimeMillis);
maxDateMillis = parseInt(fileData.data[data.data.length - 1].senseStartTimeMillis);
maxDateMillis = parseInt(fileData.data[data.data.length - 2].senseStartTimeMillis);
var minDate = new Date(minDateMillis);
var maxDate = new Date(maxDateMillis);
console.log(fileData.data[data.data.length - 1].senseStartTimeMillis);
console.log(fileData.data[data.data.length - 2].senseStartTimeMillis);

$("#slider").dateRangeSlider({
arrows: false,
Expand Down
26 changes: 26 additions & 0 deletions add_classes.py
@@ -0,0 +1,26 @@
import sys
import csv
import random

def rand_class(classes):
return classes[random.randint(0, len(classes)-1)]

def add_classes(csv_file_name, classes):
with open(csv_file_name) as csvfile:
with open('your_new_file.csv', 'w') as newcsvfile:
reader = csv.DictReader(csvfile)
writer = None
for row in reader:
if writer is None:
fieldnames = row.keys()
fieldnames.append('class')
writer = csv.DictWriter(newcsvfile, fieldnames=fieldnames)
writer.writeheader()
row['class'] = rand_class(classes)
writer.writerow(row)


if __name__ == '__main__':
csv_file_name = sys.argv[1]
classes = range(5)
add_classes(csv_file_name, classes)
576 changes: 576 additions & 0 deletions day.csv

Large diffs are not rendered by default.

576 changes: 576 additions & 0 deletions day_with_classes.csv

Large diffs are not rendered by default.

10,500 changes: 10,500 additions & 0 deletions month.csv

Large diffs are not rendered by default.

10,500 changes: 10,500 additions & 0 deletions month_with_classes.csv

Large diffs are not rendered by default.

0 comments on commit 0fc8467

Please sign in to comment.