From 98c37108762c6d7c9f1d691b84f49bfa65b81b28 Mon Sep 17 00:00:00 2001
From: "Y. Wang" <yw05@forksworld.de>
Date: Sat, 11 Jun 2022 18:07:00 +0200
Subject: Implement primitive distant signaling

---
 advtrains_interlocking/routesetting.lua | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 67efaea..f1b4455 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -45,6 +45,7 @@ function ilrs.set_route(signal, route, try)
 	local rtename = route.name
 	local signalname = ildb.get_tcbs(signal).signal_name
 	local c_tcbs, c_ts_id, c_ts, c_rseg, c_lckp
+	local signals = {}
 	while c_sigd and i<=#route do
 		c_tcbs = ildb.get_tcbs(c_sigd)
 		if not c_tcbs then
@@ -115,6 +116,7 @@ function ilrs.set_route(signal, route, try)
 				c_tcbs.aspect = route.aspect or advtrains.interlocking.GENERIC_FREE
 				c_tcbs.route_origin = signal
 				advtrains.interlocking.update_signal_aspect(c_tcbs)
+				signals[#signals+1] = c_tcbs.signal
 			end
 		end
 		-- advance
@@ -122,6 +124,25 @@ function ilrs.set_route(signal, route, try)
 		c_sigd = c_rseg.next
 		i = i + 1
 	end
+
+	-- Distant signaling
+	local lastsig = nil
+	if c_sigd then
+		local e_tcbs = ildb.get_tcbs(c_sigd)
+		local pos = e_tcbs and e_tcbs.signal
+		if pos then
+			lastsig = pos
+		end
+	end
+	for i = #signals, 1, -1 do
+		if lastsig then
+			local pos = signals[i]
+			local _, assigned_by = advtrains.distant.get_main(pos)
+			if assigned_by ~= "manual" then
+				advtrains.distant.assign(lastsig, signals[i], "routesetting")
+			end
+		end
+	end
 	
 	return true
 end
-- 
cgit v1.2.3


From 875968f078ef89b13afae6d02a2dabe5ea7897cb Mon Sep 17 00:00:00 2001
From: "Y. Wang" <yw05@forksworld.de>
Date: Sun, 3 Jul 2022 12:45:27 +0200
Subject: Unassign distant signals when canceling route

---
 advtrains_interlocking/routesetting.lua            | 11 +++++++++--
 advtrains_interlocking/signal_api.lua              |  7 ++++++-
 advtrains_interlocking/signal_aspect_accessors.lua |  2 +-
 advtrains_interlocking/signal_aspects.lua          |  4 ++++
 advtrains_signals_japan/init.lua                   |  2 +-
 5 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index f1b4455..4ce6fd3 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -113,7 +113,7 @@ function ilrs.set_route(signal, route, try)
 			}
 			if c_tcbs.signal then
 				c_tcbs.route_committed = true
-				c_tcbs.aspect = route.aspect or advtrains.interlocking.GENERIC_FREE
+				c_tcbs.aspect = route.aspect or advtrains.interlocking.FULL_FREE
 				c_tcbs.route_origin = signal
 				advtrains.interlocking.update_signal_aspect(c_tcbs)
 				signals[#signals+1] = c_tcbs.signal
@@ -138,7 +138,7 @@ function ilrs.set_route(signal, route, try)
 		if lastsig then
 			local pos = signals[i]
 			local _, assigned_by = advtrains.distant.get_main(pos)
-			if assigned_by ~= "manual" then
+			if not assigned_by or assigned_by == "routesetting" then
 				advtrains.distant.assign(lastsig, signals[i], "routesetting")
 			end
 		end
@@ -251,6 +251,13 @@ function ilrs.cancel_route_from(sigd)
 		c_tcbs.route_origin = nil
 		
 		advtrains.interlocking.update_signal_aspect(c_tcbs)
+		if c_tcbs.signal then
+			local pos = c_tcbs.signal
+			local _, assigned_by = advtrains.distant.get_main(pos)
+			if assigned_by == "routesetting" then
+				advtrains.distant.unassign_dst(pos)
+			end
+		end
 		
 		c_ts_id = c_tcbs.ts_id
 		if not c_tcbs then
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index 1fd4e34..eec70f9 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -176,6 +176,11 @@ advtrains.interlocking.GENERIC_FREE = {
 	shunt = false,
 	dst = false,
 }
+advtrains.interlocking.FULL_FREE = {
+	main = -1,
+	shunt = false,
+	proceed_as_main = true,
+}
 
 local function convert_aspect_if_necessary(asp)
 	if type(asp.main) == "table" then
@@ -212,7 +217,7 @@ end
 
 function advtrains.interlocking.signal_after_dig(pos)
 	-- clear influence point
-	advtrains.interlocking.db.clear_ip_by_signalpos(pos)
+
 	advtrains.interlocking.signal_clear_aspect(pos)
 	advtrains.distant.unassign_all(pos, true)
 end
diff --git a/advtrains_interlocking/signal_aspect_accessors.lua b/advtrains_interlocking/signal_aspect_accessors.lua
index 02a03ea..bdbb803 100644
--- a/advtrains_interlocking/signal_aspect_accessors.lua
+++ b/advtrains_interlocking/signal_aspect_accessors.lua
@@ -103,9 +103,9 @@ local function set_aspect(pos, asp)
 		local newasp, aspval = adjust_aspect(pos, asp)
 		set_supposed_aspect(pos, newasp)
 		ndef.advtrains.set_aspect(pos, node, aspval)
+		I.signal_on_aspect_changed(pos)
 		local aspect_changed = A.not_equalp(oldasp, newasp)
 		if aspect_changed then
-			I.signal_on_aspect_changed(pos)
 			D.update_main(pos)
 		end
 	end
diff --git a/advtrains_interlocking/signal_aspects.lua b/advtrains_interlocking/signal_aspects.lua
index 2866ae1..5c4948b 100644
--- a/advtrains_interlocking/signal_aspects.lua
+++ b/advtrains_interlocking/signal_aspects.lua
@@ -32,6 +32,8 @@ local function register_type2(def)
 		t.label = label
 
 		t.main = asp.main
+		t.shunt = asp.shunt
+		t.proceed_as_main = asp.proceed_as_main
 		mainasps[idx] = t
 		mainasps[name] = idx
 	end
@@ -87,6 +89,8 @@ local function type2main_to_type1(name, asp)
 
 	local t = {
 		main = asptbl.main,
+		shunt = asptbl.shunt,
+		proceed_as_main = asptbl.proceed_as_main,
 		type2name = asp,
 		type2group = name,
 		dst = dst,
diff --git a/advtrains_signals_japan/init.lua b/advtrains_signals_japan/init.lua
index 9ccf66b..2062a21 100644
--- a/advtrains_signals_japan/init.lua
+++ b/advtrains_signals_japan/init.lua
@@ -321,7 +321,7 @@ local function process_signal(name, sigdata, isrpt)
 			tt[#tt+1] = string.format("0,%d=(advtrains_hud_bg.png\\^[colorize\\:%s)", lightcount-1, color)
 		end
 		tx[aspname] = table.concat(tt, ":")
-		type2def.main[idx] = {name = asp.name, label = S(aspnames[asp.name]), main = asp.main or false}
+		type2def.main[idx] = {name = asp.name, label = S(aspnames[asp.name]), main = asp.main, proceed_as_main = true}
 	end
 	local invimg = {
 		string.format("[combine:%dx%d", lightcount*4+1, lightcount*4+1),
-- 
cgit v1.2.3


From 4a3d442601a800e28a274026392461bd1a7cb127 Mon Sep 17 00:00:00 2001
From: "Y. Wang" <yw05@forksworld.de>
Date: Sun, 3 Jul 2022 15:34:42 +0200
Subject: Reduce number of set_aspect calls

---
 advtrains_interlocking/distant.lua                 |  6 ++++--
 advtrains_interlocking/routesetting.lua            | 13 +++++++------
 advtrains_interlocking/signal_api.lua              |  4 ++--
 advtrains_interlocking/signal_aspect_accessors.lua |  4 ++--
 4 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/distant.lua b/advtrains_interlocking/distant.lua
index ffa9e08..f62ca36 100644
--- a/advtrains_interlocking/distant.lua
+++ b/advtrains_interlocking/distant.lua
@@ -62,7 +62,7 @@ local function unassign_all(pos, force)
 	unassign_dst(pos, force)
 end
 
-local function assign(main, dst, by)
+local function assign(main, dst, by, skip_update)
 	local pts_main = pts(main)
 	local pts_dst = pts(dst)
 	local t = db_distant[pts_main]
@@ -76,7 +76,9 @@ local function assign(main, dst, by)
 	unassign_dst(dst, true)
 	t[pts_dst] = by
 	db_distant_of[pts_dst] = {pts_main, by}
-	update_dst(dst)
+	if not skip_update then
+		update_dst(dst)
+	end
 end
 
 local function pre_occupy(dst, by)
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 4ce6fd3..857a681 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -115,8 +115,7 @@ function ilrs.set_route(signal, route, try)
 				c_tcbs.route_committed = true
 				c_tcbs.aspect = route.aspect or advtrains.interlocking.FULL_FREE
 				c_tcbs.route_origin = signal
-				advtrains.interlocking.update_signal_aspect(c_tcbs)
-				signals[#signals+1] = c_tcbs.signal
+				signals[#signals+1] = c_tcbs
 			end
 		end
 		-- advance
@@ -136,11 +135,13 @@ function ilrs.set_route(signal, route, try)
 	end
 	for i = #signals, 1, -1 do
 		if lastsig then
-			local pos = signals[i]
+			local tcbs = signals[i]
+			local pos = tcbs.signal
 			local _, assigned_by = advtrains.distant.get_main(pos)
 			if not assigned_by or assigned_by == "routesetting" then
-				advtrains.distant.assign(lastsig, signals[i], "routesetting")
+				advtrains.distant.assign(lastsig, pos, "routesetting", true)
 			end
+			advtrains.interlocking.update_signal_aspect(tcbs, i ~= 1)
 		end
 	end
 	
@@ -250,14 +251,14 @@ function ilrs.cancel_route_from(sigd)
 		c_tcbs.route_auto = nil
 		c_tcbs.route_origin = nil
 		
-		advtrains.interlocking.update_signal_aspect(c_tcbs)
 		if c_tcbs.signal then
 			local pos = c_tcbs.signal
 			local _, assigned_by = advtrains.distant.get_main(pos)
 			if assigned_by == "routesetting" then
-				advtrains.distant.unassign_dst(pos)
+				advtrains.distant.unassign_dst(pos, true)
 			end
 		end
+		advtrains.interlocking.update_signal_aspect(c_tcbs)
 		
 		c_ts_id = c_tcbs.ts_id
 		if not c_tcbs then
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index eec70f9..1c6ed27 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -204,10 +204,10 @@ local function convert_aspect_if_necessary(asp)
 end
 advtrains.interlocking.signal_convert_aspect_if_necessary = convert_aspect_if_necessary
 
-function advtrains.interlocking.update_signal_aspect(tcbs)
+function advtrains.interlocking.update_signal_aspect(tcbs, skipdst)
 	if tcbs.signal then
 		local asp = tcbs.aspect or DANGER
-		advtrains.interlocking.signal_set_aspect(tcbs.signal, asp)
+		advtrains.interlocking.signal_set_aspect(tcbs.signal, asp, skipdst)
 	end
 end
 
diff --git a/advtrains_interlocking/signal_aspect_accessors.lua b/advtrains_interlocking/signal_aspect_accessors.lua
index bdbb803..e23aa13 100644
--- a/advtrains_interlocking/signal_aspect_accessors.lua
+++ b/advtrains_interlocking/signal_aspect_accessors.lua
@@ -95,7 +95,7 @@ get_aspect = function(pos)
 	return asp
 end
 
-local function set_aspect(pos, asp)
+local function set_aspect(pos, asp, skipdst)
 	local node = N.get_node(pos)
 	local ndef = minetest.registered_nodes[node.name]
 	if ndef and ndef.advtrains and ndef.advtrains.set_aspect then
@@ -105,7 +105,7 @@ local function set_aspect(pos, asp)
 		ndef.advtrains.set_aspect(pos, node, aspval)
 		I.signal_on_aspect_changed(pos)
 		local aspect_changed = A.not_equalp(oldasp, newasp)
-		if aspect_changed then
+		if (not skipdst) and aspect_changed then
 			D.update_main(pos)
 		end
 	end
-- 
cgit v1.2.3


From 6ae0615309bd5862a7480686ccba01a24b69356b Mon Sep 17 00:00:00 2001
From: "Y. Wang" <yw05@forksworld.de>
Date: Sun, 3 Jul 2022 15:54:14 +0200
Subject: Automatic dst unassignment; respect tcbs.nodst

---
 advtrains_interlocking/routesetting.lua   | 6 +++++-
 advtrains_interlocking/train_sections.lua | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 857a681..e792d28 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -46,12 +46,16 @@ function ilrs.set_route(signal, route, try)
 	local signalname = ildb.get_tcbs(signal).signal_name
 	local c_tcbs, c_ts_id, c_ts, c_rseg, c_lckp
 	local signals = {}
+	local nodst
 	while c_sigd and i<=#route do
 		c_tcbs = ildb.get_tcbs(c_sigd)
 		if not c_tcbs then
 			if not try then atwarn("Did not find TCBS",c_sigd,"while setting route",rtename,"of",signal) end
 			return false, "No TCB found at "..sigd_to_string(c_sigd)..". Please reconfigure route!"
 		end
+		if i == 1 then
+			nodst = c_tcbs.nodst
+		end
 		c_ts_id = c_tcbs.ts_id
 		if not c_ts_id then
 			if not try then atwarn("Encountered End-Of-Interlocking while setting route",rtename,"of",signal) end
@@ -138,7 +142,7 @@ function ilrs.set_route(signal, route, try)
 			local tcbs = signals[i]
 			local pos = tcbs.signal
 			local _, assigned_by = advtrains.distant.get_main(pos)
-			if not assigned_by or assigned_by == "routesetting" then
+			if (not nodst) and (not assigned_by or assigned_by == "routesetting") then
 				advtrains.distant.assign(lastsig, pos, "routesetting", true)
 			end
 			advtrains.interlocking.update_signal_aspect(tcbs, i ~= 1)
diff --git a/advtrains_interlocking/train_sections.lua b/advtrains_interlocking/train_sections.lua
index 757f36a..ec7f95f 100644
--- a/advtrains_interlocking/train_sections.lua
+++ b/advtrains_interlocking/train_sections.lua
@@ -91,6 +91,13 @@ local function setsection(tid, train, ts_id, ts, sigd)
 			tcbs.route_comitted = nil -- TODO compatibility cleanup
 			tcbs.aspect = nil
 			tcbs.route_origin = nil
+			if tcbs.signal then
+				local spos = tcbs.signal
+				local _, setter = advtrains.distant.get_main(spos)
+				if setter == "routesetting" then
+					advtrains.distant.unassign_dst(spos, true)
+				end
+			end
 			advtrains.interlocking.update_signal_aspect(tcbs)
 			if tcbs.signal and sigd_equal(ts.route.entry, ts.route.origin) then
 				if tcbs.route_auto and tcbs.routeset then
-- 
cgit v1.2.3


From a4abbf8824f893558861bff2893181ae02ed284d Mon Sep 17 00:00:00 2001
From: "Y. Wang" <yw05@forksworld.de>
Date: Sat, 13 Aug 2022 16:16:17 +0200
Subject: Add hotfix for path invalidation

---
 advtrains_interlocking/routesetting.lua            | 3 ++-
 advtrains_interlocking/signal_api.lua              | 6 ++++--
 advtrains_interlocking/signal_aspect_accessors.lua | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index e792d28..9973569 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -341,7 +341,8 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel)
 			end
 		else
 			--atdebug("Committed Route:",tcbs.routeset)
-			has_changed_aspect = true
+			-- set_route now sets the signal aspects
+			--has_changed_aspect = true
 		end
 	end
 	if has_changed_aspect then
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index 1c6ed27..e615692 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -227,8 +227,10 @@ function advtrains.interlocking.signal_on_aspect_changed(pos)
 	local ipts, iconn = advtrains.interlocking.db.get_ip_by_signalpos(pos)
 	if not ipts then return end
 	local ipos = minetest.string_to_pos(ipts)
-	
-	advtrains.invalidate_all_paths_ahead(ipos)
+
+	-- FIXME: invalidate_all_paths_ahead does not appear to always work as expected
+	--advtrains.invalidate_all_paths_ahead(ipos)
+	minetest.after(0, advtrains.invalidate_all_paths, ipos)
 end
 
 function advtrains.interlocking.signal_rc_handler(pos, node, player, itemstack, pointed_thing)
diff --git a/advtrains_interlocking/signal_aspect_accessors.lua b/advtrains_interlocking/signal_aspect_accessors.lua
index e23aa13..a1cbd4e 100644
--- a/advtrains_interlocking/signal_aspect_accessors.lua
+++ b/advtrains_interlocking/signal_aspect_accessors.lua
@@ -108,6 +108,11 @@ local function set_aspect(pos, asp, skipdst)
 		if (not skipdst) and aspect_changed then
 			D.update_main(pos)
 		end
+		--[[
+		local dbgmsg = string.format("[%s]set_aspect(%s,%s,%s)", os.clock(), minetest.pos_to_string(pos), minetest.serialize(asp), tostring(skipdst))
+		dbgmsg = debug.traceback(dbgmsg, 2)
+		minetest.chat_send_all(dbgmsg)
+		--]]
 	end
 end
 
-- 
cgit v1.2.3


From f8c2ec60d6fe1927b444aae51c3bce075ed05208 Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Sun, 17 Dec 2023 12:20:22 +0100
Subject: Signals can have nil name, documentation on route def

---
 advtrains_interlocking/database.lua     | 29 +++++++++++++++++++++++++++++
 advtrains_interlocking/route_prog.lua   | 20 +++++++++++++-------
 advtrains_interlocking/route_ui.lua     |  2 +-
 advtrains_interlocking/routesetting.lua |  2 +-
 advtrains_interlocking/tcb_ts_ui.lua    | 12 ++++++------
 5 files changed, 50 insertions(+), 15 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua
index 492326c..5d42309 100644
--- a/advtrains_interlocking/database.lua
+++ b/advtrains_interlocking/database.lua
@@ -178,6 +178,12 @@ TCB data structure
 	signal_name = <string> -- The human-readable name of the signal, only for documenting purposes
 	routes = { <route definition> } -- a collection of routes from this signal
 	route_auto = <boolean> -- When set, we will automatically re-set the route (designated by routeset)
+	
+	auto_block_signal_mode = <boolean> -- Simplified mode for simple block signals:
+	-- Signal has only one route which is constantly re-set (route_auto is implied)
+	-- Supposed to be used when only a single track section is ahead and it directly ends at the next signal
+	-- UI only offers to enable or disable the signal
+	-- ARS is implicitly disabled on the signal
 },
 -- This is the "B" side of the TCB
 [2] = { -- Variant: end of track-circuited area (initial state of TC)
@@ -185,6 +191,29 @@ TCB data structure
 }
 }
 
+Route definition
+routes = {
+	[i] = {
+		-- one table for each track section on the route
+		-- Note that the section ID is implicitly inferred from the TCB
+		1 = {
+			locks = { -- component locks for this section of the route. Not used when use_rscache is true.
+				(-16,9,0) = st
+			}
+			next = S[(-23,9,0)/2] -- the start TCB of the next route segment (pointing forward)
+		}
+		2 = {
+			locks = {}
+			-- if next is omitted, then there is no final TCB (e.g. a buffer)
+		}
+		name = "<the route name>"
+		ars = { <ARS rule definition table> }
+		use_rscache = false -- if true, instead of "locks", the track section's rs_cache will be used to set locks
+		-- Fields used by the autorouter:
+		ar_end_sigd = <sigd> -- the sigd describing the end of the route. Used for merging route options on recalculation
+	}
+}
+
 Track section
 [id] = {
 	name = "Some human-readable name"
diff --git a/advtrains_interlocking/route_prog.lua b/advtrains_interlocking/route_prog.lua
index 6abe431..5fd9363 100644
--- a/advtrains_interlocking/route_prog.lua
+++ b/advtrains_interlocking/route_prog.lua
@@ -19,6 +19,11 @@ C. punch a turnout (or some other passive component) to fix its state (toggle)
 The route visualization will also be used to visualize routes after they have been programmed.
 ]]--
 
+-- TODO duplicate
+local lntrans = { "A", "B" }
+local function sigd_to_string(sigd)
+	return minetest.pos_to_string(sigd.p).." / "..lntrans[sigd.s]
+end
 
 -- table with objectRefs
 local markerent = {}
@@ -237,10 +242,10 @@ local function get_last_route_item(origin, route)
 	return route[#route].next
 end
 
-local function do_advance_route(pname, rp, sigd, tsname)
+local function do_advance_route(pname, rp, sigd, tsref)
 	table.insert(rp.route, {next = sigd, locks = rp.tmp_lcks})
 	rp.tmp_lcks = {}
-	chat(pname, "Added track section '"..tsname.."' to the route.")
+	chat(pname, "Added track section '"..(tsref and (tsref.name or "") or "--EOI--").."' to the route.")
 end
 
 local function finishrpform(pname)
@@ -253,8 +258,9 @@ local function finishrpform(pname)
 		local term_tcbs = advtrains.interlocking.db.get_tcbs(terminal)
 		
 		if term_tcbs.signal then
+			local signalname = (term_tcbs.signal_name or "") .. sigd_to_string(terminal)
 			form = form .. "label[0.5,1.5;Route ends at signal:]"
-			form = form .. "label[0.5,2  ;"..term_tcbs.signal_name.."]"
+			form = form .. "label[0.5,2  ;"..signalname.."]"
 		else
 			form = form .. "label[0.5,1.5;WARNING: Route does not end at a signal.]"
 			form = form .. "label[0.5,2  ;Routes should in most cases end at signals.]"
@@ -423,20 +429,20 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			if fields.advance then
 				-- advance route
 				if not is_endpoint then
-					do_advance_route(pname, rp, this_sigd, this_ts.name)
+					do_advance_route(pname, rp, this_sigd, this_ts)
 				end
 			end
 			if fields.endhere then
 				if not is_endpoint then
-					do_advance_route(pname, rp, this_sigd, this_ts.name)
+					do_advance_route(pname, rp, this_sigd, this_ts)
 				end
 				finishrpform(pname)
 			end
 			if can_over and fields.endover then
 				if not is_endpoint then
-					do_advance_route(pname, rp, this_sigd, this_ts.name)
+					do_advance_route(pname, rp, this_sigd, this_ts)
 				end
-				do_advance_route(pname, rp, over_sigd, over_ts and over_ts.name or "--EOI--")
+				do_advance_route(pname, rp, over_sigd, over_ts)
 				finishrpform(pname)
 			end
 		end
diff --git a/advtrains_interlocking/route_ui.lua b/advtrains_interlocking/route_ui.lua
index 1999941..a1a331d 100644
--- a/advtrains_interlocking/route_ui.lua
+++ b/advtrains_interlocking/route_ui.lua
@@ -33,7 +33,7 @@ function atil.show_route_edit_form(pname, sigd, routeid)
 	local function itab(t)
 		tab[#tab+1] = minetest.formspec_escape(string.gsub(t, ",", " "))
 	end
-	itab("TCB "..sigd_to_string(sigd).." ("..tcbs.signal_name..") Route #"..routeid)
+	itab("TCB "..sigd_to_string(sigd).." ("..(tcbs.signal_name or "")..") Route #"..routeid)
 	
 	-- this code is partially copy-pasted from routesetting.lua
 	-- we start at the tc designated by signal
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 67efaea..ede3d49 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -43,7 +43,7 @@ function ilrs.set_route(signal, route, try)
 	local first = true
 	local i = 1
 	local rtename = route.name
-	local signalname = ildb.get_tcbs(signal).signal_name
+	local signalname = (ildb.get_tcbs(signal).signal_name or "") .. sigd_to_string(signal)
 	local c_tcbs, c_ts_id, c_ts, c_rseg, c_lckp
 	while c_sigd and i<=#route do
 		c_tcbs = ildb.get_tcbs(c_sigd)
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index 08d1c32..e365f4f 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -188,9 +188,6 @@ minetest.register_on_punchnode(function(pos, node, player, pointed_thing)
 					local tcbs = ildb.get_tcbs(sigd)
 					if tcbs then
 						tcbs.signal = pos
-						if not tcbs.signal_name then
-							tcbs.signal_name = "Signal at "..minetest.pos_to_string(sigd.p)
-						end
 						if not tcbs.routes then
 							tcbs.routes = {}
 						end
@@ -580,11 +577,10 @@ function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, calle
 	local tcbs = ildb.get_tcbs(sigd)
 	
 	if not tcbs.signal then return end
-	if not tcbs.signal_name then tcbs.signal_name = "Signal at "..minetest.pos_to_string(sigd.p) end
 	if not tcbs.routes then tcbs.routes = {} end
 	
 	local form = "size[7,10]label[0.5,0.5;Signal at "..minetest.pos_to_string(sigd.p).."]"
-	form = form.."field[0.8,1.5;5.2,1;name;Signal name;"..minetest.formspec_escape(tcbs.signal_name).."]"
+	form = form.."field[0.8,1.5;5.2,1;name;Signal name;"..minetest.formspec_escape(tcbs.signal_name or "").."]"
 	form = form.."button[5.5,1.2;1,1;setname;Set]"
 	
 	if tcbs.routeset then
@@ -717,7 +713,11 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			sel_rte = tpsi
 		end
 		if fields.setname and fields.name and hasprivs then
-			tcbs.signal_name = fields.name
+			if fields.name == "" then
+				tcbs.signal_name = nil -- do not save a signal name if it isnt used (equivalent to track sections)
+			else
+				tcbs.signal_name = fields.name
+			end
 		end
 		if tcbs.routeset and fields.cancelroute then
 			if tcbs.routes[tcbs.routeset] and tcbs.routes[tcbs.routeset].ars then
-- 
cgit v1.2.3


From 9fa43cb7bfc25ba71d16c8210f0074797a7bca1a Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Sun, 28 Jan 2024 00:42:28 +0100
Subject: Implement routesetting incorporating tscache, other improvements

---
 advtrains/passive.lua                   |   2 +-
 advtrains_interlocking/database.lua     | 221 +++++++++++++++++++++-----------
 advtrains_interlocking/route_prog.lua   |   2 +
 advtrains_interlocking/routesetting.lua |  43 +++++--
 advtrains_interlocking/tcb_ts_ui.lua    |   5 +-
 advtrains_interlocking/tool.lua         |   6 +-
 6 files changed, 185 insertions(+), 94 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains/passive.lua b/advtrains/passive.lua
index 741d7df..231da82 100644
--- a/advtrains/passive.lua
+++ b/advtrains/passive.lua
@@ -57,7 +57,7 @@ function advtrains.setstate(parpos, newstate, pnode)
 		return false, "train_here"
 	end
 	
-	if advtrains.interlocking and advtrains.interlocking.route.has_route_lock(minetest.pos_to_string(pos)) then
+	if advtrains.interlocking and advtrains.interlocking.route.has_route_lock(minetest.encode_pos(pos)) then
 		return false, "route_lock_here"
 	end
 	
diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua
index 5d42309..17a4199 100644
--- a/advtrains_interlocking/database.lua
+++ b/advtrains_interlocking/database.lua
@@ -84,11 +84,34 @@ function ildb.load(data)
 				if pos then
 					-- that was a pos_to_string
 					local epos = advtrains.encode_pos(pos)
+					atdebug("ILDB converting TCB position format",pts,"->",epos)
 					track_circuit_breaks[epos] = tcb
 				else
 					-- keep entry, it is already new
 					track_circuit_breaks[pts] = tcb
 				end
+				-- convert the routes.[].locks table keys
+				for t_side,tcbs in pairs(tcb) do
+					if tcbs.routes then
+						for t_rnum,route in pairs(tcbs.routes) do
+							for t_rsnm,rseg in ipairs(route) do
+								local locks_n = {}
+								for lpts,state in pairs(rseg.locks) do
+									local lpos = minetest.string_to_pos(lpts)
+									if lpos then
+										local epos = advtrains.encode_pos(lpos)
+										atdebug("ILDB converting tcb",pts,"side",t_side,"route",t_route,"lock position format",lpts,"->",epos)
+										locks_n[epos] = state
+									else
+										-- already correct format
+										locks_n[lpts] = state
+									end
+								end
+								rseg.locks = locks_n
+							end
+						end
+					end
+				end
 			end
 		end
 	end
@@ -99,7 +122,23 @@ function ildb.load(data)
 		signal_assignments = data.signalass
 	end
 	if data.rs_locks then
-		advtrains.interlocking.route.rte_locks = data.rs_locks
+		if data.tcbpts_conversion_applied then
+			advtrains.interlocking.route.rte_locks = data.rs_locks
+		else
+			advtrains.interlocking.route.rte_locks = {}
+			for pts, lta in pairs(data.rs_locks) do
+				local pos = minetest.string_to_pos(pts)
+				if pos then
+					-- that was a pos_to_string
+					local epos = advtrains.encode_pos(pos)
+					atdebug("ILDB converting Route Lock position format",pts,"->",epos)
+					advtrains.interlocking.route.rte_locks[epos] = lta
+				else
+					-- keep entry, it is already new
+					advtrains.interlocking.route.rte_locks[pts] = lta
+				end
+			end
+		end
 	end
 	if data.rs_callbacks then
 		advtrains.interlocking.route.rte_callbacks = data.rs_callbacks
@@ -197,8 +236,8 @@ routes = {
 		-- one table for each track section on the route
 		-- Note that the section ID is implicitly inferred from the TCB
 		1 = {
-			locks = { -- component locks for this section of the route. Not used when use_rscache is true.
-				(-16,9,0) = st
+			locks = { -- component locks for this section of the route.
+				800080008000 = st
 			}
 			next = S[(-23,9,0)/2] -- the start TCB of the next route segment (pointing forward)
 		}
@@ -208,7 +247,8 @@ routes = {
 		}
 		name = "<the route name>"
 		ars = { <ARS rule definition table> }
-		use_rscache = false -- if true, instead of "locks", the track section's rs_cache will be used to set locks
+		use_rscache = false -- if true, the track section's rs_cache will be used to set locks in addition to the locks table
+							-- this is disabled for legacy routes, but enabled for all new routes by default
 		-- Fields used by the autorouter:
 		ar_end_sigd = <sigd> -- the sigd describing the end of the route. Used for merging route options on recalculation
 	}
@@ -218,10 +258,12 @@ Track section
 [id] = {
 	name = "Some human-readable name"
 	tc_breaks = { <signal specifier>,... } -- Bounding TC's (signal specifiers)
-	rs_cache = { [<x>] = { [<y>] = { [<encoded pos>] = "state" } } }
+	rs_cache = { [startTcbPosEnc] = { [endTcbPosEnc] = { [componentPosEnc] = "state" } } }
 	-- Saves the turnout states that need to be locked when a route is set from tcb#x to tcb#y
-	-- e.g. 1 = { 2 = { "800080008000" = "st" } }
+	-- e.g. "800080008005" = { "800080007EEA" = { "800080008000" = "st" } }
+	--       start TCB           end TCB             switch pos
 	-- Recalculated on every change via update_rs_cache
+	-- Note that the tcb side number is not saved because it is unnecessary
 	
 	route = {
 		origin = <signal>,  -- route origin
@@ -281,17 +323,24 @@ function ildb.get_all_ts()
 	return track_sections
 end
 
+function tsrepair_notify(notify_pname, ...)
+	if notify_pname then
+		minetest.chat_send_player(notify_pname, advtrains.print_concat_table({"TS Check:",...}))
+	end
+end
+
 -- Checks the consistency of the track section at the given position, attempts to autorepair track sections if they are inconsistent
 -- There are 2 operation modes:
 --		1: pos is NOT a TCB, tcb_connid MUST be nil
 -- 		2: pos is a TCB, tcb_connid MUST be given
 -- @param pos: the position to start from
--- @param tcb_connid: If provided node is a TCB, 
+-- @param tcb_connid: If provided node is a TCB, the direction in which to search
+-- @param notify_pname: the player to notify about reparations
 -- Returns:
 -- ts_id - the track section that was found
 -- nil - No track section exists
-function ildb.check_and_repair_ts_at_pos(pos, tcb_connid)
-	atdebug("check_and_repair_ts_at_pos", pos, tcb_connid)
+function ildb.check_and_repair_ts_at_pos(pos, tcb_connid, notify_pname)
+	--atdebug("check_and_repair_ts_at_pos", pos, tcb_connid)
 	-- check prereqs
 	if ildb.get_tcb(pos) then
 		if not tcb_connid then error("check_and_repair_ts_at_pos: Startpoint is TCB, must provide tcb_connid!") end
@@ -315,15 +364,17 @@ function ildb.check_and_repair_ts_at_pos(pos, tcb_connid)
 			-- these must be the same as the first
 			if ts_id ~= tcbs_ts_id then
 				-- inconsistency is found, repair it
-				atdebug("check_and_repair_ts_at_pos: Inconsistency is found!")
-				return ildb.repair_ts_merge_all(all_tcbs)
+				--atdebug("check_and_repair_ts_at_pos: Inconsistency is found!")
+				tsrepair_notify(notify_pname, "Track section inconsistent here, repairing...")
+				return ildb.repair_ts_merge_all(all_tcbs, false, notify_pname)
 				-- Step2 check is no longer necessary since we just created that new section
 			end
 		end
 	end
 	-- only one found (it is either nil or a ts id)
-	atdebug("check_and_repair_ts_at_pos: TS consistent id=",ts_id,"")
+	--atdebug("check_and_repair_ts_at_pos: TS consistent id=",ts_id,"")
 	if not ts_id then
+		tsrepair_notify(notify_pname, "No track section found here.")
 		return
 		-- All TCBs agreed that there is no section here.
 	end
@@ -338,9 +389,11 @@ function ildb.check_and_repair_ts_at_pos(pos, tcb_connid)
 	-- ildb.tcbs_ensure_ts_ref_exists(sigd) has already make sure that all tcbs are found in the ts's tc_breaks list
 	-- That means it is sufficient to compare the LENGTHS of both lists, if one is longer then it is inconsistent
 	if #ts.tc_breaks ~= #all_tcbs then
-		atdebug("check_and_repair_ts_at_pos: Partition is found!")
-		return ildb.repair_ts_merge_all(all_tcbs)
+		--atdebug("check_and_repair_ts_at_pos: Partition is found!")
+		tsrepair_notify(notify_pname, "Track section partition found, repairing...")
+		return ildb.repair_ts_merge_all(all_tcbs, false, notify_pname)
 	end
+	tsrepair_notify(notify_pname, "Found section", ts.name or ts_id, "here.")
 	return ts_id
 end
 
@@ -367,7 +420,7 @@ end
 -- Returns: a list of sigd's describing the TCBs found (sigd's point inward):
 -- 		{p=<pos>, s=<side>, tcbs=<ref to tcbs table>}
 function ildb.get_all_tcbs_adjacent(inipos, inidir, per_track_callback)
-	atdebug("get_all_tcbs_adjacent: inipos",inipos,"inidir",inidir,"")
+	--atdebug("get_all_tcbs_adjacent: inipos",inipos,"inidir",inidir,"")
 	local found_sigd = {}
 	local ti = advtrains.get_track_iterator(inipos, inidir, TS_MAX_SCAN, true)
 	-- if initial start is TCBS and has xlink, need to add that to the TI
@@ -377,7 +430,7 @@ function ildb.get_all_tcbs_adjacent(inipos, inidir, per_track_callback)
 		ildb.validate_tcb_xlink(inisi, true)
 		if initcbs.xlink then
 			-- adding the tcb will happen when this branch is retrieved again using ti:next_branch()
-			atdebug("get_all_tcbs_adjacent: Putting xlink Branch for initial node",initcbs.xlink)
+			--atdebug("get_all_tcbs_adjacent: Putting xlink Branch for initial node",initcbs.xlink)
 			ti:add_branch(initcbs.xlink.p, initcbs.xlink.s)
 		end
 	end
@@ -400,17 +453,17 @@ function ildb.get_all_tcbs_adjacent(inipos, inidir, per_track_callback)
 					-- A branch cannot be a TCB, as that would imply that it was a turnout/crossing (illegal)
 					-- UNLESS: (a) it is the start point or (b) it was added via xlink
 					-- Then the correct conn to use is connid (pointing forward)
-					atdebug("get_all_tcbs_adjacent: Inserting TCB at branch start",pos, connid)
+					--atdebug("get_all_tcbs_adjacent: Inserting TCB at branch start",pos, connid)
 					using_connid = connid
 				end
 				-- add the sigd of this tcb and a reference to the tcb table in it
-				atdebug("get_all_tcbs_adjacent: Found TCB: ",pos, using_connid, "ts=", tcb[using_connid].ts_id)
+				--atdebug("get_all_tcbs_adjacent: Found TCB: ",pos, using_connid, "ts=", tcb[using_connid].ts_id)
 				local si = {p=pos, s=using_connid, tcbs=tcb[using_connid]}
 				-- if xlink exists, add it now (only if we are not in branch start)
 				ildb.validate_tcb_xlink(si, true)
 				if not is_branch_start and si.tcbs.xlink then
 					-- adding the tcb will happen when this branch is retrieved again using ti:next_branch()
-					atdebug("get_all_tcbs_adjacent: Putting xlink Branch",si.tcbs.xlink)
+					--atdebug("get_all_tcbs_adjacent: Putting xlink Branch",si.tcbs.xlink)
 					ti:add_branch(si.tcbs.xlink.p, si.tcbs.xlink.s)
 				end
 				insert_sigd_if_not_present(found_sigd, si)
@@ -429,8 +482,8 @@ end
 -- Called by frontend functions when multiple tcbs's that logically belong to one section have been determined to have different sections
 -- Parameter is the output of ildb.get_all_tcbs_adjacent(pos)
 -- Returns the ID of the track section that results after the merge
-function ildb.repair_ts_merge_all(all_tcbs, force_create)
-	atdebug("repair_ts_merge_all: Instructed to merge sections of following TCBs:")
+function ildb.repair_ts_merge_all(all_tcbs, force_create, notify_pname)
+	--atdebug("repair_ts_merge_all: Instructed to merge sections of following TCBs:")
 	-- The first loop does the following for each TCBS:
 	-- a) Store the TS ID in the set of TS to update
 	-- b) Set the TS ID to nil, so that the TCBS gets removed from the section
@@ -439,7 +492,7 @@ function ildb.repair_ts_merge_all(all_tcbs, force_create)
 	local any_ts = false
 	for _,sigd in ipairs(all_tcbs) do
 		local ts_id = sigd.tcbs.ts_id
-		atdebug(sigd, "ts=", ts_id)
+		--atdebug(sigd, "ts=", ts_id)
 		if ts_id then
 			local ts = track_sections[ts_id]
 			if ts then
@@ -455,7 +508,7 @@ function ildb.repair_ts_merge_all(all_tcbs, force_create)
 	end
 	if not any_ts and not force_create then
 		-- nothing to do at all, just no interlocking. Why were we even called
-		atdebug("repair_ts_merge_all: No track section present, will not create a new one")
+		--atdebug("repair_ts_merge_all: No track section present, will not create a new one")
 		return nil
 	end
 	-- Purge every TS in turn. TS's that are now empty will be deleted. TS's that still have TCBs will be kept
@@ -464,6 +517,7 @@ function ildb.repair_ts_merge_all(all_tcbs, force_create)
 	end
 	-- Create a new fresh track section with all the TCBs we have in our collection
 	local new_ts_id, new_ts = ildb.create_ts_from_tcb_list(all_tcbs)
+	tsrepair_notify(notify_pname, "Created track section",new_ts_id,"from TCBs:", all_tcbs)
 	return new_ts_id
 end
 
@@ -487,20 +541,20 @@ function ildb.purge_ts_tcb_refs(ts_id)
 				i = i+1
 			else
 				-- this one is to be purged
-				atdebug("purge_ts_tcb_refs(",ts_id,"): purging",sigd,"(backreference = ",tcbs.ts_id,")")
+				--atdebug("purge_ts_tcb_refs(",ts_id,"): purging",sigd,"(backreference = ",tcbs.ts_id,")")
 				table.remove(ts.tc_breaks, i)
 				has_changed = true
 			end
 		else
 			-- if not tcbs: was anyway an orphan, remove it
-			atdebug("purge_ts_tcb_refs(",ts_id,"): purging",sigd,"(referred nonexisting TCB)")
+			--atdebug("purge_ts_tcb_refs(",ts_id,"): purging",sigd,"(referred nonexisting TCB)")
 			table.remove(ts.tc_breaks, i)
 			has_changed = true
 		end
 	end
 	if #ts.tc_breaks == 0 then
 		-- remove the section completely
-		atdebug("purge_ts_tcb_refs(",ts_id,"): after purging, the section is empty, is being deleted")
+		--atdebug("purge_ts_tcb_refs(",ts_id,"): after purging, the section is empty, is being deleted")
 		track_sections[ts_id] = nil
 		return nil
 	else
@@ -520,14 +574,14 @@ function ildb.tcbs_ensure_ts_ref_exists(sigd)
 	if not tcbs or not tcbs.ts_id then return end
 	local ts = ildb.get_ts(tcbs.ts_id)
 	if not ts then
-		atdebug("tcbs_ensure_ts_ref_exists(",sigd,"): TS does not exist, setting to nil")
+		--atdebug("tcbs_ensure_ts_ref_exists(",sigd,"): TS does not exist, setting to nil")
 		-- TS is deleted, clear own ts id
 		tcbs.ts_id = nil
 		return
 	end
 	local did_insert = insert_sigd_if_not_present(ts.tc_breaks, {p=sigd.p, s=sigd.s})
 	if did_insert then
-		atdebug("tcbs_ensure_ts_ref_exists(",sigd,"): TCBS was missing reference in TS",tcbs.ts_id)
+		--atdebug("tcbs_ensure_ts_ref_exists(",sigd,"): TCBS was missing reference in TS",tcbs.ts_id)
 		ildb.update_rs_cache(tcbs.ts_id)
 	end
 end
@@ -538,7 +592,7 @@ function ildb.create_ts_from_tcb_list(sigd_list)
 	while track_sections[id] do
 		id = advtrains.random_id(8)
 	end
-	atdebug("create_ts_from_tcb_list: sigd_list=",sigd_list, "new ID will be ",id)
+	--atdebug("create_ts_from_tcb_list: sigd_list=",sigd_list, "new ID will be ",id)
 
 	local tcbr = {}
 	-- makes a copy of the sigd list, for use in repair mechanisms where sigd may contain a tcbs field which we dont want
@@ -585,23 +639,23 @@ function ildb.get_possible_out_connids(node_name, in_connid)
 	local nt = node_from_to_state_cache[node_name]
 	if not nt[in_connid] then
 		local ta = {}
-		atdebug("Node From/To State Cache: Caching for ",node_name,"connid",in_connid)
+		--atdebug("Node From/To State Cache: Caching for ",node_name,"connid",in_connid)
 		local ndef = minetest.registered_nodes[node_name]
 		if ndef.advtrains.node_state_map then
 			for state, tnode in pairs(ndef.advtrains.node_state_map) do
 				local tndef = minetest.registered_nodes[tnode]
 				-- verify that the conns table is identical - this is purely to catch setup errors!
 				if not tndef.at_conns or not tndef.at_conn_map then
-					atdebug("ndef:",ndef,", tndef:",tndef)
-					error("In AT setup for node "..tnode..": Node set as state "..state.." of "..node_name.." in state_map, but is missing at_conns/at_conn/map!")
+					--atdebug("ndef:",ndef,", tndef:",tndef)
+					error("In AT setup for node "..tnode..": Node set as state "..state.." of "..node_name.." in state_map, but is missing at_conns/at_conn_map!")
 				end
 				if #ndef.at_conns ~= #tndef.at_conns then
-					atdebug("ndef:",ndef,", tndef:",tndef)
+					--atdebug("ndef:",ndef,", tndef:",tndef)
 					error("In AT setup for node "..tnode..": Conns table does not match that of "..node_name.." (of which this is state "..state..")")
 				end
 				for connid=1,#ndef.at_conns do
 					if ndef.at_conns[connid].c ~= tndef.at_conns[connid].c then
-						atdebug("ndef:",ndef,", tndef:",tndef)
+						--atdebug("ndef:",ndef,", tndef:",tndef)
 						error("In AT setup for node "..tnode..": Conns table does not match that of "..node_name.." (of which this is state "..state..")")
 					end
 				end
@@ -610,13 +664,13 @@ function ildb.get_possible_out_connids(node_name, in_connid)
 				if ta[target_connid] then
 					-- Select the variant for which the other way would back-connect. This way, turnouts will switch to the appropriate branch if the train joins
 					local have_back_conn = (tndef.at_conn_map[target_connid])==in_connid
-					atdebug("Found second state mapping",in_connid,"-",target_connid,"have_back_conn=",have_back_conn)
+					--atdebug("Found second state mapping",in_connid,"-",target_connid,"have_back_conn=",have_back_conn)
 					if have_back_conn then
-						atdebug("Overwriting",in_connid,"-",target_connid,"=",state)
+						--atdebug("Overwriting",in_connid,"-",target_connid,"=",state)
 						ta[target_connid] = state
 					end
 				else
-					atdebug("Setting",in_connid,"-",target_connid,"=",state)
+					--atdebug("Setting",in_connid,"-",target_connid,"=",state)
 					ta[target_connid] = state
 				end
 			end
@@ -629,26 +683,27 @@ function ildb.get_possible_out_connids(node_name, in_connid)
 end
 
 local function recursively_find_routes(s_pos, s_connid, locks_found, result_table, scan_limit)
-	atdebug("Recursively restarting at ",s_pos, s_connid, "limit left", scan_limit)
+	--atdebug("Recursively restarting at ",s_pos, s_connid, "limit left", scan_limit)
 	local ti = advtrains.get_track_iterator(s_pos, s_connid, scan_limit, false)
 	local pos, connid, bconnid = ti:next_branch()
 	pos, connid, bconnid = ti:next_track()-- step once to get ahead of previous turnout
+	local last_pos
 	repeat
 		local node = advtrains.ndb.get_node_or_nil(pos)
-		atdebug("Walk ",pos, "nodename", node.name, "entering at conn",bconnid)
+		--atdebug("Walk ",pos, "nodename", node.name, "entering at conn",bconnid)
 		local ndef = minetest.registered_nodes[node.name]
 		if ndef.advtrains and ndef.advtrains.node_state_map then
 			-- Stop, this is a switchable node. Find out which conns we can go at
-			atdebug("Found turnout ",pos, "nodename", node.name, "entering at conn",bconnid)
+			--atdebug("Found turnout ",pos, "nodename", node.name, "entering at conn",bconnid)
 			local pts = advtrains.encode_pos(pos)
 			if locks_found[pts] then
 				-- we've been here before. Stop
-				atdebug("Was already seen! returning")
+				--atdebug("Was already seen! returning")
 				return
 			end
 			local out_conns = ildb.get_possible_out_connids(node.name, bconnid)
 			for oconnid, state in pairs(out_conns) do
-				atdebug("Going in direction",oconnid,"state",state)
+				--atdebug("Going in direction",oconnid,"state",state)
 				locks_found[pts] = state
 				recursively_find_routes(pos, oconnid, locks_found, result_table, ti.limit)
 				locks_found[pts] = nil
@@ -656,21 +711,23 @@ local function recursively_find_routes(s_pos, s_connid, locks_found, result_tabl
 			return
 		end
 		--otherwise, this might be a tcb
-		local tcbs = ildb.get_tcbs({p=pos, s=bconnid})
-		if tcbs then
+		local tcb = ildb.get_tcb(pos)
+		if tcb then
 			-- we found a tcb, store the current locks in the result_table
-			local table_key = advtrains.encode_pos(pos).."_"..bconnid
-			atdebug("Found end TCB", table_key,", returning")
-			if result_table[table_key] then
+			local end_pkey = advtrains.encode_pos(pos)
+			--atdebug("Found end TCB", pos, end_pkey,", returning")
+			if result_table[end_pkey] then
 				atwarn("While caching track section routing, found multiple route paths within same track section. Only first one found will be used")
 			else
-				result_table[table_key] = table.copy(locks_found)
+				result_table[end_pkey] = table.copy(locks_found)
 			end
 			return
 		end
 		-- Go forward
+		last_pos = pos
 		pos, connid, bconnid = ti:next_track()
 	until not pos -- this stops the loop when either the track end is reached or the limit is hit
+	--atdebug("recursively_find_routes: Reached track end or limit at", last_pos, ". This path is not saved, returning")
 end
 
 -- Updates the turnout cache of the given track section
@@ -680,25 +737,33 @@ function ildb.update_rs_cache(ts_id)
 		error("Update TS Cache called with nonexisting ts_id "..(ts_id or "nil"))
 	end
 	local rscache = {}
-	atdebug("== Running update_rs_cache for ",ts_id) 
+	--atdebug("== Running update_rs_cache for ",ts_id) 
 	-- start on every of the TS's TCBs, walk the track forward and store locks along the way
 	for start_tcbi, start_tcbs in ipairs(ts.tc_breaks) do
-		rscache[start_tcbi] = {}
-		atdebug("Starting for ",start_tcbi, start_tcbs)
+		start_pkey = advtrains.encode_pos(start_tcbs.p)
+		rscache[start_pkey] = {}
+		--atdebug("Starting for ",start_tcbi, start_tcbs)
 		local locks_found = {}
 		local result_table = {}
 		recursively_find_routes(start_tcbs.p, start_tcbs.s, locks_found, result_table, TS_MAX_SCAN)
 		-- now result_table contains found route locks. Match them with the other TCBs we have in this section
 		for end_tcbi, end_tcbs in ipairs(ts.tc_breaks) do
-			local table_key = advtrains.encode_pos(end_tcbs.p).."_"..end_tcbs.s
-			if result_table[table_key] then
-				atdebug("Set RSCache entry",start_tcbi.."-"..end_tcbi,"=",result_table[table_key])
-				rscache[start_tcbi][end_tcbi] = result_table[table_key]
+			if end_tcbi ~= start_tcbi then
+				end_pkey = advtrains.encode_pos(end_tcbs.p)
+				if result_table[end_pkey] then
+					--atdebug("Set RSCache entry",end_pkey.."-"..end_pkey,"=",result_table[end_pkey])
+					rscache[start_pkey][end_pkey] = result_table[end_pkey]
+					result_table[end_pkey] = nil
+				end
 			end
 		end
+		-- warn about superfluous entry
+		for sup_end_pkey, sup_entry in pairs(result_table) do
+			--atwarn("In update_rs_cache for section",ts_id,"found superfluous endpoint",sup_end_pkey,"->",sup_entry)
+		end
 	end
 	ts.rs_cache = rscache
-	atdebug("== Done update_rs_cache for ",ts_id, "result:",rscache) 
+	--atdebug("== Done update_rs_cache for ",ts_id, "result:",rscache) 
 end
 
 
@@ -711,21 +776,21 @@ end
 
 -- Create a new TCB at the position and update/repair the adjoining sections
 function ildb.create_tcb_at(pos)
-	atdebug("create_tcb_at",pos)
+	--atdebug("create_tcb_at",pos)
 	local pts = advtrains.encode_pos(pos)
 	track_circuit_breaks[pts] = {[1] = {}, [2] = {}}
 	local all_tcbs_1 = ildb.get_all_tcbs_adjacent(pos, 1)
-	atdebug("TCBs on A side",all_tcbs_1)
+	--atdebug("TCBs on A side",all_tcbs_1)
 	local all_tcbs_2 = ildb.get_all_tcbs_adjacent(pos, 2)
-	atdebug("TCBs on B side",all_tcbs_2)
+	--atdebug("TCBs on B side",all_tcbs_2)
 	-- perform TS repair
-	ildb.repair_ts_merge_all(all_tcbs_1)
-	ildb.repair_ts_merge_all(all_tcbs_2)
+	ildb.repair_ts_merge_all(all_tcbs_1, false)
+	ildb.repair_ts_merge_all(all_tcbs_2, false)
 end
 
--- Create a new TCB at the position and update/repair the now joined section
+-- Remove TCB at the position and update/repair the now joined section
 function ildb.remove_tcb_at(pos)
-	atdebug("remove_tcb_at",pos)
+	--atdebug("remove_tcb_at",pos)
 	local pts = advtrains.encode_pos(pos)
 	local old_tcb = track_circuit_breaks[pts]
 	track_circuit_breaks[pts] = nil
@@ -745,7 +810,7 @@ function ildb.remove_tcb_at(pos)
 	end
 	advtrains.interlocking.remove_tcb_marker(pos)
 	-- If needed, merge the track sections here
-	ildb.check_and_repair_ts_at_pos(pos)
+	ildb.check_and_repair_ts_at_pos(pos, nil)
 	return true
 end
 
@@ -758,7 +823,7 @@ function ildb.validate_tcb_xlink(sigd, suppress_repairs)
 	if not osigd then return end
 	local otcbs = ildb.get_tcbs(tcbs.xlink)
 	if not otcbs then
-		atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd,"orphaned")
+		--atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd,"orphaned")
 		tcbs.xlink = nil
 		if not suppress_repairs then
 			ildb.check_and_repair_ts_at_pos(sigd.p, sigd.s)
@@ -767,16 +832,16 @@ function ildb.validate_tcb_xlink(sigd, suppress_repairs)
 	end
 	if otcbs.xlink then
 		if not vector.equals(otcbs.xlink.p, sigd.p) or otcbs.xlink.s~=sigd.s then
-			atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd,"backreferencing to someone else (namely",otcbs.xlink,") clearing it")
+			--atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd,"backreferencing to someone else (namely",otcbs.xlink,") clearing it")
 			tcbs.xlink = nil
 			if not suppress_repairs then
 				ildb.check_and_repair_ts_at_pos(sigd.p, sigd.s)
-				atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd," was backreferencing to someone else, now updating that")
+				--atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd," was backreferencing to someone else, now updating that")
 				ildb.validate_tcb_xlink(osigd)
 			end
 		end
 	else
