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

remove legacy map search / intersection views

parent 44a48a1b

lib/DBInfoscreen.pm

+0 −4
Original line number Diff line number Diff line
@@ -328,14 +328,10 @@ sub startup { 


	$r->get('/_ajax_mapinfo/:tripid/:lineno')->to('map#ajax_route');

	$r->get('/map/:tripid/:lineno')->to('map#route');

	$r->get('/intersection/:trips')->to('map#intersection');

	$r->get( '/z/:train/*station' => 'train_at_station' )

	  ->to('stationboard#station_train_details');

	$r->get( '/z/:train' => 'train' )->to('stationboard#train_details');



	$r->get('/map')->to('map#search_form');

	$r->get('/_trainsearch')->to('map#search');



	$self->defaults( layout => 'app' );



	$r->get('/')->to('stationboard#handle_request');

lib/DBInfoscreen/Controller/Map.pm

+0 −74
Original line number Diff line number Diff line
@@ -509,78 +509,4 @@ sub ajax_route { 
	)->wait;

}



sub search {

	my ($self) = @_;



	my $t1 = $self->param('train1');

	my $t2 = $self->param('train2');



	my $t1_data;

	my $t2_data;



	my @requests;



	if ( not( $t1 and $t1 =~ m{^\S+\s+\d+$} )

		or ( $t2 and not $t2 =~ m{^\S+\s+\d+$} ) )

	{

		$self->render(

			'trainsearch',

			title     => 'Fahrtverlauf',

			hide_opts => 1,

			error     => $t1

			? "Züge müssen im Format 'Zugtyp Nummer' angegeben werden, z.B. 'RE 1234'"

			: undef,

		);

		return;

	}



	$self->render_later;



	push( @requests, $self->hafas->trainsearch_p( train_no => $t1 ) );



	if ($t2) {

		push( @requests, $self->hafas->trainsearch_p( train_no => $t2 ) );

	}



	Mojo::Promise->all(@requests)->then(

		sub {

			my ( $t1_data, $t2_data ) = @_;



			if ($t2_data) {

				$self->redirect_to(

					sprintf(

						"/intersection/%s,0;%s,0",

						$t1_data->[0]{trip_id},

						$t2_data->[0]{trip_id},

					)

				);

			}

			else {

				$self->redirect_to(

					sprintf( "/map/%s/0", $t1_data->[0]{trip_id}, ) );

			}

		}

	)->catch(

		sub {

			my ($err) = @_;

			$self->render(

				'trainsearch',

				title     => 'Fahrtverlauf',

				hide_opts => 1,

				error     => $err

			);

		}

	)->wait;

}



sub search_form {

	my ($self) = @_;



	$self->render(

		'trainsearch',

		title     => 'Fahrtverlauf',

		hide_opts => 1,

	);

}



1;

templates/_intersection_infobox.html.ep

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<div class="container" id="infobox2" style="margin-top: 1ex; margin-bottom: 1ex;">

<div class="journey" id="jdata"

data-req="<%= stash('ajax_req') %>"

data-route="<%= stash('ajax_route') %>"

data-poly="<%= stash('ajax_polyline') %>"

>

	<strong><%= stash('train1_no') %></strong>

	und

	<strong><%= stash('train2_no') %></strong>

	werden sich wahrscheinlich

	% if (my $t = stash('time')) {

		gegen <strong><%= $t->strftime('%H:%M') %> Uhr</strong>

	% }

	% if (my $p = stash('likely_pair')) {

		zwischen <strong><%= $p->[0] %></strong> und <strong><%= $p->[1] %></strong>

	% }

	% if (not stash('time')) {

		nicht

	% }

	begegnen.

</div>

</div>

templates/route_map.html.ep

+0 −3
Original line number Diff line number Diff line 
% if (stash('origin') and stash('destination')) {

	%= include '_map_infobox'

% }

% elsif (stash('intersection')) {

	%= include '_intersection_infobox'

% }



<div class="container">

		<div id="map" style="height: 500px;">

templates/trainsearch.html.ep

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<div class="container">

  <div class="input-field">

    %= form_for _trainsearch => begin

      <div>

        <div class="field">

          <div class="desc">Zug</div>

          <div>

            %= text_field 'train1', placeholder => 'RE 1234', id => 'train1_input', autofocus => 'autofocus'

          </div>

        </div>

        <div class="field">

          %= submit_button 'Strecke zeigen'

        </div>

        <div class="break"></div>

        <div class="field">

          <div class="desc">

            Zweiter Zug (optional)

          </div>

          <div>

            %= text_field 'train2', placeholder => 'S 5678', id => 'train2_input'

          </div>

        </div>

        <div class="field">

          %= submit_button 'Begegnungen suchen (beta)'

        </div>

      </div>

    % end

  </div>

</div>