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

Merge pull request #34 from 0hAodha/backslashn

Browse Source 
replace '\n' with '. '
This commit is contained in:
Conor McNamara
2023-03-08 15:20:12 +00:00
committed by GitHub
parent 95f7063c75 83a9b8ef6b
commit 244b7797a3
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/pages/MapPage.vue
View File

@ -29,7 +29,8 @@
<div>
<MarqueeText v-if="publicMessages.length > 0" id="publicMessageTicker" :paused="isPaused" :duration="800" :repeat="1"
@mouseenter="isPaused = !isPaused" @mouseleave="isPaused = false">
<span v-for="message in publicMessages"> {{ "---" + message + "---" }} </span>
<!-- <span v-for="message in publicMessages"> {{ "---" + message + "---" }} </span> -->
<span v-for="message in publicMessages"> {{ message + " • " }} </span>
</MarqueeText>
</div>
</template>
@ -136,22 +137,28 @@ export default {
this.dbLiveTrainData = response.data;
if (!this.dbLiveTrainData) throw new Error("Error fetching live train data from the database");
var insights = {"numRunningTrains": 0,
var insights = {
"numRunningTrains": 0,
"numLateRunningTrains": 0,
"numMainland": 0,
"numSuburban": 0,
"numDart": 0}
var unorderedTrains = []
var latest = null
var earliest = null
var currLatestTime = null
var currEarliestTime = null
"numDart": 0
};
var unorderedTrains = [];
var latest = null;
var earliest = null;
var currLatestTime = null;
var currEarliestTime = null;
var currentMessages = []
var currentMessages = [];
// create an array of coordinates and hashmap with the key-values {index: JSON obj}
for (var i=0; i<this.dbLiveTrainData.length; i++) {
let train = this.dbLiveTrainData[i];
// filtering out \n in public message
train["PublicMessage"][0] = train["PublicMessage"][0].replace(/\\n/g, ". ");
this.coordinates[i] = ref(fromLonLat([train["TrainLongitude"][0], train["TrainLatitude"][0]]))
this.allDataMap[i] = train;
@ -160,7 +167,7 @@ export default {
else if (train["TrainType"][0] == "D") insights["numDart"] += 1;
let publicMessage = train["PublicMessage"][0];
currentMessages.push(publicMessage)
currentMessages.push(publicMessage);
// check if the train is running
if (this.dbLiveTrainData[i]["TrainStatus"][0] == "R") {
@ -178,8 +185,8 @@ export default {
// check for a new latest train
if (num > currLatestTime) {
latest = train
currLatestTime = num
latest = train;
currLatestTime = num;
}
}
// train is early or ontime
@ -188,8 +195,8 @@ export default {
// check for a new earliest train (early trains are -x mins late)
if (num < currEarliestTime) {
earliest = train
currEarliestTime = num
earliest = train;
currEarliestTime = num;
}
}
}
@ -199,8 +206,8 @@ export default {
insights["percentageNotLate"] = (100 - insights["percentageLate"]).toFixed(2);
insights["totalNumTrains"] = Object.keys(this.allDataMap).length;
insights["latestTime"] = currLatestTime;
insights["earliestTime"] = currEarliestTime
this.publicMessages = currentMessages
insights["earliestTime"] = currEarliestTime;
this.publicMessages = currentMessages;
// assign the results to the Vue Store
store.setInsights(insights);