-		atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd,"wasn't backreferencing, clearing it")
+		--atdebug("validate_tcb_xlink",sigd,": Link partner ",osigd,"wasn't backreferencing, clearing it")
 		tcbs.xlink = nil
 		if not suppress_repairs then
 			ildb.check_and_repair_ts_at_pos(sigd.p, sigd.s)
@@ -785,19 +850,19 @@ function ildb.validate_tcb_xlink(sigd, suppress_repairs)
 end
 
 function ildb.add_tcb_xlink(sigd1, sigd2)
-	atdebug("add_tcb_xlink",sigd1, sigd2)
+	--("add_tcb_xlink",sigd1, sigd2)
 	local tcbs1 = sigd1.tcbs or ildb.get_tcbs(sigd1)
 	local tcbs2 = sigd2.tcbs or ildb.get_tcbs(sigd2)
 	if vector.equals(sigd1.p, sigd2.p) then
-		atdebug("add_tcb_xlink Cannot xlink with same TCB")
+		--atdebug("add_tcb_xlink Cannot xlink with same TCB")
 		return
 	end
 	if not tcbs1 or not tcbs2 then
-		atdebug("add_tcb_xlink TCBS doesnt exist")
+		--atdebug("add_tcb_xlink TCBS doesnt exist")
 		return
 	end
 	if tcbs1.xlink or tcbs2.xlink then
-		atdebug("add_tcb_xlink One already linked")
+		--atdebug("add_tcb_xlink One already linked")
 		return
 	end
 	-- apply link
@@ -808,7 +873,7 @@ function ildb.add_tcb_xlink(sigd1, sigd2)
 end
 
 function ildb.remove_tcb_xlink(sigd)
-	atdebug("remove_tcb_xlink",sigd)
+	--atdebug("remove_tcb_xlink",sigd)
 	-- Validate first. If Xlink is gone already then, nothing to do
 	ildb.validate_tcb_xlink(sigd)
 	-- Checking all of these already done by validate
@@ -816,7 +881,7 @@ function ildb.remove_tcb_xlink(sigd)
 	local osigd = tcbs.xlink
 	if not osigd then
 		-- validate already cleared us
-		atdebug("remove_tcb_xlink: Already gone by validate")
+		--atdebug("remove_tcb_xlink: Already gone by validate")
 		return
 	end
 	local otcbs = ildb.get_tcbs(tcbs.xlink)
@@ -829,14 +894,14 @@ function ildb.remove_tcb_xlink(sigd)
 end
 
 function ildb.create_ts_from_tcbs(sigd)
-	atdebug("create_ts_from_tcbs",sigd)
+	--atdebug("create_ts_from_tcbs",sigd)
 	local all_tcbs = ildb.get_all_tcbs_adjacent(sigd.p, sigd.s)
 	ildb.repair_ts_merge_all(all_tcbs, true)
 end
 
 -- Remove the given track section, leaving its TCBs with no section assigned
 function ildb.remove_ts(ts_id)
-	atdebug("remove_ts",ts_id)
+	--atdebug("remove_ts",ts_id)
 	local ts = track_sections[ts_id]
 	if not ts then
 		error("remove_ts: "..ts_id.." doesn't exist")
@@ -846,10 +911,10 @@ function ildb.remove_ts(ts_id)
 		local sigd = ts.tc_breaks[i]
 		local tcbs = ildb.get_tcbs(sigd)
 		if tcbs then
-			atdebug("cleared TCB",sigd)
+			--atdebug("cleared TCB",sigd)
 			tcbs.ts_id = nil
 		else
-			atdebug("orphan TCB",sigd)
+			--atdebug("orphan TCB",sigd)
 		end
 		i = i+1
 	end
diff --git a/advtrains_interlocking/route_prog.lua b/advtrains_interlocking/route_prog.lua
index 5fd9363..34807cd 100644
--- a/advtrains_interlocking/route_prog.lua
+++ b/advtrains_interlocking/route_prog.lua
@@ -492,6 +492,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			local terminal = get_last_route_item(rp.origin, rp.route)
 			rp.route.terminal = terminal
 			rp.route.name = fields.name
+			-- new routes now always use the rscache
+			rp.route.use_rscache = true
 			
 			table.insert(tcbs.routes, rp.route)
 			
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index ede3d49..64b8c25 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -49,7 +49,7 @@ function ilrs.set_route(signal, route, try)
 		c_tcbs = ildb.get_tcbs(c_sigd)
 		if not c_tcbs then
 			if not try then atwarn("Did not find TCBS",c_sigd,"while setting route",rtename,"of",signal) end
-			return false, "No TCB found at "..sigd_to_string(c_sigd)..". Please reconfigure route!"
+			return false, "No TCB found at "..sigd_to_string(c_sigd)..". Please update or reconfigure route!"
 		end
 		c_ts_id = c_tcbs.ts_id
 		if not c_ts_id then
@@ -69,28 +69,49 @@ function ilrs.set_route(signal, route, try)
 			return false, "Section '"..c_ts.name.."' is occupied!", c_ts_id, nil
 		end
 		
-		for pts, state in pairs(c_rseg.locks) do
+		-- collect locks from rs cache and from route def
+		local c_locks = {}
+		if route.use_rscache and c_ts.rs_cache and c_rseg.next then
+			-- rscache needs to be enabled, present and next must be defined
+			start_pkey = advtrains.encode_pos(c_sigd.p)
+			end_pkey = advtrains.encode_pos(c_rseg.next.p)
+			if c_ts.rs_cache[start_pkey] and c_ts.rs_cache[start_pkey][end_pkey] then
+				for lp,lst in pairs(c_ts.rs_cache[start_pkey][end_pkey]) do
+					atdebug("Add lock from RSCache:",lp,"->",lst)
+					c_locks[lp] = lst
+				end
+			elseif not try then
+				atwarn("While setting route",rtename,"of",signal,"segment "..i..",required path from",c_tcbs,"to",c_rseg.next,"was not found in the track section's RS cache. Please check!")
+			end
+		end
+		-- add all from locks, these override the rscache
+		for lpts,lst in pairs(c_rseg.locks) do
+			atdebug("Add lock from Routedef:",lp,"->",lst,"overrides",c_locks[lp] or "none")
+			c_locks[lp] = lst
+		end
+		
+		for lp, state in pairs(c_locks) do
 			local confl = ilrs.has_route_lock(pts, state)
 			
-			local pos = minetest.string_to_pos(pts)
+			local pos = advtrains.decode_pos(lp)
 			if advtrains.is_passive(pos) then
 				local cstate = advtrains.getstate(pos)
 				if cstate ~= state then
-					local confl = ilrs.has_route_lock(pts)
+					local confl = ilrs.has_route_lock(lp)
 					if confl then
-						if not try then atwarn("Encountered route lock while a real run of routesetting routine, at position",pts,"while setting route",rtename,"of",signal) end
-						return false, "Lock conflict at "..pts..", Held locked by:\n"..confl, nil, pts
+						if not try then atwarn("Encountered route lock while a real run of routesetting routine, at position",pos,"while setting route",rtename,"of",signal) end
+						return false, "Lock conflict at "..minetest.pos_to_string(pos)..", Held locked by:\n"..confl, nil, lp
 					elseif not try then
 						advtrains.setstate(pos, state)
 					end
 				end
 				if not try then
-					ilrs.add_route_lock(pts, c_ts_id, "Route '"..rtename.."' from signal '"..signalname.."'", signal)
-					c_lckp[#c_lckp+1] = pts
+					ilrs.add_route_lock(lp, c_ts_id, "Route '"..rtename.."' from signal '"..signalname.."'", signal)
+					c_lckp[#c_lckp+1] = lp
 				end
 			else
 				if not try then atwarn("Encountered route lock misconfiguration (no passive component) while a real run of routesetting routine, at position",pts,"while setting route",rtename,"of",signal) end
-				return false, "No passive component at "..pts..". Please reconfigure route!"
+				return false, "No passive component at "..minetest.pos_to_string(pos)..". Please update track section or reconfigure route!"
 			end
 		end
 		-- reserve ts and write locks
@@ -126,6 +147,8 @@ function ilrs.set_route(signal, route, try)
 	return true
 end
 
+-- Change 2024-01-27: pts is not an encoded pos, not a pos-to-string!
+
 -- Checks whether there is a route lock that prohibits setting the component
 -- to the wanted state. returns string with reasons on conflict
 function ilrs.has_route_lock(pts)
@@ -191,7 +214,7 @@ function ilrs.free_route_locks_indiv(pts, ts, nocallbacks)
 	-- TODO use luaautomation timers?
 	if not nocallbacks then
 		minetest.after(0, ilrs.update_waiting, "lck", pts)
-		minetest.after(0.5, advtrains.set_fallback_state, minetest.string_to_pos(pts))
+		minetest.after(0.5, advtrains.set_fallback_state, advtrains.decode_pos(pts))
 	end
 end
 -- frees all route locks, even manual ones set with the tool, at a specific position
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index e365f4f..9e7fcd4 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -99,10 +99,11 @@ minetest.register_node("advtrains_interlocking:tcb_node", {
 	end,
 	after_dig_node = function(pos, oldnode, oldmetadata, player)
 		if not oldmetadata or not oldmetadata.fields then return end
+		local pname = player:get_player_name()
 		local tcbpts = oldmetadata.fields.tcb_pos
 		if tcbpts and tcbpts ~= "" then
 			local tcbpos = minetest.string_to_pos(tcbpts)
-			ildb.remove_tcb_at(tcbpos)
+			ildb.remove_tcb_at(tcbpos, pname)
 		end
 	end,
 })
@@ -160,7 +161,7 @@ minetest.register_on_punchnode(function(pos, node, player, pointed_thing)
 				if ildb.get_tcb(pos) then
 					minetest.chat_send_player(pname, "Configuring TCB: Already existed at this position, it is now linked to this TCB marker")
 				else
-					ildb.create_tcb_at(pos)
+					ildb.create_tcb_at(pos, pname)
 				end
 
 				local meta = minetest.get_meta(tcbnpos)
diff --git a/advtrains_interlocking/tool.lua b/advtrains_interlocking/tool.lua
index ef0f06e..4ebc56c 100644
--- a/advtrains_interlocking/tool.lua
+++ b/advtrains_interlocking/tool.lua
@@ -6,7 +6,7 @@ local ilrs = advtrains.interlocking.route
 local function node_right_click(pos, pname)
 	if advtrains.is_passive(pos) then
 		local form = "size[7,5]label[0.5,0.5;Route lock inspector]"
-		local pts = minetest.pos_to_string(pos)
+		local pts = advtrains.encode_pos(pos)
 		
 		local rtl = ilrs.has_route_lock(pts)
 		
@@ -53,7 +53,7 @@ local function node_left_click(pos, pname)
 		return
 	end
 
-	local ts_id = advtrains.interlocking.db.check_and_repair_ts_at_pos(pos)
+	local ts_id = advtrains.interlocking.db.check_and_repair_ts_at_pos(pos, nil, pname)
 	if ts_id then
 		advtrains.interlocking.db.update_rs_cache(ts_id)
 		advtrains.interlocking.highlight_track_section(pos)
@@ -107,7 +107,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	local pos
 	local pts = string.match(formname, "^at_il_rtool_(.+)$")
 	if pts then
-		pos = minetest.string_to_pos(pts)
+		pos = advtrains.decode_pos(pts)
 	end
 	if pos then
 		if advtrains.is_passive(pos) then
-- 
cgit v1.2.3


From 6fd845baec0f5aa8b7cdee1adf8d05061a643242 Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Thu, 23 May 2024 00:58:24 +0200
Subject: Connect the ropes, start on making the UI work

---
 advtrains/passive.lua                              |   2 +-
 advtrains_interlocking/database.lua                |   2 +-
 advtrains_interlocking/distant.lua                 | 200 -----------
 advtrains_interlocking/init.lua                    |   3 -
 advtrains_interlocking/route_ui.lua                |  18 +-
 advtrains_interlocking/routesetting.lua            |  15 +-
 advtrains_interlocking/signal_api.lua              | 220 +++----------
 advtrains_interlocking/signal_aspect_accessors.lua | 163 ---------
 advtrains_interlocking/signal_aspect_ui.lua        | 366 ++++++++-------------
 advtrains_interlocking/tcb_ts_ui.lua               |  11 +-
 advtrains_signals_japan/init.lua                   |   6 +-
 advtrains_signals_ks/init.lua                      |  23 +-
 12 files changed, 220 insertions(+), 809 deletions(-)
 delete mode 100644 advtrains_interlocking/distant.lua
 delete mode 100644 advtrains_interlocking/signal_aspect_accessors.lua

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains/passive.lua b/advtrains/passive.lua
index 231da82..37b79e4 100644
--- a/advtrains/passive.lua
+++ b/advtrains/passive.lua
@@ -57,7 +57,7 @@ function advtrains.setstate(parpos, newstate, pnode)
 		return false, "train_here"
 	end
 	
-	if advtrains.interlocking and advtrains.interlocking.route.has_route_lock(minetest.encode_pos(pos)) then
+	if advtrains.interlocking and advtrains.interlocking.route.has_route_lock(advtrains.encode_pos(pos)) then
 		return false, "route_lock_here"
 	end
 	
diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua
index 4213c3d..e2df547 100644
--- a/advtrains_interlocking/database.lua
+++ b/advtrains_interlocking/database.lua
@@ -1006,7 +1006,7 @@ end
 function ildb.get_ip_signal_asp(pts, connid)
 	local p = ildb.get_ip_signal(pts, connid)
 	if p then
-		local asp = advtrains.interlocking.signal_get_aspect(p)
+		local asp = advtrains.interlocking.signal.get_aspect(p)
 		if not asp then
 			atlog("Clearing orphaned signal influence point", pts, "/", connid)
 			ildb.clear_ip_signal(pts, connid)
diff --git a/advtrains_interlocking/distant.lua b/advtrains_interlocking/distant.lua
deleted file mode 100644
index 32ada82..0000000
--- a/advtrains_interlocking/distant.lua
+++ /dev/null
@@ -1,200 +0,0 @@
---- Distant signaling.
--- This module implements a database backend for distant signal assignments.
--- The actual modifications to signal aspects are still done by signal aspect accessors.
--- @module advtrains.interlocking.distant
-
-local db_distant = {}
-local db_distant_of = {}
-
-local pts = advtrains.encode_pos
-local stp = advtrains.decode_pos
-
---- Replace the distant signal assignment database.
--- @function load
--- @param db The new database to load.
-local function db_load(x)
-	if type(x) ~= "table" then
-		return
-	end
-	db_distant = x.distant
-	db_distant_of = x.distant_of
-end
-
---- Retrieve the current distant signal assignment database.
--- @function save
--- @return The current database.
-local function db_save()
-	return {
-		distant = db_distant,
-		distant_of = db_distant_of,
-	}
-end
-
-local update_signal, update_main, update_dst
-
---- Unassign a distant signal.
--- @function unassign_dst
--- @param dst The position of the distant signal.
--- @param[opt=false] force Whether to skip callbacks.
-local function unassign_dst(dst, force)
-	local pts_dst = pts(dst)
-	local main = db_distant_of[pts_dst]
-	db_distant_of[pts_dst] = nil
-	if main then
-		local pts_main = main[1]
-		local t = db_distant[pts_main]
-		if t then
-			t[pts_dst] = nil
-		end
-	end
-	if not force then
-		update_dst(dst)
-	end
-end
-
---- Unassign a main signal.
--- @function unassign_main
--- @param main The position of the main signal.
--- @param[opt=false] force Whether to skip callbacks.
-local function unassign_main(main, force)
-	local pts_main = pts(main)
-	local t = db_distant[pts_main]
-	if not t then
-		return
-	end
-	for pts_dst in pairs(t) do
-		local realmain = db_distant_of[pts_dst]
-		if realmain and realmain[1] == pts_main then
-			db_distant_of[pts_dst] = nil
-			if not force then
-				local dst = stp(pts_dst)
-				update_dst(dst)
-			end
-		end
-	end
-	db_distant[pts_main] = nil
-end
-
---- Remove all (main and distant) signal assignments from a signal.
--- @function unassign_all
--- @param pos The position of the signal.
--- @param[opt=false] force Whether to skip callbacks.
-local function unassign_all(pos, force)
-	unassign_main(pos)
-	unassign_dst(pos, force)
-end
-
---- Check whether a signal is "appropriate" for the distant signal system.
--- Currently, a signal is considered appropriate if its signal aspect can be set.
--- @function appropriate_signal
--- @param pos The position of the signal
-local function appropriate_signal(pos)
-	local node = advtrains.ndb.get_node(pos)
-	local ndef = minetest.registered_nodes[node.name] or {}
-	if not ndef then
-		return false
-	end
-	local atdef = ndef.advtrains
-	if not atdef then
-		return false
-	end
-	return atdef.supported_aspects and atdef.set_aspect and true
-end
-
---- Assign a distant signal to a main signal.
--- @function assign
--- @param main The position of the main signal.
--- @param dst The position of the distant signal.
--- @param[opt="manual"] by The method of assignment.
--- @param[opt=false] skip_update Whether to skip callbacks.
-local function assign(main, dst, by, skip_update)
-	if not (appropriate_signal(main) and appropriate_signal(dst)) then
-		return
-	end
-	local pts_main = pts(main)
-	local pts_dst = pts(dst)
-	local t = db_distant[pts_main]
-	if not t then
-		t = {}
-		db_distant[pts_main] = t
-	end
-	if not by then
-		by = "manual"
-	end
-	unassign_dst(dst, true)
-	t[pts_dst] = by
-	db_distant_of[pts_dst] = {pts_main, by}
-	if not skip_update then
-		update_dst(dst)
-	end
-end
-
---- Get the distant signals assigned to a main signal.
--- @function get_distant
--- @param main The position of the main signal.
--- @treturn {[pos]=by,...} A table of distant signals, with the positions encoded using `advtrains.encode_pos`.
-local function get_distant(main)
-	local pts_main = pts(main)
-	return db_distant[pts_main] or {}
-end
-
---- Get the main signal assigned the a distant signal.
--- @function get_main
--- @param dst The position of the distant signal.
--- @return The position of the main signal.
--- @return The method of assignment.
-local function get_main(dst)
-	local pts_dst = pts(dst)
-	local main = db_distant_of[pts_dst]
-	if not main then
-		return
-	end
-	if main[1] then
-		return stp(main[1]), unpack(main, 2)
-	else
-		return unpack(main)
-	end
-end
-
---- Update all distant signals assigned to a main signal.
--- @function update_main
--- @param main The position of the main signal.
-update_main = function(main)
-	local pts_main = pts(main)
-	local t = get_distant(main)
-	for pts_dst in pairs(t) do
-		local dst = stp(pts_dst)
-		advtrains.interlocking.signal_readjust_aspect(dst)
-	end
-end
-
---- Update the aspect of a distant signal.
--- @function update_dst
--- @param dst The position of the distant signal.
-update_dst = function(dst)
-	advtrains.interlocking.signal_readjust_aspect(dst)
-end
-
---- Update the aspect of a combined (main and distant) signal and all distant signals assigned to it.
--- @function update_signal
--- @param pos The position of the signal.
-update_signal = function(pos)
-	update_main(pos)
-	update_dst(pos)
-end
-
-advtrains.distant = {
-	load = db_load,
-	save = db_save,
-	assign = assign,
-	unassign_dst = unassign_dst,
-	unassign_main = unassign_main,
-	unassign_all = unassign_all,
-	get_distant = get_distant,
-	get_dst = get_distant,
-	get_main = get_main,
-	update_main = update_main,
-	update_dst = update_dst,
-	update_signal = update_signal,
-	appropriate_signal = appropriate_signal,
-}
diff --git a/advtrains_interlocking/init.lua b/advtrains_interlocking/init.lua
index dd08b4a..c397aa6 100644
--- a/advtrains_interlocking/init.lua
+++ b/advtrains_interlocking/init.lua
@@ -15,9 +15,6 @@ local modpath = minetest.get_modpath(minetest.get_current_modname()) .. DIR_DELI
 --advtrains.interlocking.aspect = dofile(modpath.."aspect.lua")
 
 dofile(modpath.."database.lua")
-dofile(modpath.."distant.lua")
-dofile(modpath.."distant_ui.lua")
-dofile(modpath.."signal_aspect_accessors.lua")
 dofile(modpath.."signal_api.lua")
 dofile(modpath.."signal_aspect_ui.lua")
 dofile(modpath.."demosignals.lua")
diff --git a/advtrains_interlocking/route_ui.lua b/advtrains_interlocking/route_ui.lua
index a1a331d..982c579 100644
--- a/advtrains_interlocking/route_ui.lua
+++ b/advtrains_interlocking/route_ui.lua
@@ -33,7 +33,7 @@ function atil.show_route_edit_form(pname, sigd, routeid)
 	local function itab(t)
 		tab[#tab+1] = minetest.formspec_escape(string.gsub(t, ",", " "))
 	end
-	itab("TCB "..sigd_to_string(sigd).." ("..(tcbs.signal_name or "")..") Route #"..routeid)
+	itab("("..(tcbs.signal_name or "+")..") Route #"..routeid)
 	
 	-- this code is partially copy-pasted from routesetting.lua
 	-- we start at the tc designated by signal
@@ -56,13 +56,14 @@ function atil.show_route_edit_form(pname, sigd, routeid)
 		c_rseg = route[i]
 		c_lckp = {}
 		
-		itab(""..i.." Entry "..sigd_to_string(c_sigd).." -> Sec. "..(c_ts and c_ts.name or "-").." -> Exit "..(c_rseg.next and sigd_to_string(c_rseg.next) or "END"))
+		itab(""..i.." "..sigd_to_string(c_sigd))
+		itab("= "..(c_ts and c_ts.name or "-").." =")
 		
 		if c_rseg.locks then
 			for pts, state in pairs(c_rseg.locks) do
 				
 				local pos = minetest.string_to_pos(pts)
-				itab("  Lock: "..pts.." -> "..state)
+				itab("L "..pts.." -> "..state)
 				if not advtrains.is_passive(pos) then
 					itab("-!- No passive component at "..pts..". Please reconfigure route!")
 					break
@@ -75,16 +76,17 @@ function atil.show_route_edit_form(pname, sigd, routeid)
 	end
 	if c_sigd then
 		local e_tcbs = ildb.get_tcbs(c_sigd)
-		itab("Route end: "..sigd_to_string(c_sigd).." ("..(e_tcbs and e_tcbs.signal_name or "-")..")")
+		local signame = "-"
+		if e_tcbs and e_tcbs.signal then signame = e_tcbs.signal_name or "+" end
+		itab("E "..sigd_to_string(c_sigd).." ("..signame..")")
 	else
-		itab("Route ends on dead-end")
+		itab("E (none)")
 	end
 	
-	form = form.."textlist[0.5,2;7.75,3.9;rtelog;"..table.concat(tab, ",").."]"
+	form = form.."textlist[0.5,2;3,3.9;rtelog;"..table.concat(tab, ",").."]"
 	
 	form = form.."button[0.5,6;3,1;back;<<< Back to signal]"
-	form = form.."button[4.5,6;2,1;aspect;Signal Aspect]"
-	form = form.."button[6.5,6;2,1;delete;Delete Route]"
+	form = form.."button[5.5,6;3,1;delete;Delete Route]"
 	
 	--atdebug(route.ars)
 	form = form.."style[ars;font=mono]"
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 24b3199..a576139 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -138,7 +138,7 @@ function ilrs.set_route(signal, route, try)
 			}
 			if c_tcbs.signal then
 				c_tcbs.route_committed = true
-				c_tcbs.aspect = route.aspect or advtrains.interlocking.FULL_FREE
+				c_tcbs.aspect = advtrains.interlocking.signal.MASP_FREE
 				c_tcbs.route_origin = signal
 				signals[#signals+1] = c_tcbs
 			end
@@ -166,7 +166,7 @@ function ilrs.set_route(signal, route, try)
 			if (not nodst) and (not assigned_by or assigned_by == "routesetting") then
 				advtrains.distant.assign(lastsig, pos, "routesetting", true)
 			end
-			advtrains.interlocking.update_signal_aspect(tcbs, i ~= 1)
+			advtrains.interlocking.signal.update_route_aspect(tcbs, i ~= 1)
 		end
 	end
 	
@@ -278,14 +278,7 @@ function ilrs.cancel_route_from(sigd)
 		c_tcbs.route_auto = nil
 		c_tcbs.route_origin = nil
 		
-		if c_tcbs.signal then
-			local pos = c_tcbs.signal
-			local _, assigned_by = advtrains.distant.get_main(pos)
-			if assigned_by == "routesetting" then
-				advtrains.distant.unassign_dst(pos, true)
-			end
-		end
-		advtrains.interlocking.update_signal_aspect(c_tcbs)
+		advtrains.interlocking.signal.update_route_aspect(c_tcbs)
 		
 		c_ts_id = c_tcbs.ts_id
 		if not c_tcbs then
@@ -370,7 +363,7 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel)
 	end
 	if has_changed_aspect then
 		-- FIX: prevent an minetest.after() loop caused by update_signal_aspect dispatching path invalidation, which in turn calls ARS again
-		advtrains.interlocking.update_signal_aspect(tcbs)
+		advtrains.interlocking.signal.update_route_aspect(tcbs)
 	end
 	advtrains.interlocking.update_player_forms(sigd)
 end
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index d27a045..5216594 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -5,9 +5,15 @@ local F = advtrains.formspec
 local signal = {}
 
 signal.MASP_HALT = {
-	name = "halt",
-	description = "HALT",
-	halt = true,
+	name = nil,
+	speed = nil,
+	remote = nil,
+}
+
+signal.MASP_FREE = {
+	name = "_free",
+	speed = -1,
+	remote = nil,
 }
 
 signal.ASPI_HALT = {
@@ -50,11 +56,12 @@ Note that once apply_aspect returns, there is no need for advtrains anymore to q
 When the signal, for any reason, wants to change its aspect by itself *without* going through the signal API then
 it should update the aspect info cache by calling advtrains.interlocking.signal.update_aspect_info(pos)
 
-Note that the apply_aspect function MUST accept the following main aspect, even if it is not defined in the main_aspects table:
-{ name = "halt", halt = true }
-It should cause the signal to show its most restrictive aspect. Typically it is a halt aspect, but e.g. for distant-only
+Apply_aspect may also receive nil as the main aspect. It usually means that the signal is not assigned to anything particular,
+and it should cause the signal to show its most restrictive aspect. Typically it is a halt aspect, but e.g. for distant-only
 signals this would be "expect stop".
 
+Main aspect names starting with underscore (e.g. "_default") are reserved and must not be used!
+
 == Aspect Info ==
 The actual signal aspect in the already-known format. This is what the trains use to determine halt/proceed and speed.
 asp = {
@@ -152,7 +159,7 @@ end
 -- - Storing the main aspect and dst pos for this signal permanently (until next change)
 -- - Assigning the distant signal for this signal
 -- - Calling apply_aspect() in the signal's node definition to make the signal show the aspect
--- - Calling apply_aspect() again whenever the distant signal changes its aspect
+-- - Calling apply_aspect() again whenever the remote signal changes its aspect
 -- - Notifying this signal's distant signals about changes to this signal (unless skip_dst_notify is specified)
 function signal.set_aspect(pos, main_asp_name, main_asp_speed, rem_pos, skip_dst_notify)
 	local main_pts = advtrains.encode_pos(pos)
@@ -252,10 +259,7 @@ function signal.get_aspect(pos)
 end
 
 local function cache_mainaspects(ndefat)
-	ndefat.main_aspects_lookup = {
-		-- always define halt aspect
-		halt = signal.MASP_HALT
-	}
+	ndefat.main_aspects_lookup = {}
 	for _,ma in ipairs(ndefat.main_aspects) do
 		ndefat.main_aspects_lookup[ma.name] = ma
 	end
@@ -264,7 +268,7 @@ end
 function signal.get_aspect_internal(pos, aspt)
 	if not aspt then
 		-- oh, no main aspect, nevermind
-		return nil, aspt.remote, nil
+		return nil, nil, nil
 	end
 	atdebug("get_aspect_internal",pos,aspt)
 	-- look aspect in nodedef
@@ -277,6 +281,10 @@ function signal.get_aspect_internal(pos, aspt)
 			cache_mainaspects(ndefat)
 		end
 		local masp = ndefat.main_aspects_lookup[aspt.name]
+		-- special handling for the default free aspect ("_free")
+		if aspt.name == "_free" then
+			masp = ndefat.main_aspects[1]
+		end
 		if not masp then
 			atwarn(pos,"invalid main aspect",aspt.name,"valid are",ndefat.main_aspects_lookup)
 			return nil, aspt.remote, node, ndef
@@ -355,10 +363,30 @@ end
 function signal.update_route_aspect(tcbs, skip_dst_notify)
 	if tcbs.signal then
 		local asp = tcbs.aspect or signal.MASP_HALT
-		signal.set_aspect(tcbs.signal, asp, skip_dst_notify)
+		signal.set_aspect(tcbs.signal, asp.name, asp.speed, asp.remote, skip_dst_notify)
 	end
 end
 
+-- Returns how capable the signal is with regards to aspect setting
+-- 0: not a signal at all
+-- 1: signal has get_aspect_info() but the aspect is not variable (e.g. a sign)
+-- 2: signal has apply_aspect() but does not have main aspects (e.g. a pure distant signal)
+-- 3: Full capabilities, signal has main aspects and can be used as main/shunt signal (can be start/endpoint of a route)
+function signal.get_signal_cap_level(pos)
+	local node = advtrains.ndb.get_node_or_nil(pos)
+	local ndef = node and minetest.registered_nodes[node.name]
+	local ndefat = ndef and ndef.advtrains
+	if ndefat and ndefat.get_aspect_info then
+		if ndefat.apply_aspect  then
+			if ndefat.main_aspects then
+				return 3
+			end
+			return 2
+		end
+		return 1
+	end
+	return 0
+end
 
 ----------------
 
@@ -366,7 +394,7 @@ function signal.can_dig(pos)
 	return not advtrains.interlocking.db.get_sigd_for_signal(pos)
 end
 
-function advtrains.interlocking.signal_after_dig(pos)
+function signal.after_dig(pos)
 	-- TODO clear influence point
 	advtrains.interlocking.signal.clear_aspect(pos)
 end
@@ -374,169 +402,7 @@ end
 function signal.on_rightclick(pos, node, player, itemstack, pointed_thing)
 	local pname = player:get_player_name()
 	local control = player:get_player_control()
-	if control.aux1 then
-		advtrains.interlocking.show_ip_form(pos, pname)
-		return
-	end
-	advtrains.interlocking.show_signal_form(pos, node, pname)
-end
-
-function advtrains.interlocking.show_signal_form(pos, node, pname)
-	local sigd = advtrains.interlocking.db.get_sigd_for_signal(pos)
-	if sigd then
-		advtrains.interlocking.show_signalling_form(sigd, pname)
-	else
-		local ndef = minetest.registered_nodes[node.name]
-		if ndef.advtrains and ndef.advtrains.set_aspect then
-			-- permit to set aspect manually
-			local function callback(pname, aspect)
-				signal.set_aspect(pos, aspect)
-			end
-			local isasp = advtrains.interlocking.signal_get_aspect(pos, node)
-
-			advtrains.interlocking.show_signal_aspect_selector(
-				pname,
-				ndef.advtrains.supported_aspects,
-				pos, callback,
-				isasp)
-		else
-			--static signal - only IP
-			advtrains.interlocking.show_ip_form(pos, pname)
-		end
-	end
-end
-
-local players_assign_ip = {}
-
-local function ipmarker(ipos, connid)
-	local node_ok, conns, rhe = advtrains.get_rail_info_at(ipos, advtrains.all_tracktypes)
-	if not node_ok then return end
-	local yaw = advtrains.dir_to_angle(conns[connid].c)
-
-	-- using tcbmarker here
-	local obj = minetest.add_entity(vector.add(ipos, {x=0, y=0.2, z=0}), "advtrains_interlocking:tcbmarker")
-	if not obj then return end
-	obj:set_yaw(yaw)
-	obj:set_properties({
-		textures = { "at_il_signal_ip.png" },
-	})
-end
-
-function advtrains.interlocking.make_ip_formspec_component(pos, x, y, w)
-	advtrains.interlocking.db.check_for_duplicate_ip(pos)
-	local pts, connid = advtrains.interlocking.db.get_ip_by_signalpos(pos)
-	if pts then
-		return table.concat {
-			F.S_label(x, y, "Influence point is set at @1.", string.format("%s/%s", pts, connid)),
-			F.S_button_exit(x, y+0.5, w/2-0.125, "ip_set", "Modify"),
-			F.S_button_exit(x+w/2+0.125, y+0.5, w/2-0.125, "ip_clear", "Clear"),
-		}, pts, connid
-	else
-		return table.concat {
-			F.S_label(x, y, "Influence point is not set."),
-			F.S_button_exit(x, y+0.5, w, "ip_set", "Set influence point"),
-		}
-	end
-end
-
--- shows small info form for signal properties
--- This function is named show_ip_form because it was originally only intended
--- for assigning/changing the influence point.
--- only_notset: show only if it is not set yet (used by signal tcb assignment)
-function advtrains.interlocking.show_ip_form(pos, pname, only_notset)
-	if not minetest.check_player_privs(pname, "interlocking") then
-		return
-	end
-	local ipform, pts, connid = advtrains.interlocking.make_ip_formspec_component(pos, 0.5, 0.5, 7)
-	local form = {
-		"formspec_version[4]",
-		"size[8,2.25]",
-		ipform,
-	}
-	if pts then
-		local ipos = minetest.string_to_pos(pts)
-		ipmarker(ipos, connid)
-	end
-	if advtrains.distant.appropriate_signal(pos) then
-		form[#form+1] = advtrains.interlocking.make_dst_formspec_component(pos, 0.5, 2, 7, 4.25)
-		form[2] = "size[8,6.75]"
-	end
-	form = table.concat(form)
-	if not only_notset or not pts then
-		minetest.show_formspec(pname, "at_il_propassign_"..minetest.pos_to_string(pos), form)
-	end
+	advtrains.interlocking.show_signal_form(pos, node, pname, control.aux1)
 end
 
-function advtrains.interlocking.handle_ip_formspec_fields(pname, pos, fields)
-	if not (pos and minetest.check_player_privs(pname, {train_operator=true, interlocking=true})) then
-		return
-	end
-	if fields.ip_set then
-		advtrains.interlocking.signal_init_ip_assign(pos, pname)
-	elseif fields.ip_clear then
-		advtrains.interlocking.db.clear_ip_by_signalpos(pos)
-	end
-end
-
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-	local pname = player:get_player_name()
-	local pts = string.match(formname, "^at_il_propassign_([^_]+)$")
-	local pos
-	if pts then
-		pos = minetest.string_to_pos(pts)
-	end
-	if pos then
-		advtrains.interlocking.handle_ip_formspec_fields(pname, pos, fields)
-		advtrains.interlocking.handle_dst_formspec_fields(pname, pos, fields)
-	end
-end)
-
--- inits the signal IP assignment process
-function signal.init_ip_assign(pos, pname)
-	if not minetest.check_player_privs(pname, "interlocking") then
-		minetest.chat_send_player(pname, "Insufficient privileges to use this!")
-		return
-	end
-	--remove old IP
-	--advtrains.interlocking.db.clear_ip_by_signalpos(pos)
-	minetest.chat_send_player(pname, "Configuring Signal: Please look in train's driving direction and punch rail to set influence point.")
-	
-	players_assign_ip[pname] = pos
-end
-
-minetest.register_on_punchnode(function(pos, node, player, pointed_thing)
-	local pname = player:get_player_name()
-	if not minetest.check_player_privs(pname, "interlocking") then
-		return
-	end
-	-- IP assignment
-	local signalpos = players_assign_ip[pname]
-	if signalpos then
-		if vector.distance(pos, signalpos)<=50 then
-			local node_ok, conns, rhe = advtrains.get_rail_info_at(pos, advtrains.all_tracktypes)
-			if node_ok and #conns == 2 then
-				
-				local yaw = player:get_look_horizontal()
-				local plconnid = advtrains.yawToClosestConn(yaw, conns)
-				
-				-- add assignment if not already present.
-				local pts = advtrains.roundfloorpts(pos)
-				if not advtrains.interlocking.db.get_ip_signal_asp(pts, plconnid) then
-					advtrains.interlocking.db.set_ip_signal(pts, plconnid, signalpos)
-					ipmarker(pos, plconnid)
-					minetest.chat_send_player(pname, "Configuring Signal: Successfully set influence point")
-				else
-					minetest.chat_send_player(pname, "Configuring Signal: Influence point of another signal is already present!")
-				end
-			else
-				minetest.chat_send_player(pname, "Configuring Signal: This is not a normal two-connection rail! Aborted.")
-			end
-		else
-			minetest.chat_send_player(pname, "Configuring Signal: Node is too far away. Aborted.")
-		end
-		players_assign_ip[pname] = nil
-	end
-end)
-
-
 advtrains.interlocking.signal = signal
diff --git a/advtrains_interlocking/signal_aspect_accessors.lua b/advtrains_interlocking/signal_aspect_accessors.lua
deleted file mode 100644
index d91df31..0000000
--- a/advtrains_interlocking/signal_aspect_accessors.lua
+++ /dev/null
@@ -1,163 +0,0 @@
---- Signal aspect accessors
--- @module advtrains.interlocking
-
-local A = advtrains.interlocking.aspect
-local D = advtrains.distant
-local I = advtrains.interlocking
-local N = advtrains.ndb
-local pts = advtrains.roundfloorpts
-
-local get_aspect
-
-local supposed_aspects = {}
-
---- Replace the signal aspect cache.
--- @function load_supposed_aspects
--- @param db The new database.
-function I.load_supposed_aspects(tbl)
-	if tbl then
-		supposed_aspects = {}
-		for k, v in pairs(tbl) do
-			supposed_aspects[k] = A(v)
-		end
-	end
-end
-
---- Retrieve the signal aspect cache.
--- @function save_supposed_aspects
--- @return The current database in use.
-function I.save_supposed_aspects()
-	local t = {}
-	for k, v in pairs(supposed_aspects) do
-		t[k] = v:plain(true)
-	end
-	return t
-end
-
---- Read the aspect of a signal strictly from cache.
--- @param pos The position of the signal.
--- @return[1] The aspect of the signal (if present in cache).
--- @return[2] The nil constant (otherwise).
-local function get_supposed_aspect(pos)
-	return supposed_aspects[pts(pos)]
-end
-
---- Update the signal aspect information in cache.
--- @param pos The position of the signal.
--- @param asp The new signal aspect
-local function set_supposed_aspect(pos, asp)
-	supposed_aspects[pts(pos)] = asp
-end
-
---- Get the definition of a node.
--- @param pos The position of the node.
--- @return[1] The definition of the node (if present).
--- @return[2] An empty table (otherwise).
-local function get_ndef(pos)
-	local node = N.get_node(pos)
-	return (minetest.registered_nodes[node.name] or {}), node
-end
-
---- Get the aspects supported by a signal.
--- @function signal_get_supported_aspects
--- @param pos The position of the signal.
--- @return[1] The table of supported aspects (if present).
--- @return[2] The nil constant (otherwise).
-local function get_supported_aspects(pos)
-	local ndef = get_ndef(pos)
-	if ndef.advtrains and ndef.advtrains.supported_aspects then
-		return ndef.advtrains.supported_aspects
-	end
-	return nil
-end
-
---- Adjust a new signal aspect to fit a signal.
--- @param pos The position of the signal.
--- @param asp The new signal aspect.
--- @return The adjusted signal aspect.
--- @return The information to pass to the `advtrains.set_aspect` field in the node definitions.
-local function adjust_aspect(pos, asp)
-	local asp = A(asp)
-
-	local mainpos = D.get_main(pos)
-	local nxtasp
-	if mainpos then
-		nxtasp = get_aspect(mainpos)
-	end
-	local suppasp = get_supported_aspects(pos)
-	if not suppasp then
-		return asp
-	end
-	return asp:adjust_distant(nxtasp, suppasp.dst_shift):to_group(suppasp.group)
-end
-
---- Get the aspect of a signal without accessing the cache.
--- For most cases, `get_aspect` should be used instead.
--- @function signal_get_real_aspect
--- @param pos The position of the signal.
--- @return[1] The signal aspect adjusted using `adjust_aspect` (if present).
--- @return[2] The nil constant (otherwise).
-local function get_real_aspect(pos)
-	local ndef, node = get_ndef(pos)
-	if ndef.advtrains and ndef.advtrains.get_aspect then
-		local asp = ndef.advtrains.get_aspect(pos, node) or I.DANGER
-		return adjust_aspect(pos, asp)
-	end
-	return nil
-end
-
---- Get the aspect of a signal.
--- @function signal_get_aspect
--- @param pos The position of the signal.
--- @return[1] The aspect of the signal (if present).
--- @return[2] The nil constant (otherwise).
-get_aspect = function(pos)
-	local asp = get_supposed_aspect(pos)
-	if not asp then
-		asp = get_real_aspect(pos)
-		set_supposed_aspect(pos, asp)
-	end
-	return asp
-end
-
---- Set the aspect of a signal.
--- @function signal_set_aspect
--- @param pos The position of the signal.
--- @param asp The new signal aspect.
--- @param[opt=false] skipdst Whether to skip updating distant signals.
-local function set_aspect(pos, asp, skipdst)
-	local node = N.get_node(pos)
-	local ndef = minetest.registered_nodes[node.name]
-	if ndef and ndef.advtrains and ndef.advtrains.set_aspect then
-		local oldasp = I.signal_get_aspect(pos) or DANGER
-		local newasp = adjust_aspect(pos, asp)
-		set_supposed_aspect(pos, newasp)
-		ndef.advtrains.set_aspect(pos, node, newasp)
-		I.signal_on_aspect_changed(pos)
-		local aspect_changed = oldasp ~= newasp
-		if (not skipdst) and aspect_changed then
-			D.update_main(pos)
-		end
-	end
-end
-
---- Remove a signal from cache.
--- @function signal_clear_aspect
--- @param pos The position of the signal.
-local function clear_aspect(pos)
-	set_supposed_aspect(pos, nil)
-end
-
---- Readjust the aspect of a signal.
--- @function signal_readjust_aspect
--- @param pos The position of the signal.
-local function readjust_aspect(pos)
-	set_aspect(pos, get_aspect(pos))
-end
-
-I.signal_get_supported_aspects = get_supported_aspects
-I.signal_get_real_aspect = get_real_aspect
-I.signal_get_aspect = get_aspect
-I.signal_set_aspect = set_aspect
-I.signal_clear_aspect = clear_aspect
-I.signal_readjust_aspect = readjust_aspect
diff --git a/advtrains_interlocking/signal_aspect_ui.lua b/advtrains_interlocking/signal_aspect_ui.lua
index a81b7fe..e5d2003 100644
--- a/advtrains_interlocking/signal_aspect_ui.lua
+++ b/advtrains_interlocking/signal_aspect_ui.lua
@@ -1,262 +1,188 @@
 local F = advtrains.formspec
-local players_aspsel = {}
 
-local function describe_main_aspect(spv)
-	if spv == 0 then
-		return attrans("Danger (halt)")
-	elseif spv == -1 then
-		return attrans("Continue at maximum speed")
-	elseif not spv then
-		return attrans("Continue with current speed limit")
+function advtrains.interlocking.show_signal_form(pos, node, pname, aux_key)
+	local sigd = advtrains.interlocking.db.get_sigd_for_signal(pos)
+	if sigd and not aux_key then
+		advtrains.interlocking.show_signalling_form(sigd, pname)
 	else
-		return attrans("Continue with the speed limit of @1", tostring(spv))
-	end
-end
-
-local function describe_shunt_aspect(shunt)
-	if shunt then
-		return attrans("Shunting allowed")
-	else
-		return attrans("No shunting")
+		if advtrains.interlocking.signal.get_signal_cap_level(pos) >= 2 then
+			advtrains.interlocking.show_ip_sa_form(pos, pname)
+		else
+			advtrains.interlocking.show_ip_form(pos, pname)
+		end
 	end
 end
 
-local function describe_distant_aspect(spv)
-	if spv == 0 then
-		return attrans("Expect to stop at the next signal")
-	elseif spv == -1 then
-		return attrans("Expect to continue at maximum speed")
-	elseif not spv then
-		return attrans("No distant signal information")
-	else
-		return attrans("Expect to continue with a speed limit of @1", tostring(spv))
-	end
+local players_assign_ip = {}
+local players_assign_distant = {}
+
+local function ipmarker(ipos, connid)
+	local node_ok, conns, rhe = advtrains.get_rail_info_at(ipos, advtrains.all_tracktypes)
+	if not node_ok then return end
+	local yaw = advtrains.dir_to_angle(conns[connid].c)
+
+	-- using tcbmarker here
+	local obj = minetest.add_entity(vector.add(ipos, {x=0, y=0.2, z=0}), "advtrains_interlocking:tcbmarker")
+	if not obj then return end
+	obj:set_yaw(yaw)
+	obj:set_properties({
+		textures = { "at_il_signal_ip.png" },
+	})
 end
 
-advtrains.interlocking.describe_main_aspect = describe_main_aspect
-advtrains.interlocking.describe_shunt_aspect = describe_shunt_aspect
-advtrains.interlocking.describe_distant_aspect = describe_distant_aspect
-
-local function dsel(p, q, x, y)
-	if p == nil then
-		if q then
-			return x
-		else
-			return y
-		end
-	elseif p then
-		return x
+function advtrains.interlocking.make_ip_formspec_component(pos, x, y, w)
+	advtrains.interlocking.db.check_for_duplicate_ip(pos)
+	local pts, connid = advtrains.interlocking.db.get_ip_by_signalpos(pos)
+	if pts then
+		-- display marker
+		local ipos = minetest.string_to_pos(pts)
+		ipmarker(ipos, connid)
+		return table.concat {
+			F.S_label(x, y, "Influence point is set at @1.", string.format("%s/%s", pts, connid)),
+			F.S_button_exit(x, y+0.5, w/2-0.125, "ip_set", "Modify"),
+			F.S_button_exit(x+w/2+0.125, y+0.5, w/2-0.125, "ip_clear", "Clear"),
+		}
 	else
-		return y
+		return table.concat {
+			F.S_label(x, y, "Influence point is not set."),
+			F.S_button_exit(x, y+0.5, w, "ip_set", "Set influence point"),
+		}
 	end
 end
 
-local function describe_supported_aspects(suppasp, isasp)
-	local t = {}
-
-	local entries = {attrans("Use default value")}
-	local selid = 0
-	local mainasps = suppasp.main
-	if type(mainasps) ~= "table" then
-		mainasps = {mainasps}
-	end
-	for idx, spv in ipairs(mainasps) do
-		if isasp and spv == rawget(isasp, "main") then
-			selid = idx
-		end
-		entries[idx+1] = describe_main_aspect(spv)
-	end
-	t.main = entries
-	t.main_current = selid+1
-	t.main_string = tostring(isasp.main)
-	if t.main == nil then
-		t.main_string = ""
+-- shows small formspec to set the signal influence point
+-- only_notset: show only if it is not set yet (used by signal tcb assignment)
+function advtrains.interlocking.show_ip_form(pos, pname, only_notset)
+	if not minetest.check_player_privs(pname, "interlocking") then
+		return
 	end
-
-	t.shunt = {
-		attrans("No shunting"),
-		attrans("Shunting allowed"),
-		attrans("Proceed as main"),
+	local ipform = advtrains.interlocking.make_ip_formspec_component(pos, 0.5, 0.5, 7)
+	local form = {
+		"formspec_version[4]",
+		"size[8,2.25]",
+		ipform,
 	}
-
-	t.shunt_current = dsel(suppasp.shunt, isasp.shunt, 2, 1)
-	if dsel(suppasp.proceed_as_main, isasp.proceed_as_main, t.shunt_current == 1) then
-		t.shunt_current = 3
-	end
-	t.shunt_const = suppasp.shunt ~= nil
-
-	if suppasp.group then
-		local gdef = advtrains.interlocking.aspect.get_group_definition(suppasp.group)
-		if gdef then
-			t.group = suppasp.group
-			t.groupdef = gdef
-			local entries = {}
-			local selid = 1
-			for idx, name in ipairs(suppasp.name or {}) do
-				entries[idx] = gdef.aspects[name].label
-				if suppasp.group == isasp.group and name == isasp.name then
-					selid = idx
-				end
-			end
-			t.name = entries
-			t.name_current = selid
-		end
+	if not only_notset or not pts then
+		minetest.show_formspec(pname, "at_il_ipsaform_"..minetest.pos_to_string(pos), table.concat(form))
 	end
-
-	return t
 end
 
-advtrains.interlocking.describe_supported_aspects = describe_supported_aspects
-
-local function make_signal_aspect_selector(suppasp, purpose, isasp)
-	local t = describe_supported_aspects(suppasp, isasp)
-	local formmode = 1
-
-	local pos
-	if type(purpose) == "table" then
-		formmode = 2
-		pos = purpose.pos
+-- shows larger formspec to set the signal influence point, main aspect and distant signal pos
+-- only_notset: show only if it is not set yet (used by signal tcb assignment)
+function advtrains.interlocking.show_ip_sa_form(pos, pname)
+	if not minetest.check_player_privs(pname, "interlocking") then
+		return
 	end
-
+	local ipform = advtrains.interlocking.make_ip_formspec_component(pos, 0.5, 0.5, 7)
+	local ma, rpos = advtrains.interlocking.signal.get_aspect(pos)
+	local saform = F.S_button_exit(0, 2, 4, "sa_dst_assign", rpos and minetest.pos_to_string(rpos) or "<distant signal>")
+			.. F.S_button_exit(0, 3, 2, "sa_tmp_mainfree", "Main to free") .. F.S_button_exit(2, 3, 2, "sa_tmp_mainhalt", "Main to halt")
 	local form = {
 		"formspec_version[4]",
-		string.format("size[8,%f]", ({5.75, 10.75})[formmode]),
-		F.S_label(0.5, 0.5, "Select signal aspect"),
+		"size[8,4]",
+		ipform,
+		saform,
 	}
-	local h0 = ({0, 1.5})[formmode]
-	form[#form+1] = F.S_label(0.5, 1.5+h0, "Main aspect")
-	form[#form+1] = F.S_label(0.5, 3+h0, "Shunt aspect")
-	form[#form+1] = F.S_button_exit(0.5, 4.5+h0, 7, "asp_save", "Save signal aspect")
-	if formmode == 1 then
-		form[#form+1] = F.label(0.5, 1, purpose)
-		form[#form+1] = F.field(0.5, 2, 7, "asp_mainval", "", t.main_string)
-	elseif formmode == 2 then
-		if t.group then
-			form[#form+1] = F.S_label(0.5, 1.5, "Signal aspect group: @1", t.groupdef.label)
-			form[#form+1] = F.dropdown(0.5, 2, 7, "asp_namesel", t.name, t.name_current, true)
-		else
-			form[#form+1] = F.S_label(0.5, 1.5, "This signal does not belong to a signal aspect group.")
-			form[#form+1] = F.S_label(0.5, 2, "You can not use a predefined signal aspect.")
-		end
-		form[#form+1] = F.S_label(0.5, 1, "Signal at @1", minetest.pos_to_string(pos))
-		form[#form+1] = F.dropdown(0.5, 3.5, 7, "asp_mainsel", t.main, t.main_current, true)
-		form[#form+1] = advtrains.interlocking.make_ip_formspec_component(pos, 0.5, 7, 7)
-		form[#form+1] = advtrains.interlocking.make_short_dst_formspec_component(pos, 0.5, 8.5, 7)
-	end
+	minetest.show_formspec(pname, "at_il_ipsaform_"..minetest.pos_to_string(pos), table.concat(form))
+end
 
-	if formmode == 2 and t.shunt_const then
-		form[#form+1] = F.label(0.5, 3.5+h0, t.shunt[t.shunt_current])
-		form[#form+1] = F.S_label(0.5, 4+h0, "The shunt aspect cannot be changed.")
-	else
-		form[#form+1] = F.dropdown(0.5, 3.5+h0, 7, "asp_shunt", t.shunt, t.shunt_current, true)
+function advtrains.interlocking.handle_ip_sa_formspec_fields(pname, pos, fields)
+	if not (pos and minetest.check_player_privs(pname, {train_operator=true, interlocking=true})) then
+		return
+	end
+	if fields.ip_set then
+		advtrains.interlocking.init_ip_assign(pos, pname)
+	elseif fields.ip_clear then
+		advtrains.interlocking.db.clear_ip_by_signalpos(pos)
+	elseif fields.sa_dst_assign then
+		advtrains.interlocking.init_distant_assign(pos, pname)
+	elseif fields.sa_tmp_mainfree then
+		local ma, rpos = advtrains.interlocking.signal.get_aspect(pos)
+		advtrains.interlocking.signal.set_aspect(pos, "_free", -1, rpos)
+	elseif fields.sa_tmp_mainhalt then
+		local ma, rpos = advtrains.interlocking.signal.get_aspect(pos)
+		advtrains.interlocking.signal.set_aspect(pos, nil, nil, rpos)
 	end
-
-	return table.concat(form)
 end
 
-function advtrains.interlocking.show_signal_aspect_selector(pname, p_suppasp, p_purpose, callback, isasp)
-	local suppasp = p_suppasp or {
-		main = {0, -1},
-		dst = {false},
-		shunt = false,
-		info = {},
-	}
-	local purpose = p_purpose or ""
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+	local pname = player:get_player_name()
+	local pts = string.match(formname, "^at_il_ipsaform_([^_]+)$")
 	local pos
-	if type(p_purpose) == "table" then
-		pos = p_purpose
-		purpose = {pname = pname, pos = pos}
+	if pts then
+		pos = minetest.string_to_pos(pts)
 	end
-
-	local form = make_signal_aspect_selector(suppasp, purpose, isasp)
-	if not form then
-		return
+	if pos then
+		advtrains.interlocking.handle_ip_sa_formspec_fields(pname, pos, fields)
 	end
+end)
 
-	local token = advtrains.random_id()
-	minetest.show_formspec(pname, "at_il_sigaspdia_"..token, form)
-	minetest.after(0, function()
-		players_aspsel[pname] = {
-			purpose = purpose,
-			suppasp = suppasp,
-			callback = callback,
-			token = token,
-		}
-	end)
-end
-
-local function usebool(sup, val, free)
-	if sup == nil then
-		return val == free
-	else
-		return sup
+-- inits the signal IP assignment process
+function advtrains.interlocking.init_ip_assign(pos, pname)
+	if not minetest.check_player_privs(pname, "interlocking") then
+		minetest.chat_send_player(pname, "Insufficient privileges to use this!")
+		return
 	end
+	--remove old IP
+	--advtrains.interlocking.db.clear_ip_by_signalpos(pos)
+	minetest.chat_send_player(pname, "Configuring Signal: Please look in train's driving direction and punch rail to set influence point.")
+	
+	players_assign_ip[pname] = pos
 end
 
-local function get_aspect_from_formspec(suppasp, fields, psl)
-	local namei, group, name = tonumber(fields.asp_namesel), suppasp.group, nil
-	local gdef = advtrains.interlocking.aspect.get_group_definition(group)
-	if gdef then
-		local names = suppasp.name or {}
-		name = names[namei] or names[names]
-	else
-		group = nil
-	end
-	local maini = tonumber(fields.asp_mainsel)
-	local main = (suppasp.main or {})[(maini or 0)-1]
-	if not maini then
-		local mainval = fields.asp_mainval
-		if mainval == "-1" then
-			main = -1
-		elseif mainval == "x" then
-			main = false
-		elseif string.match(mainval, "^%d+$") then
-			main = tonumber(mainval)
-		else
-			main = nil
-		end
-	elseif maini <= 1 then
-		main = nil
-	end
-	local shunti = tonumber(fields.asp_shunt)
-	local shunt = suppasp.shunt
-	if shunt == nil then
-		shunt = shunti == 2
-	end
-	local proceed_as_main = suppasp.proceed_as_main
-	if proceed_as_main == nil then
-		proceed_as_main = shunti == 3
+-- inits the distant signal assignment process
+function advtrains.interlocking.init_distant_assign(pos, pname)
+	if not minetest.check_player_privs(pname, "interlocking") then
+		minetest.chat_send_player(pname, "Insufficient privileges to use this!")
+		return
 	end
-	return advtrains.interlocking.aspect {
-		main = main,
-		shunt = shunt,
-		proceed_as_main = proceed_as_main,
-		info = {},
-		name = name,
-		group = group,
-	}
+	minetest.chat_send_player(pname, "Set distant signal: Punch the main signal to assign!")
+	
+	players_assign_distant[pname] = pos
 end
 
-minetest.register_on_player_receive_fields(function(player, formname, fields)
+minetest.register_on_punchnode(function(pos, node, player, pointed_thing)
 	local pname = player:get_player_name()
-	local psl = players_aspsel[pname]
-	if psl then
-		if formname == "at_il_sigaspdia_"..psl.token then
-			local suppasp = psl.suppasp
-			if fields.asp_save then
-				local asp
-				asp = get_aspect_from_formspec(suppasp, fields, psl)
-				if asp then
-					psl.callback(pname, asp)
+	if not minetest.check_player_privs(pname, "interlocking") then
+		return
+	end
+	-- IP assignment
+	local signalpos = players_assign_ip[pname]
+	if signalpos then
+		if vector.distance(pos, signalpos)<=50 then
+			local node_ok, conns, rhe = advtrains.get_rail_info_at(pos, advtrains.all_tracktypes)
+			if node_ok and #conns == 2 then
+				
+				local yaw = player:get_look_horizontal()
+				local plconnid = advtrains.yawToClosestConn(yaw, conns)
+				
+				-- add assignment if not already present.
+				local pts = advtrains.roundfloorpts(pos)
+				if not advtrains.interlocking.db.get_ip_signal_asp(pts, plconnid) then
+					advtrains.interlocking.db.set_ip_signal(pts, plconnid, signalpos)
+					ipmarker(pos, plconnid)
+					minetest.chat_send_player(pname, "Configuring Signal: Successfully set influence point")
+				else
+					minetest.chat_send_player(pname, "Configuring Signal: Influence point of another signal is already present!")
 				end
-			end
-			if type(psl.purpose) == "table" then
-				local pos = psl.purpose.pos
-				advtrains.interlocking.handle_ip_formspec_fields(pname, pos, fields)
-				advtrains.interlocking.handle_dst_formspec_fields(pname, pos, fields)
+			else
+				minetest.chat_send_player(pname, "Configuring Signal: This is not a normal two-connection rail! Aborted.")
 			end
 		else
-			players_aspsel[pname] = nil
+			minetest.chat_send_player(pname, "Configuring Signal: Node is too far away. Aborted.")
 		end
+		players_assign_ip[pname] = nil
+	end
+	-- DST assignment
+	signalpos = players_assign_distant[pname]
+	if signalpos then
+		-- get current mainaspect
+		local ma, rpos = advtrains.interlocking.signal.get_aspect(signalpos)
+		-- if punched pos is valid signal then set it as the new remote, otherwise nil
+		local nrpos
+		if advtrains.interlocking.signal.get_signal_cap_level(pos) > 1 then nrpos = pos end
+		advtrains.interlocking.signal.set_aspect(signalpos, ma.name, ma.speed, nrpos)
+		players_assign_distant[pname] = nil
 	end
 end)
+
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index bfec648..caf22e3 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -186,7 +186,7 @@ minetest.register_on_punchnode(function(pos, node, player, pointed_thing)
 			local is_signal = minetest.get_item_group(node.name, "advtrains_signal") >= 2
 			if is_signal then
 				local ndef = minetest.registered_nodes[node.name]
-				if ndef and ndef.advtrains and ndef.advtrains.set_aspect then
+				if ndef and ndef.advtrains and ndef.advtrains.apply_aspect then
 					local tcbs = ildb.get_tcbs(sigd)
 					if tcbs then
 						tcbs.signal = pos
@@ -464,7 +464,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		ts.route = nil
 		for _, sigd in ipairs(ts.tc_breaks) do
 			local tcbs = ildb.get_tcbs(sigd)
-			advtrains.interlocking.update_signal_aspect(tcbs)
+			advtrains.interlocking.signal.update_route_aspect(tcbs)
 		end
 		minetest.chat_send_player(pname, "Reset track section "..ts_id.."!")
 	end
@@ -642,7 +642,6 @@ function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, calle
 				form = form.."button[0.5,8;2.5,1;newroute;New Route]"
 				form = form.."button[  3,8;2.5,1;unassign;Unassign Signal]"
 				form = form..string.format("checkbox[0.5,8.75;ars;Automatic routesetting;%s]", not tcbs.ars_disabled)
-				form = form..string.format("checkbox[0.5,9.25;dst;Distant signalling;%s]", not tcbs.nodst)
 			end
 		elseif sigd_equal(tcbs.route_origin, sigd) then
 			-- something has gone wrong: tcbs.routeset should have been set...
@@ -660,7 +659,7 @@ function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, calle
 	-- always a good idea to update the signal aspect
 	if not called_from_form_update then
 	-- FIX prevent a callback loop
-		advtrains.interlocking.update_signal_aspect(tcbs)
+		advtrains.interlocking.signal.update_route_aspect(tcbs)
 	end
 end
 
@@ -769,10 +768,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		if fields.ars then
 			tcbs.ars_disabled = not minetest.is_yes(fields.ars)
 		end
-
-		if fields.dst then
-			tcbs.nodst = not minetest.is_yes(fields.dst)
-		end
 		
 		if fields.auto then
 			tcbs.route_auto = true
diff --git a/advtrains_signals_japan/init.lua b/advtrains_signals_japan/init.lua
index eb39f85..d7cf035 100644
--- a/advtrains_signals_japan/init.lua
+++ b/advtrains_signals_japan/init.lua
@@ -374,10 +374,6 @@ for sigtype, sigdata in pairs {
 	--sigdefs["rpt_"..sigtype] = process_signal(sigtype, sigdata, true)
 end
 
-for k in pairs(sigdefs) do
-	advtrains.trackplacer.register_tracktype("advtrains_signals_japan:"..k)
-end
-
 for _, rtab in ipairs {
 	{rot = "0", ici = true},
 	{rot = "30"},
@@ -455,7 +451,7 @@ for _, rtab in ipairs {
 				can_dig = advtrains.interlocking.signal_can_dig,
 				after_dig_node = advtrains.interlocking.signal_after_dig,
 			})
-			advtrains.trackplacer.add_worked("advtrains_signals_japan:"..sigtype, asp, "_"..rot)
+			--advtrains.trackplacer.add_worked("advtrains_signals_japan:"..sigtype, asp, "_"..rot)
 		end
 	end
 end
diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua
index 67e0fec..abfb194 100755
--- a/advtrains_signals_ks/init.lua
+++ b/advtrains_signals_ks/init.lua
@@ -50,15 +50,18 @@ end
 
 local applyaspectf_main = function(rot)
  return function(pos, node, main_aspect, dst_aspect, dst_aspect_info)
+	if not main_aspect then
+		-- halt aspect, set red and don't do anything further
+		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_danger_"..rot, param2 = node.param2})
+		setzs3v(pos, nil, rot)
+		return
+	end
 	-- set zs3 signal to show speed according to main_aspect
 	setzs3(pos, main_aspect.zs3, rot)
 	-- select appropriate lamps based on mainaspect and dst
 	if main_aspect.shunt then
 		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_shunt_"..rot, param2 = node.param2})
 		setzs3v(pos, nil, rot)
-	elseif main_aspect.halt then
-		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_danger_"..rot, param2 = node.param2})
-		setzs3v(pos, nil, rot)
 	else
 		if not dst_aspect_info
 				or not dst_aspect_info.main
@@ -128,7 +131,8 @@ local mainaspects_main = {
 local applyaspectf_ra = function(rot)
  -- we get here the full main_aspect table
  return function(pos, node, main_aspect, dst_aspect, dst_aspect_info)
-	if main_aspect.shunt then
+	if main_aspect then
+		-- any main aspect is fine, there's only one anyway
 		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:ra_shuntd_"..rot, param2 = node.param2})
 	else
 		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:ra_danger_"..rot, param2 = node.param2})
@@ -144,11 +148,6 @@ local mainaspects_shunt = {
 		description = "Shunt",
 		shunt = true,
 	},
-	{
-		name = "halt",
-		description = "Halt",
-		halt = true,
-	},
 }
 
 for _, rtab in ipairs({
@@ -225,9 +224,9 @@ for _, rtab in ipairs({
 				apply_aspect = applyaspectf_main(rot),
 				get_aspect_info = afunc,
 			},
-			on_rightclick = advtrains.interlocking.signal_rc_handler,
-			can_dig = advtrains.interlocking.signal_can_dig,
-			after_dig_node = advtrains.interlocking.signal_after_dig,
+			on_rightclick = advtrains.interlocking.signal.on_rightclick,
+			can_dig = advtrains.interlocking.signal.can_dig,
+			after_dig_node = advtrains.interlocking.signal.after_dig,
 		})
 		-- rotatable by trackworker
 		--TODO add rotation using trackworker
-- 
cgit v1.2.3


From 9af6e32e644cfa53641e83d7550c0af2d31553fd Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Thu, 23 May 2024 20:25:35 +0200
Subject: Add proper UI aspect selection for static dialog

---
 advtrains/nodedb.lua                        |  4 ++
 advtrains_interlocking/routesetting.lua     | 11 +----
 advtrains_interlocking/signal_api.lua       | 70 +++++++++++++++------------
 advtrains_interlocking/signal_aspect_ui.lua | 75 ++++++++++++++++++++++++-----
 advtrains_signals_ks/init.lua               | 12 ++---
 5 files changed, 111 insertions(+), 61 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains/nodedb.lua b/advtrains/nodedb.lua
index ff07df4..62405ce 100644
--- a/advtrains/nodedb.lua
+++ b/advtrains/nodedb.lua
@@ -212,6 +212,10 @@ function ndb.get_node(pos)
 	end
 	return n
 end
+function ndb.get_ndef(pos)
+	local n=ndb.get_node_or_nil(pos)
+	return n and minetest.registered_nodes[n.name]
+end
 function ndb.get_node_raw(pos)
 	local cid=ndbget(pos.x, pos.y, pos.z)
 	if cid then
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index a576139..51709dc 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -159,15 +159,8 @@ function ilrs.set_route(signal, route, try)
 		end
 	end
 	for i = #signals, 1, -1 do
-		if lastsig then
-			local tcbs = signals[i]
-			local pos = tcbs.signal
-			local _, assigned_by = advtrains.distant.get_main(pos)
-			if (not nodst) and (not assigned_by or assigned_by == "routesetting") then
-				advtrains.distant.assign(lastsig, pos, "routesetting", true)
-			end
-			advtrains.interlocking.signal.update_route_aspect(tcbs, i ~= 1)
-		end
+		-- TODO add logic for distant signal assign
+		advtrains.interlocking.signal.update_route_aspect(signals[i], i ~= 1)
 	end
 	
 	return true
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index 5216594..7826d30 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -5,13 +5,14 @@ local F = advtrains.formspec
 local signal = {}
 
 signal.MASP_HALT = {
-	name = nil,
-	speed = nil,
+	name = "_halt",
+	speed = 0,
+	halt = true,
 	remote = nil,
 }
 
 signal.MASP_FREE = {
-	name = "_free",
+	name = "_default",
 	speed = -1,
 	remote = nil,
 }
@@ -44,9 +45,9 @@ b) the distant signal's aspect group name & aspect table
 One concrete combination of lights/shapes that a signal signal shows. Handling these is at the discretion of
 the signal mod defining the signal, and they are typically combinations of main aspect and distant aspect
 Example:
-- A Ks signal has the aspect_group="proceed_12" set for a route
-- The signal at the end of the route shows aspect_group="proceed_8", advtrains also passes on that this means {main=8, shunt=false}
-- The ndef.advtrains.apply_aspect(pos, asp_group, dst_aspgrp, dst_aspinfo) determines that the signal should now show
+- A Ks signal has the main_aspect="proceed_12" set for a route
+- The signal at the end of the route shows main_aspect="proceed_8", advtrains also passes on that this means {main=8, shunt=false}
+- The ndef.afunction(pos, node, main_aspect, rem_aspect, rem_aspinfo) determines that the signal should now show
 		blinking green with main indicator 12 and dst indicator 8, and sets the nodes accordingly.
 		This function can now return the Aspect Info table, which will be cached by advtrains until the aspect changes again
 		and will be used when a train approaches the signal. If nil is returned, then the aspect will be queried next time
@@ -56,10 +57,14 @@ Note that once apply_aspect returns, there is no need for advtrains anymore to q
 When the signal, for any reason, wants to change its aspect by itself *without* going through the signal API then
 it should update the aspect info cache by calling advtrains.interlocking.signal.update_aspect_info(pos)
 
-Apply_aspect may also receive nil as the main aspect. It usually means that the signal is not assigned to anything particular,
+Apply_aspect may also receive the special main aspect { name = "_halt", halt = true }. It usually means that the signal is not assigned to anything particular,
 and it should cause the signal to show its most restrictive aspect. Typically it is a halt aspect, but e.g. for distant-only
 signals this would be "expect stop".
 
+A special case occurs for pure distant signals: Such signals must set apply_aspect, but must not set main_aspects. Behavior is as follows:
+- Signal is uninitialized, distant signal is not assigned to a main signal, or no route is set: main_aspect == { name = "_halt", halt = true } and rem_aspect == nil
+- A remote main signal is assigned (either by user or by route): main_aspect is always { name = "_default" } and rem_aspect / rem_aspinfo give the correct information
+
 Main aspect names starting with underscore (e.g. "_default") are reserved and must not be used!
 
 == Aspect Info ==
@@ -90,6 +95,7 @@ ndef.advtrains = {
 	apply_aspect = function(pos, node, main_aspect, rem_aspect, rem_aspinfo)
 		-- set the node to show the desired aspect
 		-- called by advtrains when this signal's aspect group or the remote signal's aspect changes
+		-- main_aspect is never nil, but can be one of the special aspects { name = "_halt", halt = true } or { name = "_default" }
 		-- MAY return the aspect_info. If it returns nil then get_aspect_info will be queried at a later point.
 	get_aspect_info(pos, main_aspect)
 		-- Returns the aspect info table (main, shunt, dst etc.)
@@ -268,36 +274,41 @@ end
 function signal.get_aspect_internal(pos, aspt)
 	if not aspt then
 		-- oh, no main aspect, nevermind
-		return nil, nil, nil
+		return signal.MASP_HALT, nil, nil
 	end
 	atdebug("get_aspect_internal",pos,aspt)
 	-- look aspect in nodedef
 	local node = advtrains.ndb.get_node_or_nil(pos)
 	local ndef = node and minetest.registered_nodes[node.name]
 	local ndefat = ndef and ndef.advtrains
-	-- only if signal defines main aspect and its set in aspt
-	if ndefat and ndefat.main_aspects and aspt.name then
-		if not ndefat.main_aspects_lookup then
-			cache_mainaspects(ndefat)
-		end
-		local masp = ndefat.main_aspects_lookup[aspt.name]
-		-- special handling for the default free aspect ("_free")
-		if aspt.name == "_free" then
-			masp = ndefat.main_aspects[1]
-		end
-		if not masp then
-			atwarn(pos,"invalid main aspect",aspt.name,"valid are",ndefat.main_aspects_lookup)
-			return nil, aspt.remote, node, ndef
-		end
-		-- if speed, then apply speed
-		if masp.speed and aspt.speed then
-			masp = table.copy(masp)
-			masp.speed = aspt.speed
+	if ndefat and ndefat.apply_aspect then
+		-- only if signal defines main aspect and its set in aspt
+		if ndefat.main_aspects and aspt.name then
+			if not ndefat.main_aspects_lookup then
+				cache_mainaspects(ndefat)
+			end
+			local masp = ndefat.main_aspects_lookup[aspt.name]
+			-- special handling for the default free aspect ("_default")
+			if aspt.name == "_default" then
+				masp = ndefat.main_aspects[1]
+			end
+			if not masp then
+				atwarn(pos,"invalid main aspect",aspt.name,"valid are",ndefat.main_aspects_lookup)
+				return signal.MASP_HALT, aspt.remote, node, ndef
+			end
+			-- if speed, then apply speed
+			if masp.speed and aspt.speed then
+				masp = table.copy(masp)
+				masp.speed = aspt.speed
+			end
+			return masp, aspt.remote, node, ndef
+		elseif aspt.name then
+			-- Distant-only signal, still supports kind of default aspect
+			return { name = aspt.name, speed = aspt.speed }, aspt.remote, node, ndef
 		end
-		return masp, aspt.remote, node, ndef
 	end
-	-- invalid node or no main aspect, return nil for masp
-	return nil, aspt.remote, node, ndef
+	-- invalid node or no main aspect, return default halt aspect for masp
+	return signal.MASP_HALT, aspt.remote, node, ndef
 end
 
 -- For the signal at pos, get the "aspect info" table. This contains the speed signalling information at this location
@@ -327,7 +338,6 @@ function signal.reapply_aspect(pts)
 	end
 	-- resolve mainaspect table by name
 	local pos = advtrains.decode_pos(pts)
-	-- note: masp may be nil, when aspt.name was nil. Valid case for distant-only signals
 	local masp, remote, node, ndef = signal.get_aspect_internal(pos, aspt)
 	-- if we have remote, resolve remote
 	local rem_masp, rem_aspi
diff --git a/advtrains_interlocking/signal_aspect_ui.lua b/advtrains_interlocking/signal_aspect_ui.lua
index e5d2003..785e6d4 100644
--- a/advtrains_interlocking/signal_aspect_ui.lua
+++ b/advtrains_interlocking/signal_aspect_ui.lua
@@ -75,14 +75,34 @@ function advtrains.interlocking.show_ip_sa_form(pos, pname)
 	end
 	local ipform = advtrains.interlocking.make_ip_formspec_component(pos, 0.5, 0.5, 7)
 	local ma, rpos = advtrains.interlocking.signal.get_aspect(pos)
-	local saform = F.S_button_exit(0, 2, 4, "sa_dst_assign", rpos and minetest.pos_to_string(rpos) or "<distant signal>")
-			.. F.S_button_exit(0, 3, 2, "sa_tmp_mainfree", "Main to free") .. F.S_button_exit(2, 3, 2, "sa_tmp_mainhalt", "Main to halt")
 	local form = {
 		"formspec_version[4]",
-		"size[8,4]",
+		"size[8,4.5]",
 		ipform,
-		saform,
 	}
+	-- Create Signal aspect formspec elements
+	local ndef = advtrains.ndb.get_ndef(pos)
+	if ndef and ndef.advtrains then
+		-- main aspect list
+		if ndef.advtrains.main_aspects then
+			local entries = { "<none>" }
+			local sel = 1
+			for i, mae in ipairs(ndef.advtrains.main_aspects) do
+				entries[i+1] = mae.description
+				if ma and ma.name == mae.name then
+					sel = i+1
+				end
+			end
+			form[#form+1] = F.dropdown(0.5, 2.5, 4, "sa_mainaspect", entries, sel, true)
+		end
+		-- distant signal assign (is shown either when main_aspect is not none, or when pure distant signal)
+		if rpos then
+			form[#form+1] = F.button_exit(0.5, 3.5, 4, "sa_undistant", "Dst: " .. minetest.pos_to_string(rpos))
+		elseif (ma and not ma.halt) or not ndef.advtrains.main_aspects then
+			form[#form+1] = F.button_exit(0.5, 3.5, 4, "sa_distant", "<assign distant>")
+		end
+	end
+	
 	minetest.show_formspec(pname, "at_il_ipsaform_"..minetest.pos_to_string(pos), table.concat(form))
 end
 
@@ -90,18 +110,42 @@ function advtrains.interlocking.handle_ip_sa_formspec_fields(pname, pos, fields)
 	if not (pos and minetest.check_player_privs(pname, {train_operator=true, interlocking=true})) then
 		return
 	end
+	local ma, rpos = advtrains.interlocking.signal.get_aspect(pos)
+	-- mainaspect dropdown
+	if fields.sa_mainaspect then
+		local idx = tonumber(fields.sa_mainaspect)
+		local new_ma = nil
+		if idx > 1 then
+			local ndef = advtrains.ndb.get_ndef(pos)
+			if ndef and ndef.advtrains and ndef.advtrains.main_aspects then
+				new_ma = ndef.advtrains.main_aspects[idx - 1]
+			end
+		end
+		if new_ma and (new_ma.name ~= ma.name or new_ma.speed ~= ma.speed) then
+			advtrains.interlocking.signal.set_aspect(pos, new_ma.name, new_ma.speed, rpos)
+		elseif not new_ma then
+			-- reset everything
+			advtrains.interlocking.signal.set_aspect(pos, nil, nil, nil)
+		end
+		
+	end
+	-- buttons
 	if fields.ip_set then
 		advtrains.interlocking.init_ip_assign(pos, pname)
+		return
 	elseif fields.ip_clear then
 		advtrains.interlocking.db.clear_ip_by_signalpos(pos)
-	elseif fields.sa_dst_assign then
+		return
+	elseif fields.sa_distant then
 		advtrains.interlocking.init_distant_assign(pos, pname)
-	elseif fields.sa_tmp_mainfree then
-		local ma, rpos = advtrains.interlocking.signal.get_aspect(pos)
-		advtrains.interlocking.signal.set_aspect(pos, "_free", -1, rpos)
-	elseif fields.sa_tmp_mainhalt then
-		local ma, rpos = advtrains.interlocking.signal.get_aspect(pos)
-		advtrains.interlocking.signal.set_aspect(pos, nil, nil, rpos)
+		return
+	elseif fields.sa_undistant then
+		advtrains.interlocking.signal.set_aspect(pos, ma.name, ma.speed, nil)
+		return
+	end
+	-- show the form again unless one of the buttons was clicked
+	if not fields.quit then
+		advtrains.interlocking.show_ip_sa_form(pos, pname)
 	end
 end
 
@@ -180,8 +224,13 @@ minetest.register_on_punchnode(function(pos, node, player, pointed_thing)
 		local ma, rpos = advtrains.interlocking.signal.get_aspect(signalpos)
 		-- if punched pos is valid signal then set it as the new remote, otherwise nil
 		local nrpos
-		if advtrains.interlocking.signal.get_signal_cap_level(pos) > 1 then nrpos = pos end
-		advtrains.interlocking.signal.set_aspect(signalpos, ma.name, ma.speed, nrpos)
+		if advtrains.interlocking.signal.get_signal_cap_level(pos) > 1 then
+			nrpos = pos
+			if not ma then -- make sure that dst is never set without a main aspect (esp. for pure distant signal case)
+				ma = { name = "_default" }
+			end
+			advtrains.interlocking.signal.set_aspect(signalpos, ma.name, ma.speed, nrpos)
+		end
 		players_assign_distant[pname] = nil
 	end
 end)
diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua
index abfb194..9cb0262 100755
--- a/advtrains_signals_ks/init.lua
+++ b/advtrains_signals_ks/init.lua
@@ -50,7 +50,7 @@ end
 
 local applyaspectf_main = function(rot)
  return function(pos, node, main_aspect, dst_aspect, dst_aspect_info)
-	if not main_aspect then
+	if main_aspect.halt then
 		-- halt aspect, set red and don't do anything further
 		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_danger_"..rot, param2 = node.param2})
 		setzs3v(pos, nil, rot)
@@ -119,20 +119,14 @@ local mainaspects_main = {
 		description = "Proceed (speed 4)",
 		zs3 = "4",
 	},
-	{
-		name = "halt",
-		description = "Halt",
-		zs3 = "off",
-		halt = true,
-	},
 }
 
 --Rangiersignal
 local applyaspectf_ra = function(rot)
  -- we get here the full main_aspect table
  return function(pos, node, main_aspect, dst_aspect, dst_aspect_info)
-	if main_aspect then
-		-- any main aspect is fine, there's only one anyway
+	if not main_aspect.halt then
+		-- any non-halt main aspect is fine, there's only one anyway
 		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:ra_shuntd_"..rot, param2 = node.param2})
 	else
 		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:ra_danger_"..rot, param2 = node.param2})
-- 
cgit v1.2.3


From dcceb65ff04573375016f2460edcbd349e506a4e Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Wed, 12 Jun 2024 00:25:14 +0200
Subject: Respect route_role of signals during routesetting, assign distant
 signals in routes

---
 advtrains_interlocking/routesetting.lua   | 46 +++++++++++++++++++++++--------
 advtrains_interlocking/signal_api.lua     | 22 +++++++++++----
 advtrains_interlocking/tcb_ts_ui.lua      |  3 +-
 advtrains_interlocking/train_sections.lua | 33 ++++++++--------------
 advtrains_signals_japan/init.lua          |  1 +
 advtrains_signals_ks/init.lua             |  2 ++
 advtrains_signals_muc_ubahn/init.lua      |  1 +
 7 files changed, 69 insertions(+), 39 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 51709dc..d619aac 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -45,6 +45,7 @@ function ilrs.set_route(signal, route, try)
 	local rtename = route.name
 	local signalname = (ildb.get_tcbs(signal).signal_name or "") .. sigd_to_string(signal)
 	local c_tcbs, c_ts_id, c_ts, c_rseg, c_lckp
+	-- signals = { { pos = ., tcbs_ref = <tcbs>, role = "main_distant", masp_override = nil, dst_type = "next_main" or "none" } 
 	local signals = {}
 	local nodst
 	while c_sigd and i<=#route do
@@ -67,11 +68,11 @@ function ilrs.set_route(signal, route, try)
 		
 		if c_ts.route then
 			if not try then atwarn("Encountered ts lock during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end
-			return false, "Section '"..c_ts.name.."' already has route set from "..sigd_to_string(c_ts.route.origin)..":\n"..c_ts.route.rsn, c_ts_id, nil
+			return false, "Section '"..(c_ts.name or c_ts_id).."' already has route set from "..sigd_to_string(c_ts.route.origin)..":\n"..c_ts.route.rsn, c_ts_id, nil
 		end
 		if c_ts.trains and #c_ts.trains>0 then
 			if not try then atwarn("Encountered ts occupied during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end
-			return false, "Section '"..c_ts.name.."' is occupied!", c_ts_id, nil
+			return false, "Section '"..(c_ts.name or c_ts_id).."' is occupied!", c_ts_id, nil
 		end
 		
 		-- collect locks from rs cache and from route def
@@ -138,9 +139,17 @@ function ilrs.set_route(signal, route, try)
 			}
 			if c_tcbs.signal then
 				c_tcbs.route_committed = true
-				c_tcbs.aspect = advtrains.interlocking.signal.MASP_FREE
 				c_tcbs.route_origin = signal
-				signals[#signals+1] = c_tcbs
+				-- determine route role
+				local ndef = advtrains.ndb.get_ndef(c_tcbs.signal)
+				local sig_table = {
+					pos = c_tcbs.signal,
+					tcbs_ref = c_tcbs,
+					role = ndef and ndef.advtrains and ndef.advtrains.route_role,
+					masp_override = c_rseg.masp_override, --TODO implement masp_override on UI side
+					dst_type = "next_main", --TODO allow user differentiate
+				}
+				signals[#signals+1] = sig_table
 			end
 		end
 		-- advance
@@ -149,18 +158,31 @@ function ilrs.set_route(signal, route, try)
 		i = i + 1
 	end
 
-	-- Distant signaling
-	local lastsig = nil
+	-- Get reference to signal at end of route
+	local last_mainsig = nil
 	if c_sigd then
 		local e_tcbs = ildb.get_tcbs(c_sigd)
 		local pos = e_tcbs and e_tcbs.signal
 		if pos then
-			lastsig = pos
+			last_mainsig = pos
 		end
 	end
 	for i = #signals, 1, -1 do
-		-- TODO add logic for distant signal assign
-		advtrains.interlocking.signal.update_route_aspect(signals[i], i ~= 1)
+		-- note the signals are iterated backwards. Switch depending on the role
+		local sig = signals[i]
+		-- apply mainaspect
+		sig.tcbs_ref.route_aspect = sig.masp_override or "_default"
+		if sig.role == "distant" or sig.role == "distant_repeater" or sig.role == "main_distant" then
+			-- assign the remote as the last mainsig
+			sig.tcbs_ref.route_remote = last_mainsig
+		end
+		if sig.role == "main" or sig.role == "main_distant" or sig.role == "end" then
+			-- record this as the new last mainsig
+			last_mainsig = sig.pos
+		end
+		-- for shunt signals nothing happens
+		-- update the signal aspect on map
+		advtrains.interlocking.signal.update_route_aspect(sig.tcbs_ref, i ~= 1)
 	end
 	
 	return true
@@ -266,7 +288,8 @@ function ilrs.cancel_route_from(sigd)
 		--atdebug("cancelling",c_ts.route.rsn)
 		-- clear signal aspect and routesetting state
 		c_tcbs.route_committed = nil
-		c_tcbs.aspect = nil
+		c_tcbs.route_aspect = nil
+		c_tcbs.route_remote = nil
 		c_tcbs.routeset = nil
 		c_tcbs.route_auto = nil
 		c_tcbs.route_origin = nil
@@ -321,7 +344,8 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel)
 			advtrains.interlocking.route.cancel_route_from(sigd)
 		end
 		tcbs.route_committed = nil
-		tcbs.aspect = nil
+		tcbs.route_aspect = nil
+		tcbs.route_remote = nil
 		has_changed_aspect = true
 		tcbs.routeset = nil
 		tcbs.route_auto = nil
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index b1e8b20..65fc787 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -96,11 +96,12 @@ ndef.advtrains = {
 		-- Returns the aspect info table (main, shunt, dst etc.)
 	distant_support = true or false
 		-- If true, signal is considered in distant signalling. If false or nil, rem_aspect and rem_aspinfo are never set.
-	route_role = one of "main", "shunt", "distant", "distant_repeater", "end"
+	route_role = one of "main", "main_distant", "shunt", "distant", "distant_repeater", "end"
 		-- Determines how the signal behaves when routes are set. Only in effect when signal is assigned to a TCB.
 		-- main: The signal is a possible endpoint for a train move route. Distant signals before it refer to it.
 		-- shunt: The signal is a possible endpoint for a shunt move route. Ignored for distant signals.
 		-- distant, distant_repeater: When route is set, signal is always assigned its first main aspect. The next signal with role="main" is set as the remote signal. (currently no further distinction)
+		-- main_distant: Combination of main and distant - like "main", but additionally gets assigned to the next main like a "distant"
 		-- end: like main, but signifies that it marks an end of track and trains cannot continue further. (currently no practical implications above main)
 }
 
@@ -329,9 +330,17 @@ function signal.get_aspect_info(pos)
 	local masp, remote, node, ndef = signal.get_aspect_internal(pos, aspt)
 	-- call into ndef
 	if ndef.advtrains and ndef.advtrains.get_aspect_info then
-		local ai = ndef.advtrains.get_aspect_info(pos, masp)
-		atdebug(pos,"aspectinfo",ai)
-		return ai
+		local ai = ndef.advtrains.get_aspect_info
+		if type(ai)=="function" then
+			ai = ai(pos, masp)
+		end
+		if type(ai)=="table" then
+			atdebug(pos,"aspectinfo",ai)
+			return ai
+		else
+			error("For node "..node.name..": ndef.advtrains.get_aspect_info must be function or table")
+		end
+		
 	end
 end
 
@@ -380,8 +389,9 @@ end
 -- 
 function signal.update_route_aspect(tcbs, skip_dst_notify)
 	if tcbs.signal then
-		local asp = tcbs.aspect or signal.MASP_HALT
-		signal.set_aspect(tcbs.signal, asp.name, asp.speed, asp.remote, skip_dst_notify)
+		local asp = tcbs.route_aspect or "_halt"
+		local rem = tcbs.route_remote
+		signal.set_aspect(tcbs.signal, asp, rem, skip_dst_notify)
 	end
 end
 
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index caf22e3..60be5f3 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -756,7 +756,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 				local signal_pos = tcbs.signal
 				ildb.set_sigd_for_signal(signal_pos, nil)
 				tcbs.signal = nil
-				tcbs.aspect = nil
+				tcbs.route_aspect = nil
+				tcbs.route_remote = nil
 				minetest.close_formspec(pname, formname)
 				minetest.chat_send_player(pname, "Signal has been unassigned. Name and routes are kept for reuse.")
 				return
diff --git a/advtrains_interlocking/train_sections.lua b/advtrains_interlocking/train_sections.lua
index 260f5a4..41da747 100644
--- a/advtrains_interlocking/train_sections.lua
+++ b/advtrains_interlocking/train_sections.lua
@@ -86,31 +86,22 @@ local function setsection(tid, train, ts_id, ts, sigd)
 			advtrains.interlocking.route.cancel_route_from(ts.route.origin)
 			atwarn("Route was cancelled.")
 		else
-			-- train entered route regularily. Reset route and signal
-			tcbs.route_committed = nil
-			tcbs.route_comitted = nil -- TODO compatibility cleanup
-			tcbs.aspect = nil
-			tcbs.route_origin = nil
-			if tcbs.signal then
-				local spos = tcbs.signal
-				local _, setter = advtrains.distant.get_main(spos)
-				if setter == "routesetting" then
-					advtrains.distant.unassign_dst(spos, true)
-				end
-			end
-			advtrains.interlocking.update_signal_aspect(tcbs)
-			if tcbs.signal and sigd_equal(ts.route.entry, ts.route.origin) then
-				if tcbs.route_auto and tcbs.routeset then
-					--atdebug("Resetting route (",ts.route.origin,")")
-					advtrains.interlocking.route.update_route(ts.route.origin, tcbs)
-				else
-					tcbs.routeset = nil
-				end
-			end
+			-- train entered route regularily.
 		end
 		ts.route = nil
 	end
 	if tcbs.signal then
+		-- Reset route and signal
+		-- Note that the hit-route case is already handled by cancel_route_from
+		-- this code only handles signal at entering tcb and also triggers for non-route ts
+		tcbs.route_committed = nil
+		tcbs.route_aspect = nil
+		tcbs.route_remote = nil
+		tcbs.route_origin = nil
+		if not tcbs.route_auto then
+			tcbs.routeset = nil
+		end
+		advtrains.interlocking.signal.update_route_aspect(tcbs)
 		advtrains.interlocking.route.update_route(sigd, tcbs)
 	end
 end
diff --git a/advtrains_signals_japan/init.lua b/advtrains_signals_japan/init.lua
index fc33e63..a659410 100644
--- a/advtrains_signals_japan/init.lua
+++ b/advtrains_signals_japan/init.lua
@@ -428,6 +428,7 @@ for _, rtab in ipairs {
 							proceed_as_main = true,
 						}
 					end,
+					route_role = "main_distant",
 				--[[
 					supported_aspects = {
 						group = "advtrains_signals_japan:5a",
diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua
index 46b9971..6afc66d 100755
--- a/advtrains_signals_ks/init.lua
+++ b/advtrains_signals_ks/init.lua
@@ -218,6 +218,7 @@ for _, rtab in ipairs({
 				main_aspects = mainaspects_main,
 				apply_aspect = applyaspectf_main(rot),
 				get_aspect_info = afunc,
+				route_role = "main_distant",
 			},
 			on_rightclick = advtrains.interlocking.signal.on_rightclick,
 			can_dig = advtrains.interlocking.signal.can_dig,
@@ -261,6 +262,7 @@ for _, rtab in ipairs({
 				main_aspects = mainaspects_ra,
 				apply_aspect = applyaspectf_ra(rot),
 				get_aspect_info = prts.asp,
+				route_role = "shunt",
 			},
 			on_rightclick = advtrains.interlocking.signal.on_rightclick,
 			can_dig = advtrains.interlocking.signal.can_dig,
diff --git a/advtrains_signals_muc_ubahn/init.lua b/advtrains_signals_muc_ubahn/init.lua
index 4088ba6..59d0337 100755
--- a/advtrains_signals_muc_ubahn/init.lua
+++ b/advtrains_signals_muc_ubahn/init.lua
@@ -77,6 +77,7 @@ for r,f in pairs(all_sigs) do
 				main_aspects = not f.distant and mainaspects, -- main aspects only for main
 				apply_aspect = f.distant and applyaspect_distant(loc) or applyaspect_main(loc),
 				get_aspect_info = function() return f.asp end,
+				route_role = f.distant and "distant" or "main"
 			},
 		})
 	end
-- 
cgit v1.2.3


From baa50c03920fd0a563fce09929f3d56c3374e8bd Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Sat, 20 Jul 2024 18:02:33 +0200
Subject: ARS supports triggering distant signal, other bugfixes

---
 advtrains/lzb.lua                         |  2 +-
 advtrains/path.lua                        |  2 +-
 advtrains/trackplacer.lua                 |  8 ++--
 advtrains/trainlogic.lua                  |  6 +--
 advtrains_interlocking/approach.lua       |  5 +--
 advtrains_interlocking/ars.lua            | 66 ++++++++++++++++++++-----------
 advtrains_interlocking/route_prog.lua     |  4 +-
 advtrains_interlocking/routesetting.lua   |  4 +-
 advtrains_interlocking/signal_api.lua     |  2 +-
 advtrains_interlocking/tcb_ts_ui.lua      |  7 +++-
 advtrains_interlocking/train_sections.lua |  7 +++-
 advtrains_signals_ks/init.lua             | 22 +++++++++--
 12 files changed, 87 insertions(+), 48 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains/lzb.lua b/advtrains/lzb.lua
index 64e4553..52c2289 100644
--- a/advtrains/lzb.lua
+++ b/advtrains/lzb.lua
@@ -48,7 +48,7 @@ local params = {
 	ZONE_HOLD  =  5, -- added on top of ZONE_ROLL
 	ZONE_VSLOW =  3, -- When speed is <2, still allow accelerating
 
-	DST_FACTOR =  1.5,
+	DST_FACTOR =  3,--1.5,
 
 	SHUNT_SPEED_MAX = advtrains.SHUNT_SPEED_MAX,
 }
diff --git a/advtrains/path.lua b/advtrains/path.lua
index 28df529..d54aebe 100644
--- a/advtrains/path.lua
+++ b/advtrains/path.lua
@@ -256,7 +256,7 @@ function advtrains.path_get(train, index)
 			if next_connmap then -- only needs to be done when this track is a turnout (>2 conns)
 				local origin_conn = train.path_ori_cp[advtrains.encode_pos(adj_pos)]
 				if origin_conn then
-					atdebug("Train",train.id,"at",adj_pos,"restoring turnout origin CP",origin_conn,"for path item",index)
+					--atdebug("Train",train.id,"at",adj_pos,"restoring turnout origin CP",origin_conn,"for path item",index)
 					mconnid = origin_conn
 				end
 			end
diff --git a/advtrains/trackplacer.lua b/advtrains/trackplacer.lua
index e6111dc..597e8ec 100644
--- a/advtrains/trackplacer.lua
+++ b/advtrains/trackplacer.lua
@@ -288,8 +288,8 @@ minetest.register_craftitem("advtrains:trackworker",{
 			advtrains.ndb.swap_node(pos, new_node)
 		end
 	end,
-	on_use=function(itemstack, user, pointed_thing)
-		local name = user:get_player_name()
+	on_use=function(itemstack, player, pointed_thing)
+		local name = player:get_player_name()
 		if not name then
 		   return
 		end
@@ -305,7 +305,7 @@ minetest.register_craftitem("advtrains:trackworker",{
 			local ndef = minetest.registered_nodes[node.name]
 			
 			if not ndef.advtrains or not ndef.advtrains.trackworker_next_var then
-				minetest.chat_send_player(placer:get_player_name(), attrans("This node can't be changed using the trackworker!"))
+				minetest.chat_send_player(name, attrans("This node can't be changed using the trackworker!"))
 				return
 			end
 			
@@ -318,7 +318,7 @@ minetest.register_craftitem("advtrains:trackworker",{
 					if reason then
 						str = str .. " " .. reason
 					end
-					minetest.chat_send_player(placer:get_player_name(), str)
+					minetest.chat_send_player(name, str)
 					return
 				end
 			end
diff --git a/advtrains/trainlogic.lua b/advtrains/trainlogic.lua
index cb1f9a6..9e9f214 100644
--- a/advtrains/trainlogic.lua
+++ b/advtrains/trainlogic.lua
@@ -865,7 +865,7 @@ local function tnc_call_enter_callback(pos, train_id, train, index)
 	-- check for split points
 	if mregnode and mregnode.at_conn_map then
 		-- If this node has >2 conns (and a connmap), remember the connection where we came from to handle split points
-		atdebug("Train",train_id,"at",pos,"saving turnout origin CP",train.path_cp[index],"for path item",index)
+		--atdebug("Train",train_id,"at",pos,"saving turnout origin CP",train.path_cp[index],"for path item",index)
 		train.path_ori_cp[advtrains.encode_pos(pos)] = train.path_cp[index]
 	end
 end
@@ -883,7 +883,7 @@ local function tnc_call_leave_callback(pos, train_id, train, index)
 	-- split points do not matter anymore. clear them
 	if mregnode and mregnode.at_conn_map then
 		-- If this node has >2 conns (and a connmap), remember the connection where we came from to handle split points
-		atdebug("Train",train_id,"at",pos,"removing turnout origin CP for path item",index," because train has left it")
+		--atdebug("Train",train_id,"at",pos,"removing turnout origin CP for path item",index," because train has left it")
 		train.path_ori_cp[advtrains.encode_pos(pos)] = nil
 	end
 end
@@ -1188,7 +1188,7 @@ function advtrains.invert_train(train_id)
 		local pos = advtrains.path_get(train, index)
 		local ok, conns, railheight, connmap = advtrains.get_rail_info_at(pos)
 		if ok and connmap then
-			atdebug("Reversing Train",train.id," ori_cp Checks: at",pos,"saving turnout origin CP",train.path_cn[index],"for path item",index)
+			--atdebug("Reversing Train",train.id," ori_cp Checks: at",pos,"saving turnout origin CP",train.path_cn[index],"for path item",index)
 			ori_cp_after_flip[advtrains.encode_pos(pos)] = train.path_cn[index]
 		end
 	end
diff --git a/advtrains_interlocking/approach.lua b/advtrains_interlocking/approach.lua
index eecf09a..eaf0248 100644
--- a/advtrains_interlocking/approach.lua
+++ b/advtrains_interlocking/approach.lua
@@ -64,10 +64,7 @@ advtrains.tnc_register_on_approach(function(pos, id, train, index, has_entered,
 	-- resetting the path does not matter to the set route and ARS doesn't need to be called again.
 	if spos and ars_enabled then
 		--atdebug(id,"IL Spos (ARS)",spos,asp)
-		local sigd = il.db.get_sigd_for_signal(spos)
-		if sigd then
-			il.ars_check(sigd, train)
-		end
+		il.ars_check(spos, train)
 	end
 	--atdebug("trav: ",pos, cn, asp, spos, "travsht=", lzb.travsht)
 	local lspd
diff --git a/advtrains_interlocking/ars.lua b/advtrains_interlocking/ars.lua
index 4f50df9..b3065ee 100644
--- a/advtrains_interlocking/ars.lua
+++ b/advtrains_interlocking/ars.lua
@@ -129,29 +129,49 @@ function il.ars_check_rule_match(ars, train)
 		return nil
 end
 
-function advtrains.interlocking.ars_check(sigd, train)
-	local tcbs = il.db.get_tcbs(sigd)
-	if not tcbs or not tcbs.routes then return end
-	
-	if tcbs.ars_disabled or tcbs.ars_ignore_next then
-		-- No-ARS mode of signal.
-		-- ignore...
-		-- Note: ars_ignore_next is set by signalling formspec when route is cancelled
-		tcbs.ars_ignore_next = nil
-		return
-	end
-	
-	if tcbs.routeset then
-		-- ARS is not in effect when a route is already set
-		-- just "punch" routesetting, just in case callback got lost.
-		minetest.after(0, il.route.update_route, sigd, tcbs, nil, nil)
-		return
+function advtrains.interlocking.ars_check(signalpos, train, trig_from_dst)
+	-- check for distant signal
+	-- this whole check must be delayed until after the route setting has taken place, 
+	-- because before that the distant signal is yet unknown
+	if not trig_from_dst then
+		minetest.after(0.5, function()
+			-- does signal have dst?
+			local _, remote = il.signal.get_aspect(signalpos)
+			if remote then
+				advtrains.interlocking.ars_check(remote, train, true)
+			end
+		end)
 	end
-	
-	local rteid = find_rtematch(tcbs.routes, train)
-	if rteid then
-		--delay routesetting, it should not occur inside train step
-		-- using after here is OK because that gets called on every path recalculation
-		minetest.after(0, il.route.update_route, sigd, tcbs, rteid, nil)
+
+	local sigd = il.db.get_sigd_for_signal(signalpos)
+	local tcbs = sigd and il.db.get_tcbs(sigd)
+	-- trigger ARS on this signal
+	if tcbs and tcbs.routes then
+		
+		if tcbs.ars_disabled or tcbs.ars_ignore_next then
+			-- No-ARS mode of signal.
+			-- ignore...
+			-- Note: ars_ignore_next is set by signalling formspec when route is cancelled
+			tcbs.ars_ignore_next = nil
+			return
+		end
+		if trig_from_dst and tcbs.no_dst_ars_trig then
+			-- signal not to be triggered from distant
+			return
+		end
+		
+		if tcbs.routeset then
+			-- ARS is not in effect when a route is already set
+			-- just "punch" routesetting, just in case callback got lost.
+			minetest.after(0, il.route.update_route, sigd, tcbs, nil, nil)
+			return
+		end
+		
+		local rteid = find_rtematch(tcbs.routes, train)
+		if rteid then
+			--delay routesetting, it should not occur inside train step
+			-- using after here is OK because that gets called on every path recalculation
+			minetest.after(0, il.route.update_route, sigd, tcbs, rteid, nil)
+		end
 	end
 end
diff --git a/advtrains_interlocking/route_prog.lua b/advtrains_interlocking/route_prog.lua
index 34807cd..37f751a 100644
--- a/advtrains_interlocking/route_prog.lua
+++ b/advtrains_interlocking/route_prog.lua
@@ -209,7 +209,7 @@ function advtrains.interlocking.visualize_route(origin, route, context, tmp_lcks
 		end
 	-- display locks set by player		
 		for pts, state in pairs(tmp_lcks) do
-			local pos = minetest.string_to_pos(pts)
+			local pos = advtrains.decode_pos(pts)
 			routesprite(context, pos, "fixp"..pts, "at_il_route_lock_edit.png", "Fixed in state '"..state.."' by route "..route.name.." (punch to unfix)",
 				function() clear_lock(tmp_lcks, pname, pts) end)
 		end
@@ -536,7 +536,7 @@ minetest.register_on_punchnode(function(pos, node, player, pointed_thing)
 			return
 		end
 		if advtrains.is_passive(pos) then
-			local pts = advtrains.roundfloorpts(pos)
+			local pts = advtrains.encode_pos(pos)
 			if rp.tmp_lcks[pts] then
 				clear_lock(rp.tmp_lcks, pname, pts)
 			else
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index d619aac..34a273a 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -92,8 +92,8 @@ function ilrs.set_route(signal, route, try)
 		end
 		-- add all from locks, these override the rscache
 		for lpts,lst in pairs(c_rseg.locks) do
-			atdebug("Add lock from Routedef:",lp,"->",lst,"overrides",c_locks[lp] or "none")
-			c_locks[lp] = lst
+			atdebug("Add lock from Routedef:",lpts,"->",lst,"overrides",c_locks[lpts] or "none")
+			c_locks[lpts] = lst
 		end
 		
 		for lp, state in pairs(c_locks) do
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index eddf9da..cede405 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -279,7 +279,7 @@ end
 function signal.get_aspect(pos)
 	local aspt = signal.aspects[advtrains.encode_pos(pos)]
 	local ma,dp = signal.get_aspect_internal(pos, aspt)
-	return ma, advtrains.decode_pos(dp)
+	return ma, dp and advtrains.decode_pos(dp)
 end
 
 local function cache_mainaspects(ndefat)
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index 7f75bb9..82a57cf 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -645,6 +645,7 @@ function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, calle
 				form = form.."button[0.5,8;2.5,1;smartroute;Smart Route]"
 				form = form.."button[  3,8;2.5,1;newroute;New (Manual)]"
 				form = form..string.format("checkbox[0.5,8.75;ars;Automatic routesetting;%s]", not tcbs.ars_disabled)
+				form = form..string.format("checkbox[0.5,9.25;dstarstrig;Distant signal triggers ARS;%s]", not tcbs.no_dst_ars_trig)
 			end
 		elseif sigd_equal(tcbs.route_origin, sigd) then
 			-- something has gone wrong: tcbs.routeset should have been set...
@@ -669,7 +670,7 @@ end
 function advtrains.interlocking.update_player_forms(sigd)
 	for pname, tsigd in pairs(p_open_sig_form) do
 		if advtrains.interlocking.sigd_equal(sigd, tsigd) then
-			advtrains.interlocking.show_signalling_form(sigd, pname, nil)
+			advtrains.interlocking.show_signalling_form(sigd, pname, nil, true)
 		end
 	end
 end
@@ -761,6 +762,10 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			tcbs.ars_disabled = not minetest.is_yes(fields.ars)
 		end
 		
+		if fields.dstarstrig then
+			tcbs.no_dst_ars_trig = not minetest.is_yes(fields.dstarstrig)
+		end
+		
 		if fields.auto then
 			tcbs.route_auto = true
 		end
diff --git a/advtrains_interlocking/train_sections.lua b/advtrains_interlocking/train_sections.lua
index 41da747..083676b 100644
--- a/advtrains_interlocking/train_sections.lua
+++ b/advtrains_interlocking/train_sections.lua
@@ -75,7 +75,10 @@ local function setsection(tid, train, ts_id, ts, sigd)
 	end
 	
 	-- routes
-	local tcbs = advtrains.interlocking.db.get_tcbs(sigd)
+	local tcbs
+	if sigd then
+		tcbs = advtrains.interlocking.db.get_tcbs(sigd)
+	end
 	
 	-- route setting - clear route state
 	if ts.route then
@@ -90,7 +93,7 @@ local function setsection(tid, train, ts_id, ts, sigd)
 		end
 		ts.route = nil
 	end
-	if tcbs.signal then
+	if tcbs and tcbs.signal then
 		-- Reset route and signal
 		-- Note that the hit-route case is already handled by cancel_route_from
 		-- this code only handles signal at entering tcb and also triggers for non-route ts
diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua
index d0ba6cd..c449416 100755
--- a/advtrains_signals_ks/init.lua
+++ b/advtrains_signals_ks/init.lua
@@ -258,16 +258,16 @@ for _, rtab in ipairs({
 	-- Vorsignal (NEU!)
 	for typ, prts in pairs({
 			-- note: the names are taken from the main signal equivalent so that the same names for the lamp images can be used
-			slow   = {asp = advtrains.interlocking.signal.ASPI_HALT, n = "nextslow", ici=true},
+			slow   = {asp = function(pos) return { dst = 0, shunt = true } end, n = "nextslow", ici=true},
 			nextslow = {
 				asp = function(pos)
-					return { dst = getzs3v(pos) or 6 }
+					return { dst = getzs3v(pos) or 6, shunt = true }
 				end,
 				n = "free"
 			},
 			free     = {
 				asp = function(pos)
-					return { dst = -1 }
+					return { dst = -1, shunt = true }
 				end,
 	            n = "slow"
 			},
@@ -399,7 +399,9 @@ for _, rtab in ipairs({
 			drop = "advtrains_signals_ks:"..prefix.."_"..dtyp.."_0",
 			inventory_image = inv,
 			advtrains = {
-				get_aspect_info = asp
+				get_aspect_info = asp,
+				trackworker_next_rot = "advtrains_signals_ks:"..prefix.."_"..typ.."_"..rtab.nextrot,
+				trackworker_rot_incr_param2 = (rot=="60")
 			},
 			on_rightclick = advtrains.interlocking.signal_rc_handler,
 			can_dig = advtrains.interlocking.signal_can_dig,
@@ -506,6 +508,10 @@ for _, rtab in ipairs({
 		t.mesh = "advtrains_signals_ks_zs_top_smr"..rot..".obj"
 		t.drop = "advtrains_signals_ks:zs3_off_0"
 		t.selection_box.fixed[1][5] = 0
+		t.advtrains = {
+				trackworker_next_rot = "advtrains_signals_ks:zs3_"..typ.."_"..rtab.nextrot,
+				trackworker_rot_incr_param2 = (rot=="60")
+			},
 		minetest.register_node("advtrains_signals_ks:zs3_"..typ.."_"..rot, t)
 		--TODO add rotation using trackworker
 
@@ -515,6 +521,10 @@ for _, rtab in ipairs({
 		t.mesh = "advtrains_signals_ks_zs_bottom_smr"..rot..".obj"
 		t.drop = "advtrains_signals_ks:zs3v_off_0"
 		t.tiles[3] = t.tiles[3] .. "^[multiply:yellow"
+		t.advtrains = {
+				trackworker_next_rot = "advtrains_signals_ks:zs3v_"..typ.."_"..rtab.nextrot,
+				trackworker_rot_incr_param2 = (rot=="60")
+			},
 		minetest.register_node("advtrains_signals_ks:zs3v_"..typ.."_"..rot, t)
 		--TODO add rotation using trackworker
 	end
@@ -539,6 +549,10 @@ for _, rtab in ipairs({
 			not_blocking_trains = 1,
 			not_in_creative_inventory = (rtab.ici) and 0 or 1,
 		},
+		advtrains = {
+			trackworker_next_rot = "advtrains_signals_ks:mast_mast_"..rtab.nextrot,
+			trackworker_rot_incr_param2 = (rot=="60")
+		},
 		drop = "advtrains_signals_ks:mast_mast_0",
 	})
 	--TODO add rotation using trackworker
-- 
cgit v1.2.3


From 69e4b8f99aac08c404a733c2338f9de9cddab829 Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Sat, 20 Jul 2024 21:04:17 +0200
Subject: Support signal aspect selection for routes again

---
 advtrains_interlocking/database.lua     |  7 ++++
 advtrains_interlocking/route_ui.lua     | 58 ++++++++++++++++++++++++++-------
 advtrains_interlocking/routesetting.lua | 16 ++++++---
 advtrains_interlocking/signal_api.lua   |  3 +-
 4 files changed, 68 insertions(+), 16 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua
index 49ca13d..a8d9584 100644
--- a/advtrains_interlocking/database.lua
+++ b/advtrains_interlocking/database.lua
@@ -254,6 +254,13 @@ routes = {
 		ars = { <ARS rule definition table> }
 		use_rscache = false -- if true, the track section's rs_cache will be used to set locks in addition to the locks table
 							-- this is disabled for legacy routes, but enabled for all new routes by default
+		-- Fields to specify the signal aspect of the signal
+		main_aspect = "_free" -- The main aspect that the route start signal is to show
+		assign_dst = false  -- Whether to assign distant signal (affects only the signal at the start of the route)
+							-- false: start signal does not set distant signal (the default), for long blocks
+								-- it is assumed that the next main signal will have its own distant sig
+							-- true: start signal sets distant signal to the next signal on the route with route_role "main" (typically the end signal)
+								-- for short blocks where end signal doesn't have its own distant sig
 		-- Fields used by the autorouter:
 		ar_end_sigd = <sigd> -- the sigd describing the end of the route. Used for merging route options on recalculation
 	}
diff --git a/advtrains_interlocking/route_ui.lua b/advtrains_interlocking/route_ui.lua
index 863fe11..b01d449 100644
--- a/advtrains_interlocking/route_ui.lua
+++ b/advtrains_interlocking/route_ui.lua
@@ -3,6 +3,7 @@
 
 local atil = advtrains.interlocking
 local ildb = atil.db
+local F = advtrains.formspec
 
 -- TODO duplicate
 local lntrans = { "A", "B" }
@@ -83,9 +84,32 @@ function atil.show_route_edit_form(pname, sigd, routeid)
 		itab("E (none)")
 	end
 	
-	form = form.."textlist[0.5,2;3,3.9;rtelog;"..table.concat(tab, ",").."]"
+	form = form.."textlist[0.5,2;3.5,3.9;rtelog;"..table.concat(tab, ",").."]"
+	
+	-- to the right of rtelog a signal aspect selection for the start signal
+	form = form..F.label(4.5, 2, "Signal Aspect:")
+	-- main aspect list
+	local signalpos = tcbs.signal
+	local ndef = signalpos and advtrains.ndb.get_ndef(signalpos)
+	if ndef and ndef.advtrains and ndef.advtrains.main_aspects then
+		local entries = { "<Default Aspect>" }
+		local sel = 1
+		for i, mae in ipairs(ndef.advtrains.main_aspects) do
+			entries[i+1] = mae.description
+			if mae.name == route.main_aspect then
+				sel = i+1
+			end
+		end
+		form = form..F.dropdown(4.5, 3.0, 4, "sa_main_aspect", entries, sel, true)
+		-- checkbox for assign distant signal
+		form = form..string.format("checkbox[4.5,4.0;sa_distant;Announce distant signal;%s]", route.assign_dst)
+	end
+	
+	form = form.."button[0.5,6;1,1;prev;<<<]"
+	form = form.."button[1.5,6;1,1;back;Back]"
+	form = form.."button[2.5,6;1,1;next;>>>]"
+	
 	
-	form = form.."button[0.5,6;3,1;back;<<< Back to signal]"
 	if route.smartroute_generated then
 		form = form.."button[3.5,6;2,1;noautogen;Clr Autogen]"
 	end
@@ -123,20 +147,32 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		local route = tcbs.routes[routeid]
 		if not route then return end
 		
+		if fields.prev then
+			atil.show_route_edit_form(pname, sigd, routeid - 1)
+			return
+		end
+		if fields.next then
+			atil.show_route_edit_form(pname, sigd, routeid + 1)
+			return
+		end
+		
 		if fields.setname and fields.name then
 			route.name = fields.name
 		end
 		
-		if fields.aspect then
-			local suppasp = advtrains.interlocking.signal_get_supported_aspects(tcbs.signal)
-			
-			local callback = function(pname, asp)
-				route.aspect = asp
-				advtrains.interlocking.show_route_edit_form(pname, sigd, routeid)
+		if fields.sa_main_aspect then
+			local idx = tonumber(fields.sa_main_aspect)
+			route.main_aspect = nil
+			if idx > 1 then
+				local signalpos = tcbs.signal
+				local ndef = signalpos and advtrains.ndb.get_ndef(signalpos)
+				if ndef and ndef.advtrains and ndef.advtrains.main_aspects then
+					route.main_aspect = ndef.advtrains.main_aspects[idx - 1].name
+				end
 			end
-			
-			advtrains.interlocking.show_signal_aspect_selector(pname, suppasp, route.name, callback, route.aspect or advtrains.interlocking.GENERIC_FREE)
-			return
+		end
+		if fields.sa_distant then
+			route.assign_dst = minetest.is_yes(fields.sa_distant)
 		end
 		
 		if fields.noautogen then
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 34a273a..0207519 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -147,7 +147,7 @@ function ilrs.set_route(signal, route, try)
 					tcbs_ref = c_tcbs,
 					role = ndef and ndef.advtrains and ndef.advtrains.route_role,
 					masp_override = c_rseg.masp_override, --TODO implement masp_override on UI side
-					dst_type = "next_main", --TODO allow user differentiate
+					assign_dst = (i~=1) or route.assign_dst -- Behavior: for first signal assign depending on route.assign_dst, all others always assign
 				}
 				signals[#signals+1] = sig_table
 			end
@@ -171,10 +171,18 @@ function ilrs.set_route(signal, route, try)
 		-- note the signals are iterated backwards. Switch depending on the role
 		local sig = signals[i]
 		-- apply mainaspect
-		sig.tcbs_ref.route_aspect = sig.masp_override or "_default"
+		sig.tcbs_ref.route_aspect = sig.masp_override or route.main_aspect or "_default"
 		if sig.role == "distant" or sig.role == "distant_repeater" or sig.role == "main_distant" then
-			-- assign the remote as the last mainsig
-			sig.tcbs_ref.route_remote = last_mainsig
+			if last_mainsig then
+				-- assign the remote as the last mainsig if desired
+				if sig.assign_dst then
+					sig.tcbs_ref.route_remote = last_mainsig
+				end
+				-- if it wasn't a distant_repeater clear the mainsig
+				if sig.role ~= "distant_repeater" then
+					last_mainsig = false
+				end
+			end
 		end
 		if sig.role == "main" or sig.role == "main_distant" or sig.role == "end" then
 			-- record this as the new last mainsig
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index cede405..bf14247 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -100,7 +100,8 @@ ndef.advtrains = {
 		-- Determines how the signal behaves when routes are set. Only in effect when signal is assigned to a TCB.
 		-- main: The signal is a possible endpoint for a train move route. Distant signals before it refer to it.
 		-- shunt: The signal is a possible endpoint for a shunt move route. Ignored for distant signals.
-		-- distant, distant_repeater: When route is set, signal is always assigned its first main aspect. The next signal with role="main" is set as the remote signal. (currently no further distinction)
+		-- distant, distant_repeater: The next signal with role="main" is set as the remote signal. main_aspects may be undefined, the main aspect passed to apply_aspect is a dummy one in this case.
+		-- distant: if more than one distant signal is before a main signal, only the last one is assigned (but any number of distant_repeater signals are allowed)
 		-- main_distant: Combination of main and distant - like "main", but additionally gets assigned to the next main like a "distant"
 		-- end: like main, but signifies that it marks an end of track and trains cannot continue further. (currently no practical implications above main)
 }
-- 
cgit v1.2.3


From dd883c5b5ec29e11a78d215d8627f71840051eac Mon Sep 17 00:00:00 2001
From: "Y. Wang" <y5nw@protonmail.com>
Date: Fri, 30 Aug 2024 21:57:19 +0000
Subject: Clear tcbs.route_rsn when a route is set

This appears to fix the issue where route_rsn is not cleared and later
shown on the train HUD even when the route is set.

Note that this only works if the route is (successfully) set after this
patch is applied - it does not clear route_rsn for routes that are
already set.

How to test:
* Set a conflicting route for the train.
* Set a route for the train. Note that a message appears on the train
  HUD explaining that the route cannot be set (this is also the current
  behavior without the patch).
* Cancel the conflicting route. Note that the message on the train HUD
  is cleared.
---
 advtrains_interlocking/routesetting.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 67efaea..381fa26 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -113,6 +113,7 @@ function ilrs.set_route(signal, route, try)
 			if c_tcbs.signal then
 				c_tcbs.route_committed = true
 				c_tcbs.aspect = route.aspect or advtrains.interlocking.GENERIC_FREE
+				c_tcbs.route_rsn = nil
 				c_tcbs.route_origin = signal
 				advtrains.interlocking.update_signal_aspect(c_tcbs)
 			end
-- 
cgit v1.2.3


From 8b9eb2a96d9c1c425ff9014fdf27c82526d8376b Mon Sep 17 00:00:00 2001
From: 1F616EMO <root@1f616emo.xyz>
Date: Sun, 29 Sep 2024 06:43:27 +0800
Subject: Fix update_route receiving invalid route ID in after()

---
 advtrains_interlocking/routesetting.lua | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 381fa26..fd6d595 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -292,7 +292,13 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel)
 		end
 		if newrte then tcbs.routeset = newrte end
 		--atdebug("Setting:",tcbs.routeset)
-		local succ, rsn, cbts, cblk = ilrs.set_route(sigd, tcbs.routes[tcbs.routeset])
+		local succ, rsn, cbts, cblk
+		if tcbs.routes[tcbs.routeset] then
+			succ, rsn, cbts, cblk = ilrs.set_route(sigd, tcbs.routes[tcbs.routeset])
+		else
+			succ = false
+			rsn = attrans("Route state changed.")
+		end
 		if not succ then
 			tcbs.route_rsn = rsn
 			--atdebug("Routesetting failed:",rsn)
-- 
cgit v1.2.3


From fe57e7dd089653e2361a4ebb0b34137a3261e198 Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Thu, 14 Nov 2024 00:03:38 +0100
Subject: Add Blocksignal mode for signals to autocreate simple block route

---
 advtrains_interlocking/database.lua     |   7 +-
 advtrains_interlocking/route_prog.lua   |  10 +-
 advtrains_interlocking/route_ui.lua     |   3 +-
 advtrains_interlocking/routesetting.lua |  11 +-
 advtrains_interlocking/signal_api.lua   |   2 +-
 advtrains_interlocking/tcb_ts_ui.lua    | 177 ++++++++++++++++++++++----------
 advtrains_signals_ks/init.lua           |   8 +-
 7 files changed, 143 insertions(+), 75 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua
index a8d9584..e77d073 100644
--- a/advtrains_interlocking/database.lua
+++ b/advtrains_interlocking/database.lua
@@ -261,8 +261,9 @@ routes = {
 								-- it is assumed that the next main signal will have its own distant sig
 							-- true: start signal sets distant signal to the next signal on the route with route_role "main" (typically the end signal)
 								-- for short blocks where end signal doesn't have its own distant sig
-		-- Fields used by the autorouter:
-		ar_end_sigd = <sigd> -- the sigd describing the end of the route. Used for merging route options on recalculation
+		terminal = <sigd> -- the sigd describing the end of the route (e.g. the "next" entry in the final route segment).
+						  -- Might be missing or wrong. Routesetting currently does not care about this value being present.
+		default_autoworking = false -- if true, when route is set autoworking will be by default on. Used for Blocksignal mode
 	}
 }
 
@@ -771,7 +772,7 @@ function ildb.update_rs_cache(ts_id)
 		end
 		-- warn about superfluous entry
 		for sup_end_pkey, sup_entry in pairs(result_table) do
-			--atwarn("In update_rs_cache for section",ts_id,"found superfluous endpoint",sup_end_pkey,"->",sup_entry)
+			atwarn("In update_rs_cache for section",ts_id,"found superfluous endpoint",sup_end_pkey,"->",sup_entry)
 		end
 	end
 	ts.rs_cache = rscache
diff --git a/advtrains_interlocking/route_prog.lua b/advtrains_interlocking/route_prog.lua
index 3ab5686..2f0f8ee 100644
--- a/advtrains_interlocking/route_prog.lua
+++ b/advtrains_interlocking/route_prog.lua
@@ -111,15 +111,7 @@ end
 
 --[[
 Route definition:
-route = {
-	name = <string>
-	[n] = {
-		next = <sigd>, -- of the next (note: next) TCB on the route
-		locks = {<pts> = "state"} -- route locks of this route segment
-	}
-	terminal = <sigd>,
-	aspect = <signal aspect>,--note, might change in future
-}
+=== See database.lua L238
 The first item in the TCB path (namely i=0) is always the start signal of this route,
 so this is left out.
 All subsequent entries, starting from 1, contain:
diff --git a/advtrains_interlocking/route_ui.lua b/advtrains_interlocking/route_ui.lua
index 89580a8..2b79f68 100644
--- a/advtrains_interlocking/route_ui.lua
+++ b/advtrains_interlocking/route_ui.lua
@@ -110,7 +110,7 @@ function atil.show_route_edit_form(pname, sigd, routeid)
 	form = form.."button[2.5,6;1,1;next;>>>]"
 	
 	
-	if route.smartroute_generated then
+	if route.smartroute_generated or route.default_autoworking then
 		form = form.."button[3.5,6;2,1;noautogen;Clr Autogen]"
 	end
 	form = form.."button[5.5,6;3,1;delete;Delete Route]"
@@ -180,6 +180,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		
 		if fields.noautogen then
 			route.smartroute_generated = nil
+			route.default_autoworking = nil
 		end
 		
 		if fields.delete then
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index a72f644..f2a00cd 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -171,7 +171,7 @@ function ilrs.set_route(signal, route, try)
 		-- note the signals are iterated backwards. Switch depending on the role
 		local sig = signals[i]
 		-- apply mainaspect
-		sig.tcbs_ref.route_aspect = sig.masp_override or route.main_aspect or "_default"
+		sig.tcbs_ref.route_aspect = sig.masp_override or "_default" -- or route.main_aspect : TODO this does not work if a distant signal is on the path! Implement per-sig aspects!
 		if sig.role == "distant" or sig.role == "distant_repeater" or sig.role == "main_distant" then
 			if last_mainsig then
 				-- assign the remote as the last mainsig if desired
@@ -192,6 +192,8 @@ function ilrs.set_route(signal, route, try)
 		-- update the signal aspect on map
 		advtrains.interlocking.signal.update_route_aspect(sig.tcbs_ref, i ~= 1)
 	end
+	-- Only for the first signal on the route, set route aspect. TODO: remove when masp_overrides are implemented
+	signal.route_aspect = route.main_aspect or "_default"
 	
 	return true
 end
@@ -366,8 +368,9 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel)
 		if newrte then tcbs.routeset = newrte end
 		--atdebug("Setting:",tcbs.routeset)
 		local succ, rsn, cbts, cblk
-		if tcbs.routes[tcbs.routeset] then
-			succ, rsn, cbts, cblk = ilrs.set_route(sigd, tcbs.routes[tcbs.routeset])
+		local route = tcbs.routes[tcbs.routeset]
+		if route then
+			succ, rsn, cbts, cblk = ilrs.set_route(sigd, route)
 		else
 			succ = false
 			rsn = attrans("Route state changed.")
@@ -390,6 +393,8 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel)
 			--atdebug("Committed Route:",tcbs.routeset)
 			-- set_route now sets the signal aspects
 			--has_changed_aspect = true
+			-- route success. apply default_autoworking flag if requested
+			tcbs.route_auto = route.default_autoworking
 		end
 	end
 	if has_changed_aspect then
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index bf14247..9b0479f 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -312,7 +312,7 @@ function signal.get_aspect_internal(pos, aspt)
 			-- case is fine, distant only signal
 			masp = signal.MASP_DEFAULT
 		else			
-			assert(ndefat.main_aspects, "With named aspects, node needs advtrains.main_aspects table!")
+			assert(ndefat.main_aspects, "With named aspects, node "..node.name.." needs advtrains.main_aspects table!")
 			-- resolve the main aspect from the mainaspects table
 			if not ndefat.main_aspects_lookup then
 				cache_mainaspects(ndefat)
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index e7ff685..1cdbb29 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -618,48 +618,78 @@ function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, calle
 		form = form.."button[0.5,6;  5,1;cancelroute;Cancel Route]"
 	else
 		if not tcbs.route_origin then
-			local strtab = {}
-			for idx, route in ipairs(tcbs.routes) do
-				local clr = ""
-				if route.smartroute_generated then
-					clr = "#FFFF55"
-				end
-				if route.ars then
-					clr = "#FF5555"
-					if route.ars.default then
-						clr = "#55FF55"
+			if #tcbs.routes > 0 then
+				-- at least one route is defined, show normal dialog
+				local strtab = {}
+				for idx, route in ipairs(tcbs.routes) do
+					local clr = ""
+					if route.smartroute_generated then
+						clr = "#FFFF55"
+					end
+					if route.ars then
+						clr = "#FF5555"
+						if route.ars.default then
+							clr = "#55FF55"
+						end
 					end
+					strtab[#strtab+1] = clr .. minetest.formspec_escape(route.name)
 				end
-				strtab[#strtab+1] = clr .. minetest.formspec_escape(route.name)
-			end
-			form = form.."label[0.5,2.5;Routes:]"
-			form = form.."textlist[0.5,3;5,3;rtelist;"..table.concat(strtab, ",")
-			if sel_rte then
-				form = form .. ";" .. sel_rte .."]"
-				form = form.."button[0.5,6;  5,1;setroute;Set Route]"
-				form = form.."button[0.5,7;2,1;dsproute;Show]"
-				if hasprivs then
-					form = form.."button[3.5,7;2,1;editroute;Edit]"
-					if sel_rte > 1 then
-						form = form .. "button[5.5,4;0.5,0.3;moveup;↑]"
+				form = form.."label[0.5,2.5;Routes:]"
+				form = form.."textlist[0.5,3;5,3;rtelist;"..table.concat(strtab, ",")
+				if sel_rte then
+					form = form .. ";" .. sel_rte .."]"
+					form = form.."button[0.5,6;  5,1;setroute;Set Route]"
+					form = form.."button[0.5,7;2,1;dsproute;Show]"
+					if hasprivs then
+						form = form.."button[3.5,7;2,1;editroute;Edit]"
+						if sel_rte > 1 then
+							form = form .. "button[5.5,4;0.5,0.3;moveup;↑]"
+						end
+						if sel_rte < #strtab then
+							form = form .. "button[5.5,4.7;0.5,0.3;movedown;↓]"
+						end
 					end
-					if sel_rte < #strtab then
-						form = form .. "button[5.5,4.7;0.5,0.3;movedown;↓]"
+				else
+					form = form .. "]"
+					if tcbs.ars_disabled then
+						form = form.."label[0.5,6  ;NOTE: ARS is disabled.]"
+						form = form.."label[0.5,6.5;Routes are not automatically set.]"
 					end
 				end
+				if hasprivs then
+					form = form.."button[0.5,8;2.5,1;smartroute;Smart Route]"
+					form = form.."button[  3,8;2.5,1;newroute;New (Manual)]"
+					form = form..string.format("checkbox[0.5,8.75;ars;Automatic routesetting;%s]", not tcbs.ars_disabled)
+					form = form..string.format("checkbox[0.5,9.25;dstarstrig;Distant signal triggers ARS;%s]", not tcbs.no_dst_ars_trig)
+				end
 			else
-				form = form .. "]"
-				if tcbs.ars_disabled then
-					form = form.."label[0.5,6  ;NOTE: ARS is disabled.]"
-					form = form.."label[0.5,6.5;Routes are not automatically set.]"
+				-- no route is active, and no route is so far defined
+				if not tcbs.signal then atwarn("signalling form missing signal?!", pos) return end -- safeguard, nothing else in this function checks tcbs.signal
+				local caps = advtrains.interlocking.signal.get_signal_cap_level(tcbs.signal)
+				if caps >= 3 then
+					-- offer user the "block signal mode"
+					form = form.."label[0.5,2.5;No routes are yet defined.]"
+					if hasprivs then
+						form = form.."button[0.5,4;2.5,1;smartroute;Smart Route]"
+						form = form.."button[  3,4;2.5,1;newroute;New (Manual)]"
+						
+						form = form.."label[0.5,5.5;Setup block signal route (up to following signal):]"
+						form = form.."button[0.5,6;2.5,1;setupblocklong;Long (No Dst)]"
+						form = form.."tooltip[setupblocklong;Following track section must have no turnouts and end at another signal.\n"
+								.."Sets a route into the section ahead with auto-working set on\n"
+								.."Long block: This signal does not become distant signal.]"
+						form = form.."button[  3,6;2.5,1;setupblockshort;Short (With Dst)]"
+						form = form.."tooltip[setupblockshort;Following track section must have no turnouts and end at another signal.\n"
+								.."Sets a route into the section ahead with auto-working set on\n"
+								.."Short block: This signal becomes distant signal for next signal.]"
+					end
+				else
+					-- signal caps say it cannot be route start/end
+					form = form.."label[0.5,2.5;This is a Non-Halt signal (e.g. pure distant signal)\n"
+								.."No route is currently set through.]"
 				end
 			end
-			if hasprivs then
-				form = form.."button[0.5,8;2.5,1;smartroute;Smart Route]"
-				form = form.."button[  3,8;2.5,1;newroute;New (Manual)]"
-				form = form..string.format("checkbox[0.5,8.75;ars;Automatic routesetting;%s]", not tcbs.ars_disabled)
-				form = form..string.format("checkbox[0.5,9.25;dstarstrig;Distant signal triggers ARS;%s]", not tcbs.no_dst_ars_trig)
-			end
+			
 		elseif sigd_equal(tcbs.route_origin, sigd) then
 			-- something has gone wrong: tcbs.routeset should have been set...
 			form = form.."label[0.5,2.5;Inconsistent state: route_origin is same TCBS but no route set. Try again.]"
@@ -753,6 +783,63 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 				tcbs.ars_ignore_next = nil
 				return
 			end
+			if (fields.setupblocklong or fields.setupblockshort) and hasprivs then
+				-- check adjacent section
+				if not tcbs.ts_id then
+					minetest.chat_send_player(pname, "Block route not possible: No track section ahead")
+					return
+				end
+				local ts = ildb.get_ts(tcbs.ts_id)
+				if #ts.tc_breaks ~= 2 then
+					minetest.chat_send_player(pname, "Block route not possible: Section "..(ts.name or "-").." ("..tcbs.ts_id..") has "..#ts.tc_breaks.." ends, must be 2")
+					return
+				end
+				local e_sigd
+				if vector.equals(ts.tc_breaks[1].p, pos) then
+					e_sigd = { p = ts.tc_breaks[2].p,
+							   s = ts.tc_breaks[2].s==1 and 2 or 1}
+				elseif vector.equals(ts.tc_breaks[2].p, pos) then
+					e_sigd = { p = ts.tc_breaks[1].p,
+							   s = ts.tc_breaks[1].s==1 and 2 or 1}
+				else
+					minetest.chat_send_player(pname, "Block route not possible: Section "..(ts.name or "-").." ("..tcbs.ts_id..") TCBs are inconsistent, check section!")
+					return
+				end
+				local e_tcbs = ildb.get_tcbs(e_sigd)
+				if not e_tcbs then
+					minetest.chat_send_player(pname, "Block route not possible: Adjacent TCB not found, check section!")
+					return
+				end
+				-- now we have the TCB at the end of the following section. check that signal is set
+				if not e_tcbs.signal then
+					minetest.chat_send_player(pname, "Block route not possible: Adjacent TCB has no signal assigned!")
+					return
+				end
+				local caps = advtrains.interlocking.signal.get_signal_cap_level(e_tcbs.signal)
+				if caps < 3 then
+					minetest.chat_send_player(pname, "Block route not possible: Following signal is not capable of displaying a Halt aspect (caplevel "..caps..")")
+					return
+				end
+				-- all preconditions checked! go ahead and create route
+				local route = {
+					name = "BS",
+					[1] = {
+						next = e_sigd, -- of the next (note: next) TCB on the route
+						locks = {} -- route locks of this route segment
+					},
+					terminal = e_sigd,
+					use_rscache = true,
+					-- main_aspect = <use default>
+					assign_dst = fields.setupblockshort and true, -- assign dst, if short block was selected
+					default_autoworking = true,
+				}
+				local rid = #tcbs.routes + 1 -- typically 1
+				tcbs.routes[rid] = route
+				-- directly set our newly created route
+				ilrs.update_route(sigd, tcbs, rid)
+				advtrains.interlocking.show_signalling_form(sigd, pname, nil, true)
+				return
+			end
 			if sel_rte and tcbs.routes[sel_rte] then
 				if fields.setroute then
 					ilrs.update_route(sigd, tcbs, sel_rte)
@@ -764,8 +851,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 				end
 				if fields.editroute and hasprivs then
 					advtrains.interlocking.show_route_edit_form(pname, sigd, sel_rte)
-					--local rte = tcbs.routes[sel_rte]
-					--minetest.show_formspec(pname, formname.."_renroute_"..sel_rte, "field[name;Enter new route name;"..rte.name.."]")
 					return
 				end
 			end
@@ -803,24 +888,4 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, true)
 		return
 	end
-	
-	
-	if not hasprivs then return end
-	-- rename route
-	local rind, rte_id
-	pts, connids, rind = string.match(formname, "^at_il_signalling_([^_]+)_(%d)_renroute_(%d+)$")
-	if pts then
-		pos = minetest.string_to_pos(pts)
-		connid = tonumber(connids)
-		rte_id = tonumber(rind)
-		if not connid or connid<1 or connid>2 then return end
-	end
-	if pos and connid and rind and fields.name then
-		local sigd = {p=pos, s=connid}
-		local tcbs = ildb.get_tcbs(sigd)
-		if tcbs.routes[rte_id] then
-			tcbs.routes[rte_id].name = fields.name
-			advtrains.interlocking.show_signalling_form(sigd, pname)
-		end
-	end
 end)
diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua
index c0e74ea..a85bec9 100755
--- a/advtrains_signals_ks/init.lua
+++ b/advtrains_signals_ks/init.lua
@@ -161,7 +161,7 @@ end
 
 -- Main aspects shunt signal
 -- Shunt signals have only two states, distant doesn't matter
-local mainaspects_shunt = {
+local mainaspects_ra = {
 	{
 		name = "shunt",
 		description = "Shunt",
@@ -335,6 +335,10 @@ for _, rtab in ipairs({
 		}) do
 		local sbox = table.copy(rtab.sbox)
 		sbox[5] = 0
+		local afunc = prts.asp
+		if type(afunc) == "table" then
+			afunc = function() return prts.asp end
+		end
 		minetest.register_node("advtrains_signals_ks:ra_"..typ.."_"..rot, {
 			description = "Ks Shunting Signal",
 			drawtype = "mesh",
@@ -366,7 +370,7 @@ for _, rtab in ipairs({
 			advtrains = {
 				main_aspects = mainaspects_ra,
 				apply_aspect = applyaspectf_ra(rot),
-				get_aspect_info = prts.asp,
+				get_aspect_info = afunc,
 				route_role = "shunt",
 				trackworker_next_rot = "advtrains_signals_ks:ra_"..typ.."_"..rtab.nextrot,
 				trackworker_rot_incr_param2 = (rot=="60")
-- 
cgit v1.2.3


From 95faa8f1baa68c3f6a104160d61713ade276676b Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Mon, 25 Nov 2024 22:36:23 +0100
Subject: Remove debug prints of distant signalling system

---
 advtrains_interlocking/routesetting.lua |  4 ++--
 advtrains_interlocking/signal_api.lua   | 14 +++++++-------
 advtrains_interlocking/tcb_ts_ui.lua    |  1 -
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index f2a00cd..5d7357d 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -83,7 +83,7 @@ function ilrs.set_route(signal, route, try)
 			end_pkey = advtrains.encode_pos(c_rseg.next.p)
 			if c_ts.rs_cache[start_pkey] and c_ts.rs_cache[start_pkey][end_pkey] then
 				for lp,lst in pairs(c_ts.rs_cache[start_pkey][end_pkey]) do
-					atdebug("Add lock from RSCache:",lp,"->",lst)
+					--atdebug("Add lock from RSCache:",lp,"->",lst)
 					c_locks[lp] = lst
 				end
 			elseif not try then
@@ -92,7 +92,7 @@ function ilrs.set_route(signal, route, try)
 		end
 		-- add all from locks, these override the rscache
 		for lpts,lst in pairs(c_rseg.locks) do
-			atdebug("Add lock from Routedef:",lpts,"->",lst,"overrides",c_locks[lpts] or "none")
+			--atdebug("Add lock from Routedef:",lpts,"->",lst,"overrides",c_locks[lpts] or "none")
 			c_locks[lpts] = lst
 		end
 		
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index 8347b1c..a7ef724 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -179,7 +179,7 @@ function signal.set_aspect(pos, main_asp, rem_pos, skip_dst_notify)
 	
 	-- if remote has changed, unregister from old remote
 	if old_remote and old_remote~=new_remote and signal.distant_refs[old_remote] then
-		atdebug("unregister old remote: ",old_remote,"from",main_pts)
+		--atdebug("unregister old remote: ",old_remote,"from",main_pts)
 		signal.distant_refs[old_remote][main_pts] = nil
 	end
 		
@@ -231,12 +231,12 @@ end
 -- Notify distant signals of main_pts of a change in the aspect of this signal
 -- 
 function signal.notify_distants_of(main_pts, limit)
-	atdebug("notify_distants_of",advtrains.decode_pos(main_pts),"limit",limit)
+	--atdebug("notify_distants_of",advtrains.decode_pos(main_pts),"limit",limit)
 	if limit <= 0 then
 		return
 	end
 	local dstrefs = signal.distant_refs[main_pts]
-	atdebug("dstrefs",dstrefs,"")
+	--atdebug("dstrefs",dstrefs,"")
 	if dstrefs then
 		for dst,_ in pairs(dstrefs) do
 			-- ensure that the backref is still valid
@@ -336,7 +336,7 @@ function signal.get_aspect_info(pos)
 			ai = ai(pos, masp)
 		end
 		if type(ai)=="table" then
-			atdebug(pos,"aspectinfo",ai)
+			--atdebug(pos,"aspectinfo",ai)
 			return ai
 		else
 			error("For node "..node.name..": ndef.advtrains.get_aspect_info must be function or table")
@@ -355,7 +355,7 @@ end
 function signal.reapply_aspect(pts)
 	-- get aspt
 	local aspt = signal.aspects[pts]
-	atdebug("reapply_aspect",advtrains.decode_pos(pts),"aspt",aspt)
+	--atdebug("reapply_aspect",advtrains.decode_pos(pts),"aspt",aspt)
 	local pos = advtrains.decode_pos(pts)
 	-- resolve mainaspect table by name
 	local masp, remote, node, ndef = signal.get_aspect_internal(pos, aspt)
@@ -368,7 +368,7 @@ function signal.reapply_aspect(pts)
 		end
 		signal.distant_refs[remote][pts] = true
 		local rem_aspt = signal.aspects[remote]
-		atdebug("resolving remote",advtrains.decode_pos(remote),"aspt",rem_aspt)
+		--atdebug("resolving remote",advtrains.decode_pos(remote),"aspt",rem_aspt)
 		local rem_pos = advtrains.decode_pos(remote)
 		rem_masp, _, _, rem_ndef = signal.get_aspect_internal(rem_pos, rem_aspt)
 		if rem_masp then
@@ -378,7 +378,7 @@ function signal.reapply_aspect(pts)
 		end
 	end
 	-- call into ndef
-	atdebug("applying to",pos,": main_asp",masp,"rem_masp",rem_masp,"rem_aspi",rem_aspi)
+	--atdebug("applying to",pos,": main_asp",masp,"rem_masp",rem_masp,"rem_aspi",rem_aspi)
 	if ndef.advtrains and ndef.advtrains.apply_aspect then
 		ndef.advtrains.apply_aspect(pos, node, masp, rem_masp, rem_aspi)
 	end
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index 2b93234..54ffe9b 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -218,7 +218,6 @@ end)
 --                          (this is useful for buffers as they serve both as TCB and as an always-halt signal)
 function advtrains.interlocking.self_tcb_make_after_place_callback(fail_silently_on_noprivs, auto_create_self_signal)
 	return function(pos, player, itemstack, pointed_thing)
-		atdebug("selftcb apn ",pos, player, itemstack, pointed_thing)
 		local pname = player:get_player_name()
 		if not minetest.check_player_privs(pname, "interlocking") then
 			if not fail_silently_on_noprivs then
-- 
cgit v1.2.3


From a8d53ea2484463f7fc8329cb67b56e4d0f321dbd Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Mon, 25 Nov 2024 22:39:48 +0100
Subject: Clear route_rsn when route commit succeeds and on section entering

---
 advtrains_interlocking/routesetting.lua   | 3 ++-
 advtrains_interlocking/train_sections.lua | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 5d7357d..669a604 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -348,6 +348,8 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel)
 		--atdebug("Signal not in control, held by",tcbs.signal_name)
 		return
 	end
+	-- clear route_rsn, it will be set again if needed
+	tcbs.route_rsn = nil
 	if (newrte and tcbs.routeset and tcbs.routeset ~= newrte) or cancel then
 		if tcbs.route_committed then
 			--atdebug("Cancelling:",tcbs.routeset)
@@ -359,7 +361,6 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel)
 		has_changed_aspect = true
 		tcbs.routeset = nil
 		tcbs.route_auto = nil
-		tcbs.route_rsn = nil
 	end
 	if newrte or tcbs.routeset then
 		if tcbs.route_committed then
diff --git a/advtrains_interlocking/train_sections.lua b/advtrains_interlocking/train_sections.lua
index 083676b..48e3342 100644
--- a/advtrains_interlocking/train_sections.lua
+++ b/advtrains_interlocking/train_sections.lua
@@ -101,6 +101,7 @@ local function setsection(tid, train, ts_id, ts, sigd)
 		tcbs.route_aspect = nil
 		tcbs.route_remote = nil
 		tcbs.route_origin = nil
+		tcbs.route_rsn = nil
 		if not tcbs.route_auto then
 			tcbs.routeset = nil
 		end
-- 
cgit v1.2.3


From ced8d8998de6b2cb6a758224641c125d02efea41 Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Thu, 5 Dec 2024 23:31:11 +0100
Subject: Route Edit: Support aspect selection per signal, support call-on
 routes

---
 advtrains_interlocking/route_ui.lua     | 148 +++++++++++++++++++++++---------
 advtrains_interlocking/routesetting.lua |  23 +++--
 advtrains_interlocking/tcb_ts_ui.lua    |   4 +-
 3 files changed, 125 insertions(+), 50 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/route_ui.lua b/advtrains_interlocking/route_ui.lua
index 2b79f68..2b7e2e5 100644
--- a/advtrains_interlocking/route_ui.lua
+++ b/advtrains_interlocking/route_ui.lua
@@ -11,9 +11,10 @@ local function sigd_to_string(sigd)
 	return minetest.pos_to_string(sigd.p).." / "..lntrans[sigd.s]
 end
 
+-- indexed by pname
+local sel_rpartcache = {}
 
-
-function atil.show_route_edit_form(pname, sigd, routeid)
+function atil.show_route_edit_form(pname, sigd, routeid, sel_rpartidx)
 
 	if not minetest.check_player_privs(pname, {train_operator=true, interlocking=true}) then
 		minetest.chat_send_player(pname, "Insufficient privileges to use this!")
@@ -31,10 +32,12 @@ function atil.show_route_edit_form(pname, sigd, routeid)
 	
 	-- construct textlist for route information
 	local tab = {}
-	local function itab(t)
+	local tabref = {}
+	local function itab(rseg, t, rty, rpara)
 		tab[#tab+1] = minetest.formspec_escape(string.gsub(t, ",", " "))
+		tabref[#tab] = { [rty] = true, param = rpara, seg = rseg, idx = #tab }
 	end
-	itab("("..(tcbs.signal_name or "+")..") Route #"..routeid)
+	itab(1, "("..(tcbs.signal_name or "+")..") Route #"..routeid, "signal", sigd)
 	
 	-- this code is partially copy-pasted from routesetting.lua
 	-- we start at the tc designated by signal
@@ -44,12 +47,12 @@ function atil.show_route_edit_form(pname, sigd, routeid)
 	while c_sigd and i<=#route do
 		c_tcbs = ildb.get_tcbs(c_sigd)
 		if not c_tcbs then
-			itab("-!- No TCBS at "..sigd_to_string(c_sigd)..". Please reconfigure route!")
+			itab(i, "-!- No TCBS at "..sigd_to_string(c_sigd)..". Please reconfigure route!", "err", nil)
 			break
 		end
 		c_ts_id = c_tcbs.ts_id
 		if not c_ts_id then
-			itab("-!- No track section adjacent to "..sigd_to_string(c_sigd)..". Please reconfigure route!")
+			itab(i, "-!- No track section adjacent to "..sigd_to_string(c_sigd)..". Please reconfigure route!", "err", nil)
 			break
 		end
 		c_ts = ildb.get_ts(c_ts_id)
@@ -57,16 +60,18 @@ function atil.show_route_edit_form(pname, sigd, routeid)
 		c_rseg = route[i]
 		c_lckp = {}
 		
-		itab(""..i.." "..sigd_to_string(c_sigd))
-		itab("= "..(c_ts and c_ts.name or "-").." =")
+		local signame = "-"
+		if c_tcbs and c_tcbs.signal then signame = c_tcbs.signal_name or "o" end
+		itab(i, ""..i.." "..sigd_to_string(c_sigd).." ("..signame..")", "signal", c_sigd)
+		itab(i, "= "..(c_ts and c_ts.name or c_ts_id).." ="..(c_rseg.call_on and " [CO]" or ""), "section", c_ts_id)
 		
 		if c_rseg.locks then
 			for pts, state in pairs(c_rseg.locks) do
 				
 				local pos = minetest.string_to_pos(pts)
-				itab("L "..pts.." -> "..state)
+				itab(i, "L "..pts.." -> "..state, "lock", pos)
 				if not advtrains.is_passive(pos) then
-					itab("-!- No passive component at "..pts..". Please reconfigure route!")
+					itab(i, "-!- No passive component at "..pts..". Please reconfigure route!", "err", nil)
 					break
 				end
 			end
@@ -78,31 +83,61 @@ function atil.show_route_edit_form(pname, sigd, routeid)
 	if c_sigd then
 		local e_tcbs = ildb.get_tcbs(c_sigd)
 		local signame = "-"
-		if e_tcbs and e_tcbs.signal then signame = e_tcbs.signal_name or "+" end
-		itab("E "..sigd_to_string(c_sigd).." ("..signame..")")
+		if e_tcbs and e_tcbs.signal then signame = e_tcbs.signal_name or "o" end
+		itab(i, "E "..sigd_to_string(c_sigd).." ("..signame..")", "end", c_sigd)
 	else
-		itab("E (none)")
+		itab(i, "E (none)", "end", nil)
 	end
 	
-	form = form.."textlist[0.5,2;3.5,3.9;rtelog;"..table.concat(tab, ",").."]"
+	if not sel_rpartidx then sel_rpartidx = 1 end
+	form = form.."textlist[0.5,2;3.5,3.9;routelog;"..table.concat(tab, ",")..";"..(sel_rpartidx or 1)..";false]"
+	
+	-- to the right of rtelog, controls are displayed for the thing in focus
+	-- What is in focus is determined by the parameter sel_rpartidx
+	
+	local sel_rpart = tabref[sel_rpartidx]
+	atdebug("sel rpart",sel_rpart)
 	
-	-- to the right of rtelog a signal aspect selection for the start signal
-	form = form..F.label(4.5, 2, "Signal Aspect:")
-	-- main aspect list
-	local signalpos = tcbs.signal
-	local ndef = signalpos and advtrains.ndb.get_ndef(signalpos)
-	if ndef and ndef.advtrains and ndef.advtrains.main_aspects then
-		local entries = { "<Default Aspect>" }
-		local sel = 1
-		for i, mae in ipairs(ndef.advtrains.main_aspects) do
-			entries[i+1] = mae.description
-			if mae.name == route.main_aspect then
-				sel = i+1
+	if sel_rpart and sel_rpart.signal then
+		-- get TCBS here and rseg selected
+		local s_tcbs = ildb.get_tcbs(sel_rpart.param)
+		local rseg = route[sel_rpart.seg]
+		-- main aspect list
+		local signalpos = s_tcbs and s_tcbs.signal
+		if signalpos and rseg then
+			form = form..F.label(4.5, 2, "Signal Aspect:")
+			local ndef = signalpos and advtrains.ndb.get_ndef(signalpos)
+			if ndef and ndef.advtrains and ndef.advtrains.main_aspects then
+				local entries = { "<Default Aspect>" }
+				local sel = 1
+				for i, mae in ipairs(ndef.advtrains.main_aspects) do
+					entries[i+1] = mae.description
+					if mae.name == rseg.main_aspect then
+						sel = i+1
+					end
+				end
+				form = form..F.dropdown(4.5, 3.0, 4, "sa_main_aspect", entries, sel, true)
+			end
+			-- checkbox for assign distant signal
+			local assign_dst = rseg.assign_dst
+			if assign_dst == nil then
+				assign_dst = (sel_rpart.seg~=1) -- special behavior when assign_dst is nil (and not false):
+				-- defaults to false for the very first signal and true for all others (= minimal user configuration overhead)
+				-- Note: on save, the value will be fixed at either false or true
 			end
+			form = form..string.format("checkbox[4.5,4.0;sa_distant;Announce distant signal;%s]", assign_dst)
+		else
+			form = form..F.label(4.5, 2, "No Signal at this TCB")
 		end
-		form = form..F.dropdown(4.5, 3.0, 4, "sa_main_aspect", entries, sel, true)
-		-- checkbox for assign distant signal
-		form = form..string.format("checkbox[4.5,4.0;sa_distant;Announce distant signal;%s]", route.assign_dst)
+	elseif sel_rpart and sel_rpart.section then
+		local rseg = route[sel_rpart.seg]
+		if rseg then
+			form = form..F.label(4.5, 2, "Section Options:")
+			-- checkbox for call-on
+			form = form..string.format("checkbox[4.5,4.0;se_callon;Call-on (section may be occupied);%s]", rseg.call_on)
+		end
+	else
+		form = form..F.label(4.5, 2, "<< Select a route part to edit options")
 	end
 	
 	form = form.."button[0.5,6;1,1;prev;<<<]"
@@ -123,13 +158,18 @@ function atil.show_route_edit_form(pname, sigd, routeid)
 	form = form.."textarea[0.8,8.3;5,3;ars;ARS Rule List;"..atil.ars_to_text(route.ars).."]"
 	form = form.."button[5.5,8.23;3,1;savears;Save ARS List]"
 	
-	minetest.show_formspec(pname, "at_il_routeedit_"..minetest.pos_to_string(sigd.p).."_"..sigd.s.."_"..routeid, form)
-
+	local formname = "at_il_routeedit_"..minetest.pos_to_string(sigd.p).."_"..sigd.s.."_"..routeid
+	minetest.show_formspec(pname, formname, form)
+	-- record selected entry from routelog for receive fields callback
+	sel_rpartcache[pname] = sel_rpart
 end
 
 
 minetest.register_on_player_receive_fields(function(player, formname, fields)
 	local pname = player:get_player_name()
+	-- retreive sel_rpart from the cache in any case and clear it out
+	local sel_rpart = sel_rpartcache[pname]
+	sel_rpartcache[pname] = nil
 	if not minetest.check_player_privs(pname, {train_operator=true, interlocking=true}) then
 		return
 	end
@@ -163,19 +203,34 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			route.name = fields.name
 		end
 		
-		if fields.sa_main_aspect then
+		if fields.sa_main_aspect and sel_rpart and sel_rpart.signal then
 			local idx = tonumber(fields.sa_main_aspect)
-			route.main_aspect = nil
-			if idx > 1 then
-				local signalpos = tcbs.signal
-				local ndef = signalpos and advtrains.ndb.get_ndef(signalpos)
-				if ndef and ndef.advtrains and ndef.advtrains.main_aspects then
-					route.main_aspect = ndef.advtrains.main_aspects[idx - 1].name
+			-- get TCBS here and rseg selected
+			local s_tcbs = ildb.get_tcbs(sel_rpart.param)
+			local rseg = route[sel_rpart.seg]
+			-- main aspect list
+			local signalpos = s_tcbs and s_tcbs.signal
+			if rseg then
+				rseg.main_aspect = nil
+				if idx > 1 then
+					local ndef = signalpos and advtrains.ndb.get_ndef(signalpos)
+					if ndef and ndef.advtrains and ndef.advtrains.main_aspects then
+						rseg.main_aspect = ndef.advtrains.main_aspects[idx - 1].name
+					end
 				end
 			end
 		end
-		if fields.sa_distant then
-			route.assign_dst = minetest.is_yes(fields.sa_distant)
+		if fields.sa_distant and sel_rpart and sel_rpart.signal then
+			local rseg = route[sel_rpart.seg]
+			if rseg then
+				rseg.assign_dst = minetest.is_yes(fields.sa_distant)
+			end
+		end
+		if fields.se_callon and sel_rpart and sel_rpart.section then
+			local rseg = route[sel_rpart.seg]
+			if rseg then
+				rseg.call_on = minetest.is_yes(fields.se_callon)
+			end
 		end
 		
 		if fields.noautogen then
@@ -214,6 +269,19 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		
 		if fields.back then
 			advtrains.interlocking.show_signalling_form(sigd, pname)
+			return
+		end
+		
+		-- if an entry was selected in the textlist (and its not the current one) update the form
+		if fields.routelog then
+			local prev_idx = sel_rpart and sel_rpart.idx or 1
+			local tev = minetest.explode_textlist_event(fields.routelog)
+			local new_idx = tev and tev.index
+			atdebug("routelog sel",prev_idx,new_idx)
+			if new_idx and new_idx ~= prev_idx then
+				atil.show_route_edit_form(pname, sigd, routeid, new_idx)
+				return
+			end
 		end
 		
 	end
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 669a604..95ca63c 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -45,7 +45,7 @@ function ilrs.set_route(signal, route, try)
 	local rtename = route.name
 	local signalname = (ildb.get_tcbs(signal).signal_name or "") .. sigd_to_string(signal)
 	local c_tcbs, c_ts_id, c_ts, c_rseg, c_lckp
-	-- signals = { { pos = ., tcbs_ref = <tcbs>, role = "main_distant", masp_override = nil, dst_type = "next_main" or "none" } 
+	-- signals = { { pos = ., tcbs_ref = <tcbs>, role = "main_distant", main_aspect = nil, dst_type = "next_main" or "none" } 
 	local signals = {}
 	local nodst
 	while c_sigd and i<=#route do
@@ -71,8 +71,12 @@ function ilrs.set_route(signal, route, try)
 			return false, "Section '"..(c_ts.name or c_ts_id).."' already has route set from "..sigd_to_string(c_ts.route.origin)..":\n"..c_ts.route.rsn, c_ts_id, nil
 		end
 		if c_ts.trains and #c_ts.trains>0 then
-			if not try then atwarn("Encountered ts occupied during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end
-			return false, "Section '"..(c_ts.name or c_ts_id).."' is occupied!", c_ts_id, nil
+			if c_rseg.call_on then
+				--atdebug("Routesetting: Call-on situation in", c_ts_id)
+			else
+				if not try then atwarn("Encountered ts occupied during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end
+				return false, "Section '"..(c_ts.name or c_ts_id).."' is occupied!", c_ts_id, nil
+			end
 		end
 		
 		-- collect locks from rs cache and from route def
@@ -142,12 +146,17 @@ function ilrs.set_route(signal, route, try)
 				c_tcbs.route_origin = signal
 				-- determine route role
 				local ndef = advtrains.ndb.get_ndef(c_tcbs.signal)
+				local assign_dst = c_rseg.assign_dst
+				if assign_dst == nil then
+					assign_dst = (i~=1) -- special behavior when assign_dst is nil (and not false):
+					-- defaults to false for the very first signal and true for all others (= minimal user configuration overhead)
+				end
 				local sig_table = {
 					pos = c_tcbs.signal,
 					tcbs_ref = c_tcbs,
 					role = ndef and ndef.advtrains and ndef.advtrains.route_role,
-					masp_override = c_rseg.masp_override, --TODO implement masp_override on UI side
-					assign_dst = (i~=1) or route.assign_dst -- Behavior: for first signal assign depending on route.assign_dst, all others always assign
+					main_aspect = c_rseg.main_aspect,
+					assign_dst = assign_dst
 				}
 				signals[#signals+1] = sig_table
 			end
@@ -171,7 +180,7 @@ function ilrs.set_route(signal, route, try)
 		-- note the signals are iterated backwards. Switch depending on the role
 		local sig = signals[i]
 		-- apply mainaspect
-		sig.tcbs_ref.route_aspect = sig.masp_override or "_default" -- or route.main_aspect : TODO this does not work if a distant signal is on the path! Implement per-sig aspects!
+		sig.tcbs_ref.route_aspect = sig.main_aspect or "_default" -- or route.main_aspect : TODO this does not work if a distant signal is on the path! Implement per-sig aspects!
 		if sig.role == "distant" or sig.role == "distant_repeater" or sig.role == "main_distant" then
 			if last_mainsig then
 				-- assign the remote as the last mainsig if desired
@@ -192,8 +201,6 @@ function ilrs.set_route(signal, route, try)
 		-- update the signal aspect on map
 		advtrains.interlocking.signal.update_route_aspect(sig.tcbs_ref, i ~= 1)
 	end
-	-- Only for the first signal on the route, set route aspect. TODO: remove when masp_overrides are implemented
-	signal.route_aspect = route.main_aspect or "_default"
 	
 	return true
 end
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index bc52339..dfb2714 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -1008,12 +1008,12 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 					name = "BS",
 					[1] = {
 						next = e_sigd, -- of the next (note: next) TCB on the route
-						locks = {} -- route locks of this route segment
+						locks = {}, -- route locks of this route segment
+						assign_dst = fields.setupblockshort and true, -- assign dst, if short block was selected
 					},
 					terminal = e_sigd,
 					use_rscache = true,
 					-- main_aspect = <use default>
-					assign_dst = fields.setupblockshort and true, -- assign dst, if short block was selected
 					default_autoworking = true,
 				}
 				local rid = #tcbs.routes + 1 -- typically 1
-- 
cgit v1.2.3


From 7d5f840579b74374698704f256479520bde25091 Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Fri, 13 Dec 2024 00:23:18 +0100
Subject: Repair sections on smartroute, detect start!=end TS in routesetting,
 create section with IL tool aux1

---
 advtrains_interlocking/database.lua     | 18 +++++++++++-------
 advtrains_interlocking/route_ui.lua     | 13 ++++++++++++-
 advtrains_interlocking/routesetting.lua | 10 +++++++++-
 advtrains_interlocking/smartroute.lua   | 23 ++++++++++++++++++-----
 advtrains_interlocking/tcb_ts_ui.lua    | 10 +++++++++-
 advtrains_interlocking/tool.lua         | 16 ++++++++++------
 6 files changed, 69 insertions(+), 21 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua
index 3104a20..f84f60b 100644
--- a/advtrains_interlocking/database.lua
+++ b/advtrains_interlocking/database.lua
@@ -351,7 +351,7 @@ end
 -- Returns:
 -- ts_id - the track section that was found
 -- nil - No track section exists
-function ildb.check_and_repair_ts_at_pos(pos, tcb_connid, notify_pname)
+function ildb.check_and_repair_ts_at_pos(pos, tcb_connid, notify_pname, force_create)
 	--atdebug("check_and_repair_ts_at_pos", pos, tcb_connid)
 	-- check prereqs
 	if ildb.get_tcb(pos) then
@@ -378,7 +378,7 @@ function ildb.check_and_repair_ts_at_pos(pos, tcb_connid, notify_pname)
 				-- inconsistency is found, repair it
 				--atdebug("check_and_repair_ts_at_pos: Inconsistency is found!")
 				tsrepair_notify(notify_pname, "Track section inconsistent here, repairing...")
-				return ildb.repair_ts_merge_all(all_tcbs, false, notify_pname)
+				return ildb.repair_ts_merge_all(all_tcbs, force_create, notify_pname)
 				-- Step2 check is no longer necessary since we just created that new section
 			end
 		end
@@ -386,9 +386,13 @@ function ildb.check_and_repair_ts_at_pos(pos, tcb_connid, notify_pname)
 	-- only one found (it is either nil or a ts id)
 	--atdebug("check_and_repair_ts_at_pos: TS consistent id=",ts_id,"")
 	if not ts_id then
-		tsrepair_notify(notify_pname, "No track section found here.")
-		return
-		-- All TCBs agreed that there is no section here.
+		if force_create and next(all_tcbs) then --ensure at least one tcb is in list
+			return ildb.repair_ts_merge_all(all_tcbs, force_create, notify_pname)
+		else
+			--tsrepair_notify(notify_pname, "No track section found here.")
+			return nil
+			-- All TCBs agreed that there is no section here
+		end
 	end
 	
 	local ts = ildb.get_ts(ts_id)
@@ -403,9 +407,9 @@ function ildb.check_and_repair_ts_at_pos(pos, tcb_connid, notify_pname)
 	if #ts.tc_breaks ~= #all_tcbs then
 		--atdebug("check_and_repair_ts_at_pos: Partition is found!")
 		tsrepair_notify(notify_pname, "Track section partition found, repairing...")
-		return ildb.repair_ts_merge_all(all_tcbs, false, notify_pname)
+		return ildb.repair_ts_merge_all(all_tcbs, force_create, notify_pname)
 	end
-	tsrepair_notify(notify_pname, "Found section", ts.name or ts_id, "here.")
+	--tsrepair_notify(notify_pname, "Found section", ts.name or ts_id, "here.")
 	return ts_id
 end
 
diff --git a/advtrains_interlocking/route_ui.lua b/advtrains_interlocking/route_ui.lua
index b75f9d7..7dddc6e 100644
--- a/advtrains_interlocking/route_ui.lua
+++ b/advtrains_interlocking/route_ui.lua
@@ -75,8 +75,17 @@ function atil.show_route_edit_form(pname, sigd, routeid, sel_rpartidx)
 				end
 			end
 		end
+		-- sanity check, is section at next the same as the current?
+		local nvar = c_rseg.next
+		if nvar then
+			local re_tcbs = ildb.get_tcbs({p = nvar.p, s = (nvar.s==1) and 2 or 1})
+			if not re_tcbs or not re_tcbs.ts_id or re_tcbs.ts_id~=c_ts_id then
+				itab(i, "-!- At "..sigd_to_string(c_sigd)..".Section Start and End do not match!", "err", nil)
+				break
+			end
+		end
 		-- advance
-		c_sigd = c_rseg.next
+		c_sigd = nvar
 		i = i + 1
 	end
 	if c_sigd then
@@ -135,6 +144,8 @@ function atil.show_route_edit_form(pname, sigd, routeid, sel_rpartidx)
 			-- checkbox for call-on
 			form = form..string.format("checkbox[4.5,4.0;se_callon;Call-on (section may be occupied);%s]", rseg.call_on)
 		end
+	elseif sel_rpart and sel_rpart.err then
+		form = form.."textarea[4.5,2.5;4,4;errorta;Error:;"..tab[sel_rpartidx].."]"
 	else
 		form = form..F.label(4.5, 2, "<< Select a route part to edit options")
 	end
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 95ca63c..15c42aa 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -124,9 +124,17 @@ function ilrs.set_route(signal, route, try)
 				return false, "No passive component at "..minetest.pos_to_string(pos)..". Please update track section or reconfigure route!"
 			end
 		end
+		-- sanity check, is section at next the same as the current?
+		local nvar = c_rseg.next
+		if nvar then
+			local re_tcbs = ildb.get_tcbs({p = nvar.p, s = (nvar.s==1) and 2 or 1})
+			if not re_tcbs or not re_tcbs.ts_id or re_tcbs.ts_id~=c_ts_id then
+				if not try then atwarn("Encountered inconsistent ts (front~=back) while a real run of routesetting routine, at position",pts,"while setting route",rtename,"of",signal) end
+				return false, "TCB at "..minetest.pos_to_string(nvar.p).." has different section than previous TCB. Please update track section or reconfigure route!"
+			end
+		end
 		-- reserve ts and write locks
 		if not try then
-			local nvar = c_rseg.next
 			if not route[i+1] then
 				-- We shouldn't use the "next" value of the final route segment, because this can lead to accidental route-cancelling of already set routes from another signal.
 				nvar = nil
diff --git a/advtrains_interlocking/smartroute.lua b/advtrains_interlocking/smartroute.lua
index 07cdf46..a26f2d1 100644
--- a/advtrains_interlocking/smartroute.lua
+++ b/advtrains_interlocking/smartroute.lua
@@ -30,7 +30,7 @@ end
 --route search implementation
 -- Note this is similar to recursively_find_routes in database.lua, there used for the rscache
 
-local function recursively_find_routes(s_pos, s_connid, searching_shunt, tcbseq, mark_pos, result_table, scan_limit, tscnt_limit)
+local function recursively_find_routes(s_pos, s_connid, searching_shunt, tcbseq, mark_pos, result_table, scan_limit, tscnt_limit, cur_ts_id, notify_pname)
 	atdebug("(SmartRoute) Recursively restarting at ",s_pos, s_connid, "limit left", scan_limit,"tscnt",tscnt_limit)
 	local ti = advtrains.get_track_iterator(s_pos, s_connid, scan_limit, false)
 	local pos, connid, bconnid = ti:next_branch()
@@ -52,7 +52,7 @@ local function recursively_find_routes(s_pos, s_connid, searching_shunt, tcbseq,
 				--atdebug("Going in direction",oconnid,"state",state)
 				recursively_find_routes(pos, oconnid, searching_shunt,
 					table.copy(tcbseq), table.copy(mark_pos),
-					result_table, ti.limit, tscnt_limit)
+					result_table, ti.limit, tscnt_limit, cur_ts_id, notify_pname)
 			end
 			return
 		end
@@ -62,6 +62,13 @@ local function recursively_find_routes(s_pos, s_connid, searching_shunt, tcbseq,
 			local fsigd = { p = pos, s = connid }
 			atdebug("(SmartRoute) Encounter TCB ",fsigd)
 			tcbseq[#tcbseq+1] = fsigd
+			-- TS validity check: ensure that the TS the back connid refers to is the same as the one at the start
+			local re_ts_id = tcb[bconnid].ts_id
+			if re_ts_id ~= cur_ts_id then
+				atwarn("(SmartRoute) Found TS Inconsistency: entered in section",cur_ts_id,"but TCB backref is section",re_ts_id)
+				ildb.check_and_repair_ts_at_pos(pos, bconnid, notify_pname)
+				-- nothing needs to be updated on our side
+			end
 			-- check if this is a possible route endpoint
 			local tcbs = tcb[connid]
 			if tcbs.signal then
@@ -93,6 +100,9 @@ local function recursively_find_routes(s_pos, s_connid, searching_shunt, tcbseq,
 			if tscnt_limit <= 0 then
 				break
 			end
+			-- update the cur_ts_id
+			cur_ts_id = tcb[connid].ts_id
+			atdebug("(SmartRoute) Now in section:",cur_ts_id)
 		end
 		-- Go forward
 		last_pos = pos
@@ -116,9 +126,9 @@ end
 -- Maximum scan length for track iterator
 local TS_MAX_SCAN = 1000
 
-function sr.rescan(pname, sigd, tscnt_limit, searching_shunt)
+function sr.rescan(pname, sigd, tcbs, tscnt_limit, searching_shunt, pname)
 	local result_table = {}
-	recursively_find_routes(sigd.p, sigd.s, is_startsignal_shunt, {}, {}, result_table, TS_MAX_SCAN, tscnt_limit)
+	recursively_find_routes(sigd.p, sigd.s, searching_shunt, {}, {}, result_table, TS_MAX_SCAN, tscnt_limit, tcbs.ts_id, pname)
 	return result_table
 end
 
@@ -128,9 +138,12 @@ function sr.propose_next(pname, sigd, tscnt_limit, searching_shunt)
 	if not tcbs or not tcbs.routes then
 		minetest.chat_send_player(pname, "Smartroute: TCBS or routes don't exist here!")
 		return
+	elseif not tcbs.ts_id then
+		minetest.chat_send_player(pname, "Smartroute: No track section directly ahead!")
+		return
 	end
 	-- Step 1: search for routes using the current settings
-	local found_routes = sr.rescan(pname, sigd, tscnt_limit, searching_shunt)
+	local found_routes = sr.rescan(pname, sigd, tcbs, tscnt_limit, searching_shunt, pname)
 	-- Step 2: remove routes for endpoints for which routes already exist
 	local ex_endpts = {} -- key = sigd_to_string
 	for rtid, route in ipairs(tcbs.routes) do
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index abcdf61..4f755af 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -776,8 +776,16 @@ function advtrains.interlocking.check_route_valid(route, sigd)
 				end
 			end
 		end
+		-- sanity check, is section at next the same as the current?
+		local nvar = c_rseg.next
+		if nvar then
+			local re_tcbs = ildb.get_tcbs({p = nvar.p, s = (nvar.s==1) and 2 or 1})
+			if not re_tcbs or not re_tcbs.ts_id or re_tcbs.ts_id~=c_ts_id then
+				return false, "TCB at "..minetest.pos_to_string(nvar.p).." has different section than previous TCB."
+			end
+		end
 		-- advance
-		c_sigd = c_rseg.next
+		c_sigd = nvar
 		i = i + 1
 	end
 	-- check end TCB
diff --git a/advtrains_interlocking/tool.lua b/advtrains_interlocking/tool.lua
index 4ebc56c..560e129 100644
--- a/advtrains_interlocking/tool.lua
+++ b/advtrains_interlocking/tool.lua
@@ -3,7 +3,7 @@
 
 local ilrs = advtrains.interlocking.route
 
-local function node_right_click(pos, pname)
+local function node_right_click(pos, pname, player)
 	if advtrains.is_passive(pos) then
 		local form = "size[7,5]label[0.5,0.5;Route lock inspector]"
 		local pts = advtrains.encode_pos(pos)
@@ -33,7 +33,7 @@ local function node_right_click(pos, pname)
 		return
 	end
 
-	local ts_id = advtrains.interlocking.db.check_and_repair_ts_at_pos(pos)
+	local ts_id = advtrains.interlocking.db.check_and_repair_ts_at_pos(pos, nil, pname)
 	if ts_id then
 		advtrains.interlocking.show_ts_form(ts_id, pname)
 	else
@@ -41,7 +41,7 @@ local function node_right_click(pos, pname)
 	end
 end
 
-local function node_left_click(pos, pname)
+local function node_left_click(pos, pname, player)
 	local node_ok, conns, rail_y=advtrains.get_rail_info_at(pos)
 	if not node_ok then
 		minetest.chat_send_player(pname, "Node is not a track!")
@@ -52,8 +52,12 @@ local function node_left_click(pos, pname)
 		advtrains.interlocking.show_tcb_marker(pos)
 		return
 	end
+	
+	-- create track section if aux1 button down
+	local pc = player:get_player_control()
+	local force_create = pc.aux1
 
-	local ts_id = advtrains.interlocking.db.check_and_repair_ts_at_pos(pos, nil, pname)
+	local ts_id = advtrains.interlocking.db.check_and_repair_ts_at_pos(pos, nil, pname, force_create)
 	if ts_id then
 		advtrains.interlocking.db.update_rs_cache(ts_id)
 		advtrains.interlocking.highlight_track_section(pos)
@@ -80,7 +84,7 @@ minetest.register_craftitem("advtrains_interlocking:tool",{
 		end
 		if pointed_thing.type=="node" then
 			local pos=pointed_thing.under
-			node_right_click(pos, pname)
+			node_right_click(pos, pname, player)
 		end
 	end,
 	on_use = function(itemstack, player, pointed_thing)
@@ -94,7 +98,7 @@ minetest.register_craftitem("advtrains_interlocking:tool",{
 		end
 		if pointed_thing.type=="node" then
 			local pos=pointed_thing.under
-			node_left_click(pos, pname)
+			node_left_click(pos, pname, player)
 		end
 	end
 })
-- 
cgit v1.2.3


From 2e575ee761cfdbc86afead28f2bbcb05fc20e616 Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Tue, 7 Jan 2025 22:55:50 +0100
Subject: Fix crash with missing section in routesetting, correctly clear ARS
 table when empty

---
 advtrains_interlocking/ars.lua            | 2 +-
 advtrains_interlocking/routesetting.lua   | 5 ++++-
 advtrains_interlocking/train_sections.lua | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/ars.lua b/advtrains_interlocking/ars.lua
index b3065ee..eb10497 100644
--- a/advtrains_interlocking/ars.lua
+++ b/advtrains_interlocking/ars.lua
@@ -52,7 +52,7 @@ function il.ars_to_text(arstab)
 end
 
 function il.text_to_ars(t)
-	if t=="" then
+	if not string.match(t, "%S+") then
 		return nil
 	elseif t=="*" then
 		return {default=true}
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 15c42aa..28c8c3c 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -66,7 +66,10 @@ function ilrs.set_route(signal, route, try)
 		c_rseg = route[i]
 		c_lckp = {}
 		
-		if c_ts.route then
+		if not c_ts then
+			if not try then atwarn("Encountered ts missing during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end
+			return false, "Section '"..(c_ts_id).."' not found!", c_ts_id, nil
+		elseif c_ts.route then
 			if not try then atwarn("Encountered ts lock during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end
 			return false, "Section '"..(c_ts.name or c_ts_id).."' already has route set from "..sigd_to_string(c_ts.route.origin)..":\n"..c_ts.route.rsn, c_ts_id, nil
 		end
diff --git a/advtrains_interlocking/train_sections.lua b/advtrains_interlocking/train_sections.lua
index 48e3342..3dda7e8 100644
--- a/advtrains_interlocking/train_sections.lua
+++ b/advtrains_interlocking/train_sections.lua
@@ -83,7 +83,7 @@ local function setsection(tid, train, ts_id, ts, sigd)
 	-- route setting - clear route state
 	if ts.route then
 		--atdebug(tid,"enters",ts_id,"examining Routestate",ts.route)
-		if not sigd_equal(ts.route.entry, sigd) then
+		if sigd and not sigd_equal(ts.route.entry, sigd) then
 			-- Train entered not from the route. Locate origin and cancel route!
 			atwarn("Train",tid,"hit route",ts.route.rsn,"!")
 			advtrains.interlocking.route.cancel_route_from(ts.route.origin)
@@ -173,7 +173,7 @@ advtrains.te_register_on_create(function(id, train)
 	if ts_id then
 		local ts = ildb.get_ts(ts_id)
 		if ts then
-			setsection(id, train, ts_id, ts, origin)
+			setsection(id, train, ts_id, ts, nil)
 		else
 			atwarn("While placing train, TS didnt exist ",ts_id)
 		end
-- 
cgit v1.2.3


From 8c91ce1ec178d6d49f3ddefc57d99eecd0caef3c Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Thu, 9 Jan 2025 00:57:32 +0100
Subject: Various bugfixes found in lunixforks debug

---
 advtrains/occupation.lua                |  4 ++--
 advtrains/trainlogic.lua                |  4 ++--
 advtrains/wagons.lua                    |  2 +-
 advtrains_interlocking/database.lua     |  9 +++++----
 advtrains_interlocking/route_ui.lua     |  2 +-
 advtrains_interlocking/routesetting.lua |  9 ++++++---
 advtrains_interlocking/signal_api.lua   |  1 +
 advtrains_interlocking/tcb_ts_ui.lua    |  5 ++++-
 advtrains_luaautomation/environment.lua | 10 +++++++---
 9 files changed, 29 insertions(+), 17 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains/occupation.lua b/advtrains/occupation.lua
index 26e1f79..20a986e 100644
--- a/advtrains/occupation.lua
+++ b/advtrains/occupation.lua
@@ -89,8 +89,8 @@ function o.set_item(train_id, pos, idx)
 	assert(idx)
 	local i = 1
 	while t[i] do
-		if t[i]==train_id and t[i+1]==index then
-			break
+		if t[i]==train_id and t[i+1]==idx then
+			return
 		end
 		i = i + 2
 	end
diff --git a/advtrains/trainlogic.lua b/advtrains/trainlogic.lua
index e4939df..0e588c7 100644
--- a/advtrains/trainlogic.lua
+++ b/advtrains/trainlogic.lua
@@ -630,7 +630,7 @@ function advtrains.train_step_b(id, train, dtime)
 				local ocn = otrn.path_cn[ob_idx]
 				local ocp = otrn.path_cp[ob_idx]
 
-				local target_is_inside, ref_index, facing
+				local target_is_inside, ref_index, facing, same_dir
 
 				if base_cn == ocn then
 					-- same direction
@@ -1049,7 +1049,7 @@ function advtrains.update_trainpart_properties(train_id, invert_flipstate)
 			if not wagon then
 				local ent = advtrains.wagon_objects[w_id]
 				local pdesc
-				if ent then
+				if ent and ent:get_pos() then
 					pdesc = "at " .. minetest.pos_to_string(ent:get_pos())
 				elseif train.last_pos then
 					pdesc = "near " .. minetest.pos_to_string(train.last_pos)
diff --git a/advtrains/wagons.lua b/advtrains/wagons.lua
index ef057e5..01c60ec 100644
--- a/advtrains/wagons.lua
+++ b/advtrains/wagons.lua
@@ -1333,7 +1333,7 @@ function advtrains.get_wagon_prototype(data)
 	end
 	local rt, proto = advtrains.resolve_wagon_alias(wt)
 	if not rt then
-		atwarn("Unable to load wagon type",wt,", using placeholder")
+		--atwarn("Unable to load wagon type",wt,", using placeholder")
 		rt = "advtrains:wagon_placeholder"
 		proto = advtrains.wagon_prototypes[rt]
 	end
diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua
index 9c72a72..d80fb76 100644
--- a/advtrains_interlocking/database.lua
+++ b/advtrains_interlocking/database.lua
@@ -84,7 +84,7 @@ function ildb.load(data)
 				if pos then
 					-- that was a pos_to_string
 					local epos = advtrains.encode_pos(pos)
-					--atdebug("ILDB converting TCB position format",pts,"->",epos)
+					atdebug("ILDB converting TCB position format",pts,"->",epos)
 					track_circuit_breaks[epos] = tcb
 				else
 					-- keep entry, it is already new
@@ -100,7 +100,7 @@ function ildb.load(data)
 									local lpos = minetest.string_to_pos(lpts)
 									if lpos then
 										local epos = advtrains.encode_pos(lpos)
-										--atdebug("ILDB converting tcb",pts,"side",t_side,"route",t_route,"lock position format",lpts,"->",epos)
+										atdebug("ILDB converting tcb",pts,"side",t_side,"route",t_route,"lock position format",lpts,"->",epos)
 										locks_n[epos] = state
 									else
 										-- already correct format
@@ -131,7 +131,7 @@ function ildb.load(data)
 				if pos then
 					-- that was a pos_to_string
 					local epos = advtrains.encode_pos(pos)
-					--atdebug("ILDB converting Route Lock position format",pts,"->",epos)
+					atdebug("ILDB converting Route Lock position format",pts,"->",epos)
 					advtrains.interlocking.route.rte_locks[epos] = lta
 				else
 					-- keep entry, it is already new
@@ -412,6 +412,7 @@ function ildb.check_and_repair_ts_at_pos(pos, tcb_connid, notify_pname, force_cr
 		return ildb.repair_ts_merge_all(all_tcbs, force_create, notify_pname)
 	end
 	--tsrepair_notify(notify_pname, "Found section", ts.name or ts_id, "here.")
+	ildb.update_rs_cache(ts_id)
 	return ts_id
 end
 
@@ -457,7 +458,7 @@ function ildb.get_all_tcbs_adjacent(inipos, inidir, per_track_callback)
 		pos, connid = ti:next_branch()
 		--atdebug("get_all_tcbs_adjacent: BRANCH: ",pos, connid)
 		bconnid = nil
-		is_branch_start = true
+		local is_branch_start = true
 		repeat
 			-- callback
 			if per_track_callback then
diff --git a/advtrains_interlocking/route_ui.lua b/advtrains_interlocking/route_ui.lua
index 7dddc6e..3c7bd64 100644
--- a/advtrains_interlocking/route_ui.lua
+++ b/advtrains_interlocking/route_ui.lua
@@ -67,7 +67,7 @@ function atil.show_route_edit_form(pname, sigd, routeid, sel_rpartidx)
 		if c_rseg.locks then
 			for pts, state in pairs(c_rseg.locks) do
 				
-				local pos = minetest.string_to_pos(pts)
+				local pos = advtrains.decode_pos(pts)
 				itab(i, "L "..pts.." -> "..state, "lock", pos)
 				if not advtrains.is_passive(pos) then
 					itab(i, "-!- No passive component at "..pts..". Please reconfigure route!", "err", nil)
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 28c8c3c..0668e62 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -104,7 +104,7 @@ function ilrs.set_route(signal, route, try)
 		end
 		
 		for lp, state in pairs(c_locks) do
-			local confl = ilrs.has_route_lock(pts, state)
+			local confl = ilrs.has_route_lock(lp, state)
 			
 			local pos = advtrains.decode_pos(lp)
 			if advtrains.is_passive(pos) then
@@ -131,7 +131,8 @@ function ilrs.set_route(signal, route, try)
 		local nvar = c_rseg.next
 		if nvar then
 			local re_tcbs = ildb.get_tcbs({p = nvar.p, s = (nvar.s==1) and 2 or 1})
-			if not re_tcbs or not re_tcbs.ts_id or re_tcbs.ts_id~=c_ts_id then
+			if (not re_tcbs or not re_tcbs.ts_id or re_tcbs.ts_id~=c_ts_id)
+					and route[i+1] then --FIX 2025-01-08: in old worlds the final TCB may be wrong (it didn't matter back then), don't error out here (route still shown invalid in UI)
 				if not try then atwarn("Encountered inconsistent ts (front~=back) while a real run of routesetting routine, at position",pts,"while setting route",rtename,"of",signal) end
 				return false, "TCB at "..minetest.pos_to_string(nvar.p).." has different section than previous TCB. Please update track section or reconfigure route!"
 			end
@@ -413,7 +414,9 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel)
 			-- set_route now sets the signal aspects
 			--has_changed_aspect = true
 			-- route success. apply default_autoworking flag if requested
-			tcbs.route_auto = route.default_autoworking
+			if route.default_autoworking then
+				tcbs.route_auto = true --FIX 2025-01-08: never set it to false if it was true!
+			end
 		end
 	end
 	if has_changed_aspect then
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index b607750..e92658d 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -375,6 +375,7 @@ function signal.reapply_aspect(pts)
 		local rem_aspt = signal.aspects[remote]
 		--atdebug("resolving remote",advtrains.decode_pos(remote),"aspt",rem_aspt)
 		local rem_pos = advtrains.decode_pos(remote)
+		local _,rem_ndef
 		rem_masp, _, _, rem_ndef = signal.get_aspect_internal(rem_pos, rem_aspt)
 		if rem_masp then
 			if rem_ndef.advtrains and rem_ndef.advtrains.get_aspect_info then
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index 59d3be4..814a11a 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -776,7 +776,7 @@ function advtrains.interlocking.check_route_valid(route, sigd)
 		
 		if c_rseg.locks then
 			for pts, state in pairs(c_rseg.locks) do
-				local pos = minetest.string_to_pos(pts)
+				local pos = advtrains.decode_pos(pts)
 				if not advtrains.is_passive(pos) then
 					return false, "No passive component for lock at "..pts
 				end
@@ -795,6 +795,9 @@ function advtrains.interlocking.check_route_valid(route, sigd)
 		i = i + 1
 	end
 	-- check end TCB
+	if not c_sigd then
+		return false, "Final TCBS unset (legacy-style buffer route)"
+	end
 	c_tcbs = ildb.get_tcbs(c_sigd)
 	if not c_tcbs then
 		return false, "Final TCBS missing at "..sigd_to_string(c_sigd)
diff --git a/advtrains_luaautomation/environment.lua b/advtrains_luaautomation/environment.lua
index b54d45c..a6ed2c7 100644
--- a/advtrains_luaautomation/environment.lua
+++ b/advtrains_luaautomation/environment.lua
@@ -226,11 +226,15 @@ if advtrains.interlocking then
 	end
 	static_env.get_aspect = function(signal)
 		local pos = atlatc.pcnaming.resolve_pos(signal)
-		return advtrains.interlocking.signal_get_aspect(pos)
+		return advtrains.interlocking.signal.get_aspect_info(pos)
 	end
-	static_env.set_aspect = function(signal, asp)
+	static_env.set_aspect = function(signal, main_asp, rem_signal)
+		if type(main_asp) == "table" then
+			error("set_aspect: Parameters of this method have changed to (signal, main_asp, rem_signal) with introduction of distant signalling: parameter 2 is now the main aspect name (a string)")
+		end
 		local pos = atlatc.pcnaming.resolve_pos(signal)
-		return advtrains.interlocking.signal_set_aspect(pos,asp)
+		local rem_pos = rem_signal and atlatc.pcnaming.resolve_pos(rem_signal)
+		return advtrains.interlocking.signal_set_aspect(pos, main_asp, rem_pos)
 	end
 	
 	--section_occupancy()
-- 
cgit v1.2.3


From 3d3752f50aff5889c699e6ba7c27ee1899f890e9 Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Thu, 9 Jan 2025 09:09:08 +0100
Subject: Convert old PTS format on freeing route locks (route_post is not
 migrated)

---
 advtrains_interlocking/routesetting.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 0668e62..6544a92 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -265,6 +265,11 @@ function ilrs.free_route_locks(ts, lcks, nocallbacks)
 end
 
 function ilrs.free_route_locks_indiv(pts, ts, nocallbacks)
+	-- legacy: if starts with bracket then pts is still in old pos_to_string format (may happen because ts.route_post is not migrated)
+	if string.match(pts, "^%(") then
+		atdebug("free_route_locks_indiv: converting position",pts)
+		pts = advtrains.encode_pos(minetest.string_to_pos(pts))
+	end
 	local e = ilrs.rte_locks[pts]
 	if not e then return nil
 	elseif #e==0 then
-- 
cgit v1.2.3


From 5fc9a3073f5c7800b986b0fbcdeaf98d1387e088 Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Tue, 25 Mar 2025 22:31:45 +0100
Subject: fix undeclared global accesses

---
 advtrains_interlocking/route_prog.lua   | 3 +++
 advtrains_interlocking/routesetting.lua | 4 ++--
 advtrains_signals_ks/init.lua           | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/route_prog.lua b/advtrains_interlocking/route_prog.lua
index 71ebdf3..81aa133 100644
--- a/advtrains_interlocking/route_prog.lua
+++ b/advtrains_interlocking/route_prog.lua
@@ -175,6 +175,9 @@ function advtrains.interlocking.visualize_route(origin, route, context, tmp_lcks
 		-- display locks
 		for pts, state in pairs(v.locks) do
 			local pos = minetest.string_to_pos(pts)
+			if not pos then
+				pos = advtrains.decode_pos(pts)
+			end
 			routesprite(context, pos, "fix"..k..pts, "at_il_route_lock.png", "Fixed in state '"..state.."' by route "..route.name.." until segment #"..k.." is freed.")
 		end
 	end
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 6544a92..1065cad 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -86,8 +86,8 @@ function ilrs.set_route(signal, route, try)
 		local c_locks = {}
 		if route.use_rscache and c_ts.rs_cache and c_rseg.next then
 			-- rscache needs to be enabled, present and next must be defined
-			start_pkey = advtrains.encode_pos(c_sigd.p)
-			end_pkey = advtrains.encode_pos(c_rseg.next.p)
+			local start_pkey = advtrains.encode_pos(c_sigd.p)
+			local end_pkey = advtrains.encode_pos(c_rseg.next.p)
 			if c_ts.rs_cache[start_pkey] and c_ts.rs_cache[start_pkey][end_pkey] then
 				for lp,lst in pairs(c_ts.rs_cache[start_pkey][end_pkey]) do
 					--atdebug("Add lock from RSCache:",lp,"->",lst)
diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua
index 326c631..70a0ac1 100755
--- a/advtrains_signals_ks/init.lua
+++ b/advtrains_signals_ks/init.lua
@@ -362,7 +362,7 @@ for _, rtab in ipairs({
 			paramtype2 = "facedir",
 			selection_box = {
 				type = "fixed",
-				fixed = {sbox, rotation_sbox}
+				fixed = {sbox, {-1/4, -1/2, -1/4, 1/4, -7/16, 1/4}}
 			},
 			collision_box = {
 				type = "fixed",
-- 
cgit v1.2.3


From adc01a0bba29b40278e45c50caa954c435374f7b Mon Sep 17 00:00:00 2001
From: orwell <orwell@bleipb.de>
Date: Tue, 6 May 2025 00:43:06 +0200
Subject: Multi-ARS (waiting for multiple routes simultaneously,
 load-balancing)

---
 advtrains_interlocking/ars.lua          | 31 ++++++++----
 advtrains_interlocking/database.lua     |  5 +-
 advtrains_interlocking/routesetting.lua | 85 ++++++++++++++++++++++-----------
 advtrains_interlocking/tcb_ts_ui.lua    | 33 +++++++++----
 4 files changed, 104 insertions(+), 50 deletions(-)

(limited to 'advtrains_interlocking/routesetting.lua')

diff --git a/advtrains_interlocking/ars.lua b/advtrains_interlocking/ars.lua
index fc9f2a3..5182cd3 100644
--- a/advtrains_interlocking/ars.lua
+++ b/advtrains_interlocking/ars.lua
@@ -245,16 +245,29 @@ function il.ars_check_rule_match(ars, train)
 end
 
 local function sort_priority(sprio)
-	-- TODO implement and return the correct sorted table
-	-- for now just minimum
-	local maxk,maxv = nil,10000
-	for k,v in pairs(sprio) do
-		if v<maxv then
-			maxv = v
-			maxk = k
+	-- insertion sort
+	local order = {}
+	local oprio = {}
+	for rteid, prio in pairs(sprio) do
+		local inspos = 1
+		while order[inspos] do
+			if oprio[inspos] > prio then
+				-- next item has higher priority number (= less urgent), insert before it
+				break
+			elseif oprio[inspos] == prio and order[inspos] > rteid then
+				-- next item has same priority as current and a higher routeid, insert before it
+				break
+			end
+			inspos = inspos + 1
 		end
+		table.insert(order, inspos, rteid)
+		table.insert(oprio, inspos, prio)
+	end
+	--atdebug("sort_priority",sprio,"result",order,oprio)
+	if #order == 1 then
+		return order[1] -- only one route, table doesnt make sense
 	end
-	return maxk
+	return order
 end
 
 local function find_rtematch(routes, train)
@@ -278,12 +291,10 @@ local function find_rtematch(routes, train)
 		end
 	end
 	if next(sprio) then
-		atdebug("Ars: SMultiArs", sprio, "is not implemented yet!")
 		return sort_priority(sprio)
 	elseif default then
 		return default
 	elseif next(dprio) then
-		atdebug("Ars: DMultiArs", dprio, "is not implemented yet!")
 		return sort_priority(dprio)
 	else
 		return nil
diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua
index 844d350..5e35dba 100644
--- a/advtrains_interlocking/database.lua
+++ b/advtrains_interlocking/database.lua
@@ -214,10 +214,11 @@ TCB data structure
 	-- aspect will be set accordingly.
 	routeset = <index in routes> -- Route set from this signal. This is the entry that is cleared once
 	-- train has passed the signal. (which will set the aspect to "danger" again)
-	route_committed = <boolean> -- When setting/requesting a route, routetar will be set accordingly,
+	-- routeset may be a table (e.g. {1,2}) while the route is not committed yet, indicating a wait for multiple routes at once (Multi-ARS)
+	route_committed = <boolean> -- When setting/requesting a route, routeset will be set accordingly,
 	-- while the signal still displays danger and nothing is written to the TCs
 	-- As soon as the route can actually be set, all relevant TCs and turnouts are set and this field
-	-- is set true, clearing the signal
+	-- is set true, clearing the signal (when this is true, routeset is never a table)
 	aspect = <asp> -- The aspect the signal should show. If this is nil, should show the most restrictive aspect (red)
 	signal_name = <string> -- The human-readable name of the signal, only for documenting purposes
 	routes = { <route definition> } -- a collection of routes from this signal
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 1065cad..9901d23 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -363,7 +363,7 @@ end
 -- route setting
 -- Call this function to set and cancel routes!
 -- sigd, tcbs: self-explanatory
--- newrte: If a new route should be set, the route index of it (in tcbs.routes). nil otherwise
+-- newrte: If a new route should be set, the route index of it (in tcbs.routes). Can also be a table (multi-ars). nil otherwise
 -- cancel: true in combination with newrte=nil causes cancellation of the current route.
 function ilrs.update_route(sigd, tcbs, newrte, cancel)
 	--atdebug("Update_Route for",sigd,tcbs.signal_name)
@@ -390,37 +390,66 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel)
 		if tcbs.route_committed then
 			return
 		end
-		if newrte then tcbs.routeset = newrte end
+		if newrte then
+			if type(newrte)=="table" and not next(newrte) then
+				error("update_route got multi-ARS with empty table, this is not allowed")
+			end
+			tcbs.routeset = newrte
+		else
+			if type(tcbs.routeset)=="table" and not next(tcbs.routeset) then
+				-- just unset, don't error
+				atwarn(sigd, "had multi-ARS route set with empty list! Cancelled!")
+				tcbs.routeset = nil
+				return
+			end
+		end
 		--atdebug("Setting:",tcbs.routeset)
-		local succ, rsn, cbts, cblk
-		local route = tcbs.routes[tcbs.routeset]
-		if route then
-			succ, rsn, cbts, cblk = ilrs.set_route(sigd, route)
+		-- check: single-ars or multi-ars?
+		local multi_rte
+		if type(tcbs.routeset) == "table" then
+			multi_rte = tcbs.routeset
 		else
-			succ = false
-			rsn = attrans("Route state changed.")
+			multi_rte = {tcbs.routeset}
 		end
-		if not succ then
-			tcbs.route_rsn = rsn
-			--atdebug("Routesetting failed:",rsn)
-			-- add cbts or cblk to callback table
-			if cbts then
-				--atdebug("cbts =",cbts)
-				if not ilrs.rte_callbacks.ts[cbts] then ilrs.rte_callbacks.ts[cbts]={} end
-				advtrains.insert_once(ilrs.rte_callbacks.ts[cbts], sigd, sigd_equal)
-			end
-			if cblk then
-				--atdebug("cblk =",cblk)
-				if not ilrs.rte_callbacks.lck[cblk] then ilrs.rte_callbacks.lck[cblk]={} end
-				advtrains.insert_once(ilrs.rte_callbacks.lck[cblk], sigd, sigd_equal)
+		for multi_idx, rteid in ipairs(multi_rte) do
+			local succ, rsn, cbts, cblk
+			local route = tcbs.routes[rteid]
+			if route then
+				succ, rsn, cbts, cblk = ilrs.set_route(sigd, route)
+			else
+				succ = false
+				rsn = attrans("Route with index @1 not found", rteid)
 			end
-		else
-			--atdebug("Committed Route:",tcbs.routeset)
-			-- set_route now sets the signal aspects
-			--has_changed_aspect = true
-			-- route success. apply default_autoworking flag if requested
-			if route.default_autoworking then
-				tcbs.route_auto = true --FIX 2025-01-08: never set it to false if it was true!
+			if not succ then
+				if multi_idx==1 then
+					tcbs.route_rsn = rsn
+				else
+					tcbs.route_rsn = (tcbs.route_rsn or "").."\n"..rsn
+				end
+				--atdebug("Routesetting",rteid,"failed:",rsn,"(multi-idx",multi_idx,")")
+				-- add cbts or cblk to callback table
+				if cbts then
+					--atdebug("cbts =",cbts)
+					if not ilrs.rte_callbacks.ts[cbts] then ilrs.rte_callbacks.ts[cbts]={} end
+					advtrains.insert_once(ilrs.rte_callbacks.ts[cbts], sigd, sigd_equal)
+				end
+				if cblk then
+					--atdebug("cblk =",cblk)
+					if not ilrs.rte_callbacks.lck[cblk] then ilrs.rte_callbacks.lck[cblk]={} end
+					advtrains.insert_once(ilrs.rte_callbacks.lck[cblk], sigd, sigd_equal)
+				end
+			else
+				--atdebug("Committed Route:",rteid,"(multi-idx",multi_idx,")")
+				-- replace multi_route by single actually committed route
+				tcbs.routeset = rteid
+				-- set_route now sets the signal aspects
+				--has_changed_aspect = true
+				-- route success. apply default_autoworking flag if requested
+				if route.default_autoworking then
+					tcbs.route_auto = true --FIX 2025-01-08: never set it to false if it was true!
+				end
+				-- break out of the for loop, dont try any more routes
+				break
 			end
 		end
 	end
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index 814a11a..0be943a 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -828,14 +828,29 @@ function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, calle
 	form = form.."button[5.5,1.2;1,1;setname;Set]"
 	
 	if tcbs.routeset then
-		local rte = tcbs.routes[tcbs.routeset]
-		if not rte then
-			atwarn("Unknown route set from signal!")
-			tcbs.routeset = nil
-			return
+		if type(tcbs.routeset)=="table" then
+			local rtenames = {}
+			for midx,rteid in ipairs(tcbs.routeset) do
+				local rte = tcbs.routes[rteid]
+				if not rte then
+					atwarn("Unknown route set from signal!")
+					tcbs.routeset = nil
+					return
+				end
+				rtenames[midx] = rte.name
+			end
+			form = form.."label[0.5,2.5;Multiple routes are requested (first available is set):]"
+			form = form.."label[0.5,3.0;"..minetest.formspec_escape(table.concat(rtenames,", ")).."]"
+		else
+			local rte = tcbs.routes[tcbs.routeset]
+			if not rte then
+				atwarn("Unknown route set from signal!")
+				tcbs.routeset = nil
+				return
+			end
+			form = form.."label[0.5,2.5;A route is requested from this signal:]"
+			form = form.."label[0.5,3.0;"..minetest.formspec_escape(rte.name).."]"
 		end
-		form = form.."label[0.5,2.5;A route is requested from this signal:]"
-		form = form.."label[0.5,3.0;"..minetest.formspec_escape(rte.name).."]"
 		if tcbs.route_committed then
 			form = form.."label[0.5,3.5;Route has been set.]"
 		else
@@ -1000,9 +1015,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			end
 		end
 		if tcbs.routeset and fields.cancelroute then
-			if tcbs.routes[tcbs.routeset] and tcbs.routes[tcbs.routeset].ars then
-				tcbs.ars_ignore_next = true
-			end
+			tcbs.ars_ignore_next = true
 			-- if route committed, cancel route ts info
 			ilrs.update_route(sigd, tcbs, nil, true)
 		end
-- 
cgit v1.2.3