Ready for first public test.
This commit is contained in:
@ -1,5 +1,6 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
@ -11,6 +12,7 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<h2>Bus Location Finder</h2>
|
<h2>Bus Location Finder</h2>
|
||||||
@ -42,10 +44,14 @@
|
|||||||
var tak = document.getElementById('bus-id').value.trim();
|
var tak = document.getElementById('bus-id').value.trim();
|
||||||
socket.emit('takSearch', tak);
|
socket.emit('takSearch', tak);
|
||||||
});
|
});
|
||||||
|
socket.on('takResults', (type, line, lat, long, tak) => {
|
||||||
socket.on('takResults', (data) => {
|
console.log("Datafetch success");
|
||||||
console.log("yay :)");
|
console.log("Transport Type:", type);
|
||||||
console.log(data);
|
console.log("Line Number:", line);
|
||||||
|
console.log("Latitude:", lat);
|
||||||
|
console.log("Longitude:", long);
|
||||||
|
console.log("TAK:", tak);
|
||||||
|
console.log();
|
||||||
/*// Add markers for each bus location
|
/*// Add markers for each bus location
|
||||||
data.forEach(function(bus) {
|
data.forEach(function(bus) {
|
||||||
L.marker([bus.latitude, bus.longitude]).addTo(map);
|
L.marker([bus.latitude, bus.longitude]).addTo(map);
|
||||||
@ -55,4 +61,5 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
17
main.js
17
main.js
@ -12,6 +12,13 @@ const axios = require('axios');
|
|||||||
const fs = require('node:fs');
|
const fs = require('node:fs');
|
||||||
var sleep = require('sleep');
|
var sleep = require('sleep');
|
||||||
|
|
||||||
|
|
||||||
|
let requestedType = "Unfetched";
|
||||||
|
let requestedLine = "Unfetched";
|
||||||
|
let requestedLat = "Unfetched";
|
||||||
|
let requestedLong = "Unfetched";
|
||||||
|
let requestedTak = "Unfetched";
|
||||||
|
|
||||||
console.log("Server initalize!");
|
console.log("Server initalize!");
|
||||||
|
|
||||||
app.get('/', (req, res) => {
|
app.get('/', (req, res) => {
|
||||||
@ -30,8 +37,8 @@ io.on('connection', (socket) => {
|
|||||||
socket.on('takSearch', (tak) => {
|
socket.on('takSearch', (tak) => {
|
||||||
try {
|
try {
|
||||||
console.log("Input tak: " + tak);
|
console.log("Input tak: " + tak);
|
||||||
let takSearchResults = fetchData(tak);
|
fetchData(tak);
|
||||||
socket.emit('takResults', takSearchResults);
|
socket.emit('takResults', requestedType, requestedLine, requestedLat, requestedLong, requestedTak);
|
||||||
} catch {
|
} catch {
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -79,6 +86,12 @@ async function fetchData(takInput) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (tak == takInput) {
|
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("Transport Type:", transportTypeDecoded);
|
||||||
console.log("Line Number:", lineNumber);
|
console.log("Line Number:", lineNumber);
|
||||||
console.log("Latitude:", latitude);
|
console.log("Latitude:", latitude);
|
||||||
|
Reference in New Issue
Block a user