fix: breddevagt vælger mindst kursets bredde (ingen uslåede striber) (v1.62.117)
This commit is contained in:
@@ -434,6 +434,19 @@ function ADCpBridge.pickSectionCount(widths, target)
|
||||
return best
|
||||
end
|
||||
|
||||
-- Under arbejdet: mindst kursets bredde (overlap er bedre end uslåede striber — in-game 9/10: BiG M 450 sænket gav
|
||||
-- 4 sektioner = 45 m på et 50 m-kursus). Ingen der rækker: den bredeste.
|
||||
function ADCpBridge.pickSectionCountAtLeast(widths, target)
|
||||
local best, bestWidth, widest, widestWidth = nil, math.huge, 0, -1
|
||||
for k, w in pairs(widths) do
|
||||
if type(w) == "number" then
|
||||
if w >= target - 0.01 and w < bestWidth then best, bestWidth = k, w end
|
||||
if w > widestWidth then widest, widestWidth = k, w end
|
||||
end
|
||||
end
|
||||
return best or widest
|
||||
end
|
||||
|
||||
local function currentVariableWidth(object)
|
||||
local okL, left = pcall(object.getVariableWorkWidth, object, true)
|
||||
local okR, right = pcall(object.getVariableWorkWidth, object)
|
||||
@@ -443,7 +456,7 @@ end
|
||||
|
||||
local warnedNoApi = {}
|
||||
-- -> liste af {name, before, after} for de redskaber der blev stillet
|
||||
function ADCpBridge.setVariableWidth(vehicle, target)
|
||||
function ADCpBridge.setVariableWidth(vehicle, target, atLeast)
|
||||
target = target or ADCpBridge.VARIABLE_TARGET_WIDTH
|
||||
local changed = {}
|
||||
for _, object in ipairs(collect(vehicle)) do
|
||||
@@ -487,7 +500,7 @@ function ADCpBridge.setVariableWidth(vehicle, target)
|
||||
if n == 0 or (widths[n] or 0) <= 0 then
|
||||
Logging.warning("ADSmartPickup: bredde: '%s' — sektionernes placering kendes ikke; bredden røres ikke", name)
|
||||
else
|
||||
local k = ADCpBridge.pickSectionCount(widths, target)
|
||||
local k = atLeast and ADCpBridge.pickSectionCountAtLeast(widths, target) or ADCpBridge.pickSectionCount(widths, target)
|
||||
if k == 0 then k = math.min(1, n) end -- aldrig kun midten: det er minimumsbredden
|
||||
pcall(object.setSectionsActive, object, ids(k))
|
||||
local planned = widths[k]
|
||||
@@ -576,7 +589,7 @@ function ADCpBridge.guardVariableWidth(vehicle)
|
||||
lastGuardResetAt[object] = now
|
||||
Logging.warning("ADSmartPickup: bredde: '%s' er sprunget tilbage til %.1f m under arbejdet (%s) — stilles igen",
|
||||
tostring(object.getName ~= nil and object:getName() or "?"), current, source)
|
||||
ADCpBridge.setVariableWidth(vehicle, target)
|
||||
ADCpBridge.setVariableWidth(vehicle, target, true)
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user