Unverified Commit 3184facb authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

do not treat hafas=0 as "HAFAS enabled"

parent b7fa09f8

public/static/js/collapse.js

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ function dbf_reg_handlers() { 
		if (param.get('detailed')) {

			suffix += '&detailed=1';

		}

		if (param.get('hafas')) {

		if (param.get('hafas') && param.get('hafas') != '0') {

			suffix += '&hafas=' + param.get('hafas') + '&highlight=' + trainElem.data('station');

		}

		if (param.get('past')) {
@@ -122,7 +122,7 @@ function dbf_reg_handlers() { 
		if (param.get('rt') || param.get('show_realtime')) {

			suffix += '&rt=1';

		}

		if (param.get('hafas')) {

		if (param.get('hafas') && param.get('hafas') != '0') {

			history.pushState({'page':'traindetail','jid':trainElem.data('jid')}, 'test', '/z/' + trainElem.data('jid') + suffix);

		} else {

			history.pushState({'page':'traindetail','station':station,'train':trainElem.data('no')}, 'test', '/z/' + trainElem.data('train') + '/' + trainElem.data('station') + suffix);

public/static/js/geostop.js

+5 −1
Original line number Diff line number Diff line
@@ -42,7 +42,11 @@ $(function() { 
					hafas = candidate.hafas;



				const stationlink = $(document.createElement('a'));

				if (hafas) {

					stationlink.attr('href', eva + '?hafas=' + hafas);

				} else {

					stationlink.attr('href', eva);

				}

				stationlink.text(name + ' ');



				const distancenode = $(document.createElement('div'));