Skip to content

Commit

Permalink
Merge pull request #7 from kayanalmeida/master
Browse files Browse the repository at this point in the history 
Mudando stoped pra stopped; Colocando float na media; Exibindo duplicado...
  • Loading branch information
@vitor-costa
vitor-costa committed Dec 9, 2014
2 parents 334de46 + 109e046 commit aa8013a
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions public/relatorioCodigo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@ window.onload = function() {
});
var averageEmptyLinesPercentual = calculatesAveragePercentual(emptyLinesData, data);
averageEmptyLines = calculatesAverageNumber(emptyLinesData, data);
var uniqueLines = removeDuplicatedFromArray(emptyLinesData);
//var uniqueLines = removeDuplicatedFromArray(emptyLinesData);
return {
"emptyLines": averageEmptyLines,
"buses": uniqueLines,
"buses": emptyLinesData,
"numberOfJsonsInData": data.length,
"total": calculateTotalBuses(data)
};
}

var calculatesAverageNumber = function(array, jsonArray) {
return parseInt(array.length / (jsonArray.length));
return parseFloat(array.length / (jsonArray.length)).toFixed(2);
}

var calculateTotalBuses = function (jsonArray) {
var total = 0;
jsonArray.map(function(data) {
total += data.DATA.length;
});
return parseInt(total);
return parseFloat(total/ jsonArray.length).toFixed(2);

}

Expand All @@ -76,9 +76,9 @@ window.onload = function() {
}


var stopedInArea = function(data, lat, lng, r, minvelocity) {
var stoppedInArea = function(data, lat, lng, r, minvelocity) {
data = analysesData(data);
var stoped = [];
var stopped = [];
minvelocity = minvelocity || 0; // if minvelocity is set, check if bus is at most at this velocity
var center = new google.maps.LatLng(lat, lng);

Expand All @@ -90,16 +90,16 @@ window.onload = function() {
// because lat and lng are not equally spaced (our planet is a (almost) sphere)
if (google.maps.geometry.spherical.computeDistanceBetween(center, new google.maps.LatLng(bus[3], bus[4])) < r &&
bus[5] <= minvelocity)
// stoped.push(bus);
stoped = stoped.concat([bus]);
// stopped.push(bus);
stopped = stopped.concat([bus]);
}
});
var average = calculatesAverageNumber(stoped, data);
var uniqueStopped = removeDuplicatedFromArray(stoped);
var averagePercentual = calculatesAveragePercentual(stoped, data);
var average = calculatesAverageNumber(stopped, data);
//var uniqueStopped = removeDuplicatedFromArray(stopped);
var averagePercentual = calculatesAveragePercentual(stopped, data);
return {
"totalStoped": average,
"buses": uniqueStopped,
"totalstopped": average,
"buses": stopped,
"numberOfJsonsInData": data.length,
"total": calculateTotalBuses(data)
};
Expand All @@ -124,12 +124,12 @@ window.onload = function() {
}
});
var average = calculatesAverageNumber(outDatedBuses, data);
var uniqueOutDated = removeDuplicatedFromArray(outDatedBuses);
//var uniqueOutDated = removeDuplicatedFromArray(outDatedBuses);
var averagePercentual = calculatesAveragePercentual(outDatedBuses, data);

