diff --git a/client/index.html b/client/index.html index 9ce2bd6..4089b55 100644 --- a/client/index.html +++ b/client/index.html @@ -23,8 +23,11 @@ - + +

Type: UNFETCHED

@@ -63,12 +66,16 @@ var tak = document.getElementById('bus-id').value.trim(); socket.emit('takSearch', tak); }); - /*document.getElementById('elektrolino').addEventListener('click', function () { - socket.emit('elektrolino'); + document.getElementById('bulk-search').addEventListener('submit', function (event) { + event.preventDefault(); + }); + document.getElementById('electricbusSearch').addEventListener('click', function () { + socket.emit('electricBusBulkSearch'); + }); + document.getElementById('pesaSearch').addEventListener('click', function () { + console.log("bruh"); + socket.emit('pesaTramBulkSearch'); }); - document.getElementById('pesa').addEventListener('press', function () { - socket.emit('pesa'); - });*/ oldMarker = "1"; socket.on('takResults', (typeR, lineR, latR, longR, takR, latlongR, vehicleTypeR) => { diff --git a/main.js b/main.js index 09f876a..27e5a89 100644 --- a/main.js +++ b/main.js @@ -75,7 +75,35 @@ io.on('connection', (socket) => { startRequestModeFetch(); fetchDataFromLocalFile(tak, socket); } catch (error) { - console.error("Error processing takSearch:", error); + var caughtError = "Error processing takSearch:", error; + console.error(caughtError); + writeToLog('errors_log.txt', caughtError); + } + }); + socket.on('electricBusBulkSearch', async () => { + console.log("Running bulk electric bus search!"); + saveRequestLogs(socket, "ElectricBusBulkSearch"); + try { + electricBusTakArray.forEach((takToSearch) => { + fetchDataFromLocalFile(takToSearch, socket); + }); + } catch (error) { + var caughtError = "Error processing electricBusBulkSearch:", error; + console.error(caughtError); + writeToLog('errors_log.txt', caughtError); + } + }); + socket.on('pesaTramBulkSearch', async () => { + console.log("Running bulk pesa tram search!"); + saveRequestLogs(socket, "PesaTramBulkSearch"); + try { + pesaTramTakArray.forEach((takToSearch) => { + fetchDataFromLocalFile(takToSearch, socket); + }); + } catch (error) { + var caughtError = "Error processing pesaTramBulkSearch: ", error; + console.error(caughtError); + writeToLog('errors_log.txt', caughtError); } }); }); @@ -194,7 +222,7 @@ async function fetchDataFromLocalFile(takInput, socket) { if (tak === takInput) { if (transportTypeDecoded === "TRAM") { if (cafTramTakArray.includes(tak)) { - vehicleType = "CAF Urbos AXL (Spain) (Overhead 600V, Motor 264 kW) 70km/h TOP"; + vehicleType = "CAF Urbos AXL"; } else if (pesaTramTakArray.includes(tak)) { vehicleType = "PESA Twist 147N"; } else if (kt6tmTramArray.includes(tak)) { diff --git a/package-lock.json b/package-lock.json index c5fd854..c06564e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "dependencies": { "axios": "^1.6.8", - "express": "^4.19.2", + "express": "^4.21.1", "socket.io": "^4.7.5" } }, diff --git a/package.json b/package.json index 97786ce..31b23f2 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "homepage": "https://github.com/eetnaviation/tlt-bus-map#readme", "dependencies": { "axios": "^1.6.8", - "express": "^4.19.2", + "express": "^4.21.1", "socket.io": "^4.7.5" } }