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

[frontend]: Determine 'display' boolean first

Browse Source
This commit is contained in:
Aindréas Ó hAodha
2025-03-31 14:19:52 +01:00
parent b33ab200f7
commit b023e38788
1 changed files with 67 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
frontend/src/App.jsx
View File

@ -201,24 +201,6 @@ function App() {
switch (item.objectType) { switch (item.objectType) {
case "IrishRailTrain": case "IrishRailTrain":
objectTitle = "Irish Rail Train: " + item.trainCode;
icon = item.trainTypeFull + item.trainPunctualityStatus;
if (item.trainStatusFull === "Terminated" || item.trainStatusFull === "Not yet running") {
icon = item.trainTypeFull + "NotRunning";
}
popupContent = (
<IrishRailTrainPopup
item={item}
objectTitle={objectTitle}
toggleFavourite={toggleFavourite}
favourites={favourites}
/>
);
markerText = item.trainPublicMessage + " " + item.trainDirection;
display = display =
item.latitude !== "0" && item.latitude !== "0" &&
item.longitude !== "0" && item.longitude !== "0" &&
@ -248,9 +230,42 @@ function App() {
: true) && : true) &&
(showFaovouritesOnly ? favourites.IrishRailTrain.includes(item.trainCode) : true); (showFaovouritesOnly ? favourites.IrishRailTrain.includes(item.trainCode) : true);
if (!display) {
break;
}
objectTitle = "Irish Rail Train: " + item.trainCode;
icon = item.trainTypeFull + item.trainPunctualityStatus;
if (item.trainStatusFull === "Terminated" || item.trainStatusFull === "Not yet running") {
icon = item.trainTypeFull + "NotRunning";
}
popupContent = (
<IrishRailTrainPopup
item={item}
objectTitle={objectTitle}
toggleFavourite={toggleFavourite}
favourites={favourites}
/>
);
markerText = item.trainPublicMessage + " " + item.trainDirection;
break; break;
case "IrishRailStation": case "IrishRailStation":
display = item.latitude !== "0" &&
item.longitude !== "0" &&
(numberInputValue && userLocationAvailable
? haversineDistance(userLocation, [item.latitude, item.longitude]) < numberInputValue
: true) &&
(showFaovouritesOnly ? favourites.IrishRailStation.includes(item.trainStationCode) : true);
if (!display) {
break;
}
objectTitle = item.trainStationDesc + " Train Station"; objectTitle = item.trainStationDesc + " Train Station";
popupContent = ( popupContent = (
<TrainStationPopup <TrainStationPopup
@ -261,15 +276,20 @@ function App() {
/> />
); );
markerText = item.trainStationCode + " " + item.trainStationDesc; markerText = item.trainStationCode + " " + item.trainStationDesc;
break;
case "Bus":
display = item.latitude !== "0" && display = item.latitude !== "0" &&
item.longitude !== "0" && item.longitude !== "0" &&
(numberInputValue && userLocationAvailable (numberInputValue && userLocationAvailable
? haversineDistance(userLocation, [item.latitude, item.longitude]) < numberInputValue ? haversineDistance(userLocation, [item.latitude, item.longitude]) < numberInputValue
: true) && : true) &&
(showFaovouritesOnly ? favourites.IrishRailStation.includes(item.trainStationCode) : true); (showFaovouritesOnly ? favourites.Bus.includes(item.busRoute) : true);
break;
if (!display) {
break;
}
case "Bus":
objectTitle = item.busRouteAgencyName + ": " + item.busRouteShortName; objectTitle = item.busRouteAgencyName + ": " + item.busRouteShortName;
popupContent = ( popupContent = (
<BusPopup <BusPopup
@ -280,15 +300,20 @@ function App() {
/> />
); );
markerText = item.busRouteAgencyName + " " + item.busRouteShortName + " " + item.busRouteLongName; markerText = item.busRouteAgencyName + " " + item.busRouteShortName + " " + item.busRouteLongName;
break;
case "BusStop":
display = item.latitude !== "0" && display = item.latitude !== "0" &&
item.longitude !== "0" && item.longitude !== "0" &&
(numberInputValue && userLocationAvailable (numberInputValue && userLocationAvailable
? haversineDistance(userLocation, [item.latitude, item.longitude]) < numberInputValue ? haversineDistance(userLocation, [item.latitude, item.longitude]) < numberInputValue
: true) && : true) &&
(showFaovouritesOnly ? favourites.Bus.includes(item.busRoute) : true); (showFaovouritesOnly ? favourites.BusStop.includes(item.busStopID) : true);
break;
if (!display) {
break;
}
case "BusStop":
objectTitle = item.busStopName + " Bus Stop"; objectTitle = item.busStopName + " Bus Stop";
popupContent = ( popupContent = (
<BusStopPopup <BusStopPopup
@ -299,17 +324,9 @@ function App() {
/> />
); );
markerText = item.busStopName; markerText = item.busStopName;
display = item.latitude !== "0" &&
item.longitude !== "0" &&
(numberInputValue && userLocationAvailable
? haversineDistance(userLocation, [item.latitude, item.longitude]) < numberInputValue
: true) &&
(showFaovouritesOnly ? favourites.BusStop.includes(item.busStopID) : true);
break; break;
case "LuasStop": case "LuasStop":
objectTitle = item.luasStopName + " Luas Stop";
let luasLine; let luasLine;
switch (item.luasStopLineID) { switch (item.luasStopLineID) {
case "1": case "1":
@ -324,16 +341,6 @@ function App() {
luasLine = "N/A"; luasLine = "N/A";
} }
popupContent = (
<LuasPopup
item={item}
objectTitle={objectTitle}
luasLine={luasLine}
toggleFavourite={toggleFavourite}
favourites={favourites}
/>
);
markerText = item.luasStopIrishName + " " + item.luasStopName + " " + luasLine;
display = item.latitude !== "0" && display = item.latitude !== "0" &&
item.longitude !== "0" && item.longitude !== "0" &&
( (
@ -350,15 +357,27 @@ function App() {
? haversineDistance(userLocation, [item.latitude, item.longitude]) < numberInputValue ? haversineDistance(userLocation, [item.latitude, item.longitude]) < numberInputValue
: true) && : true) &&
(showFaovouritesOnly ? favourites.LuasStop.includes(item.luasStopID) : true); (showFaovouritesOnly ? favourites.LuasStop.includes(item.luasStopID) : true);
if (!display) {
break;
}
objectTitle = item.luasStopName + " Luas Stop";
popupContent = (
<LuasPopup
item={item}
objectTitle={objectTitle}
luasLine={luasLine}
toggleFavourite={toggleFavourite}
favourites={favourites}
/>
);
markerText = item.luasStopIrishName + " " + item.luasStopName + " " + luasLine;
break; break;
default: default:
popupContent = ( display = false;
<div>
<h3>{item.objectType}</h3>
</div>
);
markerText = `Unknown Object Type: ${item.objectType}`;
} }
if (display) { if (display) {