return {
"totalOutDated": average,
"buses": uniqueOutDated,
"buses": outDatedBuses,
"numberOfJsonsInData": data.length,
"total": calculateTotalBuses(data)
};
Expand Down Expand Up @@ -236,7 +236,7 @@ window.onload = function() {
// prepare output
var output = {
"numberOfBuses": calculatesAverageNumber(in_range_buses, data),
"buses": removeDuplicatedFromArray(in_range_buses),
"buses": in_range_buses,
"numberOfJsonsInData": data.length,
"total": calculateTotalBuses(data)
};
Expand Down Expand Up @@ -292,7 +292,7 @@ window.onload = function() {
lng = $('#lng').val(),
r = $('#r').val(),
minv = $('#minv').val();
result = stopedInArea(data, lat, lng, r, minv);
result = stoppedInArea(data, lat, lng, r, minv);
break;
case "outdated-gps":
var hour = $('#hour').val();
Expand Down Expand Up @@ -417,12 +417,12 @@ function generateTable(answerArray,report){
$('#resposta > h2').append('Nenhum resultado encontrado');
}
else {
$('#resposta > h2').append('Total de ônibus sem linha - ' + answerArray.emptyLines + ' do total de ' + answerArray.total + ' (' + parseFloat(answerArray.emptyLines/answerArray.total*100).toFixed(2) + '% do total)');
$('#resposta > h2').append('Média de ônibus sem linha - ' + answerArray.emptyLines + ' do total de ' + answerArray.total + ' (' + parseFloat(answerArray.emptyLines/answerArray.total*100).toFixed(2) + '% do total)');
$('#resposta > table > thead').append('<th> Hora </th>');
$('#resposta > table > thead').append('<th> Código do ônibus </th>');
for (var i in answerArray.buses){
var linha = $('<tr>');
linha.append('<td>' + moment(answerArray.buses[i][0]).format('DD/MM/YYYY hh:mm') + ' </td>');
linha.append('<td>' + moment(answerArray.buses[i][0]).format('DD/MM/YYYY HH:mm') + ' </td>');
linha.append('<td>' + answerArray.buses[i][1] + ' </td>');
$('#resposta > table > tbody').append(linha);

Expand All @@ -434,16 +434,16 @@ function generateTable(answerArray,report){
$('#resposta > h2').html('');
$('#resposta > table > thead').html('');
$('#resposta > table > tbody').html('');
if (answerArray.totalStoped == 0){
if (answerArray.totalstopped == 0){
$('#resposta > h2').append('Nenhum resultado encontrado');
}
else {
$('#resposta > h2').append('Total de ônibus sem linha - ' + answerArray.totalStoped + ' do total de ' + answerArray.total + ' (' + parseFloat(answerArray.totalStoped/answerArray.total*100).toFixed(2) + '% do total)');
$('#resposta > h2').append('Média de ônibus sem linha - ' + answerArray.totalstopped + ' do total de ' + answerArray.total + ' (' + parseFloat(answerArray.totalstopped/answerArray.total*100).toFixed(2) + '% do total)');
$('#resposta > table > thead').append('<th> Hora </th>');
$('#resposta > table > thead').append('<th> Código do ônibus </th>');
for (var i in answerArray.buses){
var linha = $('<tr>');
linha.append('<td>' + moment(answerArray.buses[i][0]).format('DD/MM/YYYY hh:mm') + ' </td>');
linha.append('<td>' + moment(answerArray.buses[i][0]).format('DD/MM/YYYY HH:mm') + ' </td>');
linha.append('<td>' + answerArray.buses[i][1] + ' </td>');
$('#resposta > table > tbody').append(linha);

Expand All @@ -459,12 +459,12 @@ function generateTable(answerArray,report){
$('#resposta > h2').append('Nenhum resultado encontrado');
}
else {
$('#resposta > h2').append('Total de ônibus atrasados - ' + answerArray.totalOutDated + ' do total de ' + answerArray.total + ' (' + parseFloat(answerArray.totalOutDated/answerArray.total*100).toFixed(2) + '% do total)');
$('#resposta > h2').append('Média de ônibus atrasados - ' + answerArray.totalOutDated + ' do total de ' + answerArray.total + ' (' + parseFloat(answerArray.totalOutDated/answerArray.total*100).toFixed(2) + '% do total)');
$('#resposta > table > thead').append('<th> Hora </th>');
$('#resposta > table > thead').append('<th> Código do ônibus </th>');
for (var i in answerArray.buses){
var linha = $('<tr>');
linha.append('<td>' + moment(answerArray.buses[i][0]).format('DD/MM/YYYY hh:mm') + ' </td>');
linha.append('<td>' + moment(answerArray.buses[i][0]).format('DD/MM/YYYY HH:mm') + ' </td>');
linha.append('<td>' + answerArray.buses[i][1] + ' </td>');
$('#resposta > table > tbody').append(linha);

Expand Down Expand Up @@ -501,14 +501,14 @@ function generateTable(answerArray,report){
$('#resposta > h2').append('Nenhum resultado encontrado');
}
else {
$('#resposta > h2').append('Total de ônibus dentro da faixa de velocidade - ' + answerArray.numberOfBuses + ' do total de ' + answerArray.total + ' (' + parseFloat(answerArray.numberOfBuses/answerArray.total*100).toFixed(2) + '% do total)');
$('#resposta > h2').append('Média de ônibus dentro da faixa de velocidade - ' + answerArray.numberOfBuses + ' do total de ' + answerArray.total + ' (' + parseFloat(answerArray.numberOfBuses/answerArray.total*100).toFixed(2) + '% do total)');
$('#resposta > table > thead').append('<th> Hora </th>');
$('#resposta > table > thead').append('<th> Código do ônibus </th>');
$('#resposta > table > thead').append('<th> Velocidade Instantânea </th>');

for (var i in answerArray.buses){
var linha = $('<tr>');
linha.append('<td>' + moment(answerArray.buses[i][0]).format('DD/MM/YYYY hh:mm') + ' </td>');
linha.append('<td>' + moment(answerArray.buses[i][0]).format('DD/MM/YYYY HH:mm') + ' </td>');
linha.append('<td>' + answerArray.buses[i][1] + ' </td>');
linha.append('<td>' + answerArray.buses[i][5] + ' Km/h' + ' </td>');

Expand Down

0 comments on commit aa8013a

Please sign in to comment.