aindreas/traintracker
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25 from 0hAodha/earlynlate

Browse Source 
red icon if train late, green if not
This commit is contained in:
Aindréas Ó hAodha
2023-03-03 12:26:02 +00:00
committed by GitHub
parent 38a2185274 085ade8fa7
commit c0ea15f58a
10 changed files with 152 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/.gitignore generated vendored Normal file
View File

@ -0,0 +1,5 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/

8
.idea/modules.xml generated Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/traintracker.iml" filepath="$PROJECT_DIR$/.idea/traintracker.iml" />
</modules>
</component>
</project>

12
.idea/traintracker.iml generated Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

6
.idea/vcs.xml generated Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

2
dist/assets/index-2cd109ed.css → dist/assets/index-debbf736.css vendored
View File

File diff suppressed because one or more lines are too long

194
dist/assets/index-e189e6d8.js → dist/assets/index-ed2bec8f.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/index.html vendored
View File

@ -2,11 +2,11 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="icon" href="/favicon.ico"> <link rel="icon" href="/assets/train-solid-e7249eb7.svg">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Irish Rail Tracker</title> <title>Irish Rail Tracker</title>
<script type="module" crossorigin src="/assets/index-a9090275.js"></script> <script type="module" crossorigin src="/assets/index-ed2bec8f.js"></script>
<link rel="stylesheet" href="/assets/index-1f27b1b8.css"> <link rel="stylesheet" href="/assets/index-debbf736.css">
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

BIN
src/assets/green-train-solid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
src/assets/red-train-solid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

23
src/components/Map.vue
View File

@ -39,9 +39,10 @@
<template v-for="coordinate, i in coordinates" :position="inline-block"> <template v-for="coordinate, i in coordinates" :position="inline-block">
<!-- overlay offset is the size of the image so that it is centered--> <!-- overlay offset is the size of the image so that it is centered-->
<ol-overlay :position="coordinate" :positioning="center-center" :offset="[-16,-16]"> <ol-overlay :position="coordinate" :positioning="center-center" :offset="[-14,-16]">
<div class="overlay-content" @click="getSelectedTrain(i)"> <div class="overlay-content" @click="getSelectedTrain(i)">
<img src="../assets/train-solid.svg" class="trainMapIcon" alt="Train Icon"> <img v-if="isTrainLate(i)" src="../assets/red-train-solid.png" class="trainMapIcon" alt="Train Icon">
<img v-else src="../assets/green-train-solid.png" class="trainMapIcon" alt="Train Icon">
</div> </div>
</ol-overlay> </ol-overlay>
@ -207,6 +208,22 @@ export default {
this.selectedDataMap["PublicMessage"] = this.allDataMap[i]["PublicMessage"][0]; this.selectedDataMap["PublicMessage"] = this.allDataMap[i]["PublicMessage"][0];
}, },
// method to determine whether or not a selected train is late
isTrainLate(i) {
// check if the train is running
if (this.allDataMap[i]["TrainStatus"][0] == "R") {
let publicMessage = this.allDataMap[i]["PublicMessage"][0];
let startTimeStr = publicMessage.indexOf("(");
// checking if the train is late
if (publicMessage[startTimeStr+1] != "-" && publicMessage[startTimeStr+1] != "0") {
return true;
}
}
return false;
},
// ---------------- TESTING ---------------- // ---------------- TESTING ----------------
postLiveTrainData() { postLiveTrainData() {
const functions = getFunctions(app); const functions = getFunctions(app);
@ -231,8 +248,8 @@ export default {
} }
.trainMapIcon { .trainMapIcon {
width: 28px;
height: 32px; height: 32px;
width: 32px;
} }
.slideLeft-enter-active, .slideLeft-leave-active { .slideLeft-enter-active, .slideLeft-leave-active {