From ad7886fa45e10e03f11b430d6c059014b4da4a00 Mon Sep 17 00:00:00 2001
From: "hieda_kyuko@hpr" <ugo58956@protonmail.com>
Date: Mon, 26 May 2025 10:20:45 +0200
Subject: [PATCH] update output for bus lines
---
lib/App/MasterUtils.pm | 8 ++++++++
lib/App/Navi.pm | 5 +++--
src/oud2_parser.pl | 4 ++--
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/lib/App/MasterUtils.pm b/lib/App/MasterUtils.pm
index 1d212d1..a990eb8 100644
--- a/lib/App/MasterUtils.pm
+++ b/lib/App/MasterUtils.pm
@@ -43,6 +43,14 @@ sub get_rosen_frame
Log::e "Route id $rosen_id not found.";
}
+sub is_train_route
+{
+ my ($master, $rosen_id) = @_;
+ my $frame = get_rosen_frame $master, $rosen_id;
+ return $frame->{'is_train'};
+}
+
+
sub get_rosenmei
{
return (get_rosen_frame $_[0], $_[1])->{'rosenmei'};
diff --git a/lib/App/Navi.pm b/lib/App/Navi.pm
index ed44e8a..fb3a56e 100644
--- a/lib/App/Navi.pm
+++ b/lib/App/Navi.pm
@@ -338,8 +338,9 @@ sub Raptor_simple
. '(' . (TimeUtils::format_time_simple (TimeUtils::subtract_from $from_dep, $to_arr)) . ')'
. "\t| "
. (MasterUtils::get_rosenmei $master, $r)
- . ' '
- . (FrameUtils::get_syubetsu $master, $r, $u->{'syubetsu'})
+ . ((MasterUtils::is_train_route $master, $r)
+ ? ' ' . FrameUtils::get_syubetsu $master, $r, $u->{'syubetsu'}
+ : '')
. "$m"
. ' for '
. (FrameUtils::get_destination $master, $r, $u->{'jikoku'}, 0, ($legs[$i]->{'dir'} == 0 ? 1 : 0))
diff --git a/src/oud2_parser.pl b/src/oud2_parser.pl
index 29f9141..6a62c04 100644
--- a/src/oud2_parser.pl
+++ b/src/oud2_parser.pl
@@ -451,11 +451,11 @@ $master{'transfer_times'} = $transfers;
# FrameUtils::hassya_hyou \%master, 'sekihoku1_28';
-my $d = MasterUtils::search_eki \%master, '以久科';
+my $d = MasterUtils::search_eki \%master, '遠矢';
my $a = MasterUtils::search_eki \%master, '五十嵐';
sub eki { return MasterUtils::search_eki \%master, $_[0]; }
-Navi::Raptor_simple \%master, $d, $a, 640;
+Navi::Raptor_simple \%master, $d, $a, 1800;
# FrameUtils::hassya_hyou \%master, (eki '古瀬');
--
GitLab