Interlocking: Correct duplicate influence points semi-automaticallyrelease-2.4.0

Searches and deletes duplicate influence points for the same signal when "Influence Point" formspec is opened.

2 files changed, 23 insertions, 0 deletions

diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua
index a35d446..6787c50 100644
--- a/advtrains_interlocking/database.lua
+++ b/advtrains_interlocking/database.lua
@@ -634,6 +634,28 @@ function ildb.get_ip_by_signalpos(spos)
 		end
 	end
 end
+function ildb.check_for_duplicate_ip(spos)
+	local main_ip_found = false
+	-- first pass: check for duplicates
+	for pts,tab in pairs(influence_points) do
+		for connid,pos in pairs(tab) do
+			if vector.equals(pos, spos) then
+				if main_ip_found then
+					atwarn("Signal at",spos,": Deleting duplicate signal influence point at",pts,"/",connid)
+					tab[connid] = nil
+				end
+				main_ip_found = true
+			end
+		end
+	end
+	-- second pass: delete empty tables
+	for pts,tab in pairs(influence_points) do
+		if not tab[1] and not tab[2] then -- only those two connids may exist
+			influence_points[pts] = nil
+		end
+	end
+end
+
 -- clear signal assignment given the signal position
 function ildb.clear_ip_by_signalpos(spos)
 	local pts, connid = ildb.get_ip_by_signalpos(spos)
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index a969378..83fae4a 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -326,6 +326,7 @@ function advtrains.interlocking.show_ip_form(pos, pname, only_notset)
 		return
 	end
 	local form = "size[7,5]label[0.5,0.5;Signal at "..minetest.pos_to_string(pos).."]"
+	advtrains.interlocking.db.check_for_duplicate_ip(pos)
 	local pts, connid = advtrains.interlocking.db.get_ip_by_signalpos(pos)
 	if pts then
 		form = form.."label[0.5,1.5;Influence point is set at "..pts.."/"..connid.."]"