Merge branch 'main' into efa-support

1 files changed, 16 insertions, 6 deletions

diff --git a/public/static/js/geolocation.js b/public/static/js/geolocation.js
index a496900..1bb4b2b 100644
--- a/public/static/js/geolocation.js
+++ b/public/static/js/geolocation.js
@@ -24,7 +24,9 @@ $(document).ready(function() {
 			const res = $(document.createElement('p'));
 			$.each(stops, function(i, stop) {
 				const parts = stop.split(';');
-				const node = $('<a class="tablerow" href="/s/' + parts[0] + '?hafas=' + parts[2] + '"><span><i class="material-icons" aria-hidden="true">' + (parts[2] == '0' ? 'train' : 'directions') + '</i>' + parts[1] + '</span></a>');
+				const [ eva, name, dbris, motis, hafas ] = parts;
+
+				const node = $('<a class="tablerow" href="/s/' + eva + '?dbris=' + dbris + '&amp;motis=' + motis + '&amp;hafas=' + hafas + '"><span><i class="material-icons" aria-hidden="true">' + (dbris == '0' ? 'train' : 'directions') + '</i>' + name + '</span></a>');
 				node.click(function() {
 					$('nav .preloader-wrapper').addClass('active');
 				});
@@ -45,13 +47,21 @@ $(document).ready(function() {
 		} else {
 			const res = $(document.createElement('p'));
 			$.each(data.candidates, function(i, candidate) {
+				let node;
+
+				if (candidate.motis !== undefined) {
+					const { id, name, motis } = candidate;
+
+					node = $('<a class="tablerow" href="/s/' + id + '?motis=' + motis + '"><span><i class="material-icons" aria-hidden="true">train</i>' + name + '</span></a>');
+				} else {
+					const eva = candidate.eva,
+						name = candidate.name,
+						hafas = candidate.hafas,
+						distance = candidate.distance.toFixed(1);
 
-				const eva = candidate.eva,
-					name = candidate.name,
-					hafas = candidate.hafas,
-					distance = candidate.distance.toFixed(1);
+					node = $('<a class="tablerow" href="/s/' + eva + '?hafas=' + hafas + '"><span><i class="material-icons" aria-hidden="true">' + (hafas == '0' ? 'train' : 'directions') + '</i>' + name + '</span></a>');
+				}
 
-				const node = $('<a class="tablerow" href="/s/' + eva + '?hafas=' + hafas + '"><span><i class="material-icons" aria-hidden="true">' + (hafas == '0' ? 'train' : 'directions') + '</i>' + name + '</span></a>');
 				node.click(function() {
 					$('nav .preloader-wrapper').addClass('active');
 				});