From fc8d60517033c7de6115d9d56bb43a8a7b279a3f Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <jkowalsk@student.agh.edu.pl>
Date: Sun, 03 Jun 2018 12:14:34 +0000
Subject: [PATCH] Merge pull request #13 from ravkr/master
---
index.js | 51 ++++-----------------------------------------------
1 files changed, 4 insertions(+), 47 deletions(-)
diff --git a/index.js b/index.js
index de7a2c8..c21eff0 100644
--- a/index.js
+++ b/index.js
@@ -42,51 +42,6 @@
var vehicle_data = document.getElementById('vehicle-data');
var vehicle_data_style = document.getElementById('vehicle-data-style');
-function parseStatus(status) {
- switch(status.status) {
- case 'STOPPING':
- return lang.boarding_sign;
- case 'PREDICTED':
- if(status.actualRelativeTime <= 0)
- return lang.boarding_sign;
- if(status.actualRelativeTime >= 60)
- return lang.time_minutes_prefix + Math.floor(status.actualRelativeTime / 60) + lang.time_minutes_suffix;
- return lang.time_seconds_prefix + status.actualRelativeTime + lang.time_seconds_suffix;
- case 'DEPARTED':
- return lang.time_minutes_ago_prefix + Math.floor(-status.actualRelativeTime / 60) + lang.time_minutes_ago_suffix;
- default:
- return status.mixedTime;
- }
-}
-
-function parseTime(date, time) {
- var result = new Date(date.getFullYear(), date.getMonth(), date.getDay());
- var time_split = time.split(':');
- result.setHours(time_split[0]);
- result.setMinutes(time_split[1]);
-
- if(result.getTime() - date.getTime() > 72000000) {
- result.setTime(result.getTime() - 86400000);
- }
-
- if(date.getTime() - result.getTime() > 72000000) {
- result.setTime(result.getTime() + 86400000);
- }
-
- return result;
-}
-
-function parseDelay(status) {
- if(!status.actualTime) return lang.unknown_sign;
- if(!status.plannedTime) return lang.unknown_sign;
-
- var now = new Date();
- var actual = parseTime(now, status.actualTime);
- var planned = parseTime(now, status.plannedTime);
-
- return lang.time_minutes_prefix + ((actual.getTime() - planned.getTime()) / 1000 / 60) + lang.time_minutes_suffix;
-}
-
function fail(message, more) {
if(times_timer) clearTimeout(times_timer);
@@ -182,9 +137,11 @@
var delay = parseDelay(data.actual[i]);
var delay_cell = addCellWithText(tr, delay);
- if(status == lang.boarding_sign) {
+ if(data.actual[i].status == 'STOPPING') {
tr.className = 'success';
- status_cell.className = 'status-boarding';
+ if (data.actual[i].actualRelativeTime <= 0) {
+ status_cell.className = 'status-boarding';
+ }
} else if(parseInt(delay) > 9) {
tr.className = 'danger';
delay_cell.className = 'status-delayed';
--
Gitblit v1.9.1