From cc539e3f792cb0e1b9bc0d31ec20bd614a0008d1 Mon Sep 17 00:00:00 2001 From: eetnaviation Date: Sat, 16 Mar 2024 10:57:10 +0200 Subject: [PATCH] Ready for first public test. --- client/index.html | 75 ++++++++++++++++++++++++++--------------------- main.js | 17 +++++++++-- 2 files changed, 56 insertions(+), 36 deletions(-) diff --git a/client/index.html b/client/index.html index a84fa66..ab242ef 100644 --- a/client/index.html +++ b/client/index.html @@ -1,5 +1,6 @@ + @@ -11,48 +12,54 @@ } + -

Bus Location Finder

-
- - - -
+

Bus Location Finder

+
+ + + +
-
+
- - + + - - + + + \ No newline at end of file diff --git a/main.js b/main.js index 337a514..c66ebd5 100644 --- a/main.js +++ b/main.js @@ -12,6 +12,13 @@ const axios = require('axios'); const fs = require('node:fs'); var sleep = require('sleep'); + +let requestedType = "Unfetched"; +let requestedLine = "Unfetched"; +let requestedLat = "Unfetched"; +let requestedLong = "Unfetched"; +let requestedTak = "Unfetched"; + console.log("Server initalize!"); app.get('/', (req, res) => { @@ -30,8 +37,8 @@ io.on('connection', (socket) => { socket.on('takSearch', (tak) => { try { console.log("Input tak: " + tak); - let takSearchResults = fetchData(tak); - socket.emit('takResults', takSearchResults); + fetchData(tak); + socket.emit('takResults', requestedType, requestedLine, requestedLat, requestedLong, requestedTak); } catch { } @@ -79,6 +86,12 @@ async function fetchData(takInput) { break; } if (tak == takInput) { + requestedType = transportTypeDecoded; + requestedLine = lineNumber; + requestedLat = latitude; + requestedLong = longitude; + requestedTak = tak; + console.log("Requested data fetched:"); console.log("Transport Type:", transportTypeDecoded); console.log("Line Number:", lineNumber); console.log("Latitude:", latitude);