State at 2024-11-14

11 files changed, 55 insertions, 24 deletions

diff --git a/il_timetable/init_code.lua b/il_timetable/init_code.lua
index 5be7317..2915a6d 100644
--- a/il_timetable/init_code.lua
+++ b/il_timetable/init_code.lua
@@ -507,7 +507,8 @@ end
  interval = 30,
  display1 = "d1",
  display2 = "d2",
- display3 = "d3"
+ display3 = "d3",
+ show_trainid = false,
 }]]
 function F.ttp_station_display(p)
 --L425
@@ -522,7 +523,9 @@ local function is_past_station(tstn, stnorder)
 end
 local function add_train(deptime, line, train, tid)
   local tent = {dep = deptime, text = 
-     rwt.to_string(deptime,true).." "..F.ttp[line].stn_display
+     rwt.to_string(deptime,true)
+     .." "..(p.show_trainid and tid or "")
+     ..F.ttp[line].stn_display
      .." +"..train.last_delay}
   for i,ntrn in ipairs(next_trains) do
     if rwt.diff(ntrn.dep, deptime)<0 then
diff --git a/il_timetable/nodes/(981,15,1041).lua b/il_timetable/nodes/(981,15,1041).lua
index b40c49c..32979cc 100644
--- a/il_timetable/nodes/(981,15,1041).lua
+++ b/il_timetable/nodes/(981,15,1041).lua
@@ -5,5 +5,6 @@ F.ttp_station_display({
  title = "Ehlodex",
  display1 = "d1",
  display2 = "d2",
- display3 = "d3"
+ display3 = "d3",
+ --show_trainid = true,
 })
\ No newline at end of file
diff --git a/il_timetable/nodes/(981,19,1053).lua b/il_timetable/nodes/(981,19,1053).lua
index ae36742..b46cebe 100644
--- a/il_timetable/nodes/(981,19,1053).lua
+++ b/il_timetable/nodes/(981,19,1053).lua
@@ -1,6 +1,13 @@
 
+
+lines = F.ttp_info_times("CFE_N", "00;00")
+linestr = F.ttp_info_trains("CFE_N", "00;00")
+local li = lines
+for i=1,#linestr do li[#li+1] = linestr[i] end
+print(" CFE_N\n"..table.concat(li, "\n"))
+
 lines = F.ttp_info_times("CFE_S", "00;00")
 linestr = F.ttp_info_trains("CFE_S", "00;00")
 local li = lines
 for i=1,#linestr do li[#li+1] = linestr[i] end
-print(" CFE\n"..table.concat(li, "\n"))
+print(" CFE_S\n"..table.concat(li, "\n"))
diff --git a/il_timetable/nodes/(981,21,1053).lua b/il_timetable/nodes/(981,21,1053).lua
index 567de55..be19fda 100644
--- a/il_timetable/nodes/(981,21,1053).lua
+++ b/il_timetable/nodes/(981,21,1053).lua
@@ -1,6 +1,14 @@
+--N/S
+local line = "E85"
 
-lines = F.ttp_info_times("CFE_N", "00;00")
-linestr = F.ttp_info_trains("CFE_N", "00;00")
+lines = F.ttp_info_times(line.."_N", "00;00")
+linestr = F.ttp_info_trains(line.."_N", "00;00")
 local li = lines
 for i=1,#linestr do li[#li+1] = linestr[i] end
-print(" CFE\n"..table.concat(li, "\n"))
+print(line.."_N\n"..table.concat(li, "\n"))
+
+lines = F.ttp_info_times(line.."_S", "00;00")
+linestr = F.ttp_info_trains(line.."_S", "00;00")
+local li = lines
+for i=1,#linestr do li[#li+1] = linestr[i] end
+print(line.."_S\n"..table.concat(li, "\n"))
\ No newline at end of file
diff --git a/il_timetable/nodes/(981,22,1053).lua b/il_timetable/nodes/(981,22,1053).lua
index 2a52ca4..8f5f90c 100644
--- a/il_timetable/nodes/(981,22,1053).lua
+++ b/il_timetable/nodes/(981,22,1053).lua
@@ -1,5 +1,6 @@
 --S.ttt["901424"] = nil
 --S.ttp["E85_N"] = nil
+nope()
 
 local tr="E85"
 S.ttp[tr.."_N"].force_tt_reset = true
diff --git a/il_timetable/nodes/(982,19,1053).lua b/il_timetable/nodes/(982,19,1053).lua
index 1acc131..88a245f 100644
--- a/il_timetable/nodes/(982,19,1053).lua
+++ b/il_timetable/nodes/(982,19,1053).lua
@@ -1,5 +1,11 @@
+lines = F.ttp_info_times("NX_N", "00;00")
+linestr = F.ttp_info_trains("NX_N", "00;00")
+li = lines
+for i=1,#linestr do li[#li+1] = linestr[i] end
+print(" NX_N\n"..table.concat(li, "\n"))
+
 lines = F.ttp_info_times("NX_S", "00;00")
 linestr = F.ttp_info_trains("NX_S", "00;00")
 li = lines
 for i=1,#linestr do li[#li+1] = linestr[i] end
-print(" NX\n"..table.concat(li, "\n"))
\ No newline at end of file
+print(" NX_S\n"..table.concat(li, "\n"))
\ No newline at end of file
diff --git a/il_timetable/nodes/(982,21,1053).lua b/il_timetable/nodes/(982,21,1053).lua
index 4f6e3d8..c00a6ff 100644
--- a/il_timetable/nodes/(982,21,1053).lua
+++ b/il_timetable/nodes/(982,21,1053).lua
@@ -1,5 +1,14 @@
-lines = F.ttp_info_times("NX_N", "00;00")
-linestr = F.ttp_info_trains("NX_N", "00;00")
-li = lines
+--W/E
+local line = "E16"
+
+lines = F.ttp_info_times(line.."_W", "00;00")
+linestr = F.ttp_info_trains(line.."_W", "00;00")
+local li = lines
 for i=1,#linestr do li[#li+1] = linestr[i] end
-print(" NX\n"..table.concat(li, "\n"))
\ No newline at end of file
+print(line.."_W\n"..table.concat(li, "\n"))
+
+lines = F.ttp_info_times(line.."_E", "00;00")
+linestr = F.ttp_info_trains(line.."_E", "00;00")
+local li = lines
+for i=1,#linestr do li[#li+1] = linestr[i] end
+print(line.."_E\n"..table.concat(li, "\n"))
\ No newline at end of file
diff --git a/il_timetable/nodes/(982,22,1053).lua b/il_timetable/nodes/(982,22,1053).lua
deleted file mode 100644
index a30cd5d..0000000
--- a/il_timetable/nodes/(982,22,1053).lua
+++ /dev/null
@@ -1,6 +0,0 @@
-
-lines = F.ttp_info_times("E84_S", "00;00")
-linestr = F.ttp_info_trains("E84_S", "00;00")
-local li = lines
-for i=1,#linestr do li[#li+1] = linestr[i] end
-print(" E84\n"..table.concat(li, "\n"))
\ No newline at end of file
diff --git a/il_timetable/nodes/(983,19,1053).lua b/il_timetable/nodes/(983,19,1053).lua
index fcd6179..9f41faa 100644
--- a/il_timetable/nodes/(983,19,1053).lua
+++ b/il_timetable/nodes/(983,19,1053).lua
@@ -1,5 +1,11 @@
+lines = F.ttp_info_times("E1_N", "00;00")
+linestr = F.ttp_info_trains("E1_N", "00;00")
+li = lines
+for i=1,#linestr do li[#li+1] = linestr[i] end
+print(" E1_N\n"..table.concat(li, "\n"))
+
 lines = F.ttp_info_times("E1_S", "00;00")
 linestr = F.ttp_info_trains("E1_S", "00;00")
 li = lines
 for i=1,#linestr do li[#li+1] = linestr[i] end
-print(" E1\n"..table.concat(li, "\n"))
\ No newline at end of file
+print(" E1_S\n"..table.concat(li, "\n"))
\ No newline at end of file
diff --git a/il_timetable/nodes/(983,21,1053).lua b/il_timetable/nodes/(983,21,1053).lua
deleted file mode 100644
index 4c89cef..0000000
--- a/il_timetable/nodes/(983,21,1053).lua
+++ /dev/null
@@ -1,5 +0,0 @@
-lines = F.ttp_info_times("E1_N", "00;00")
-linestr = F.ttp_info_trains("E1_N", "00;00")
-li = lines
-for i=1,#linestr do li[#li+1] = linestr[i] end
-print(" E1\n"..table.concat(li, "\n"))
\ No newline at end of file
diff --git a/il_timetable/nodes/(983,22,1053).lua b/il_timetable/nodes/(983,22,1053).lua
new file mode 100644
index 0000000..9a22313
--- /dev/null
+++ b/il_timetable/nodes/(983,22,1053).lua
@@ -0,0 +1 @@
+S.ttt["929858"] = nil
\ No newline at end of file