conflict-decisions: also apply dateOfDeath (D5 death-date resolutions)
god extended conflict-decisions.json with an optional dateOfDeath (DD.MM.YYYY). apply_conflict_decisions now sets the animal's death date (normalized) as authoritative when present — clearing D5 death-date conflicts the same way genotype/farbschlag decisions are applied. No C# change (death already flows to Gerbil.DateOfDeath). test_extract covers a Flint dateOfDeath resolution. python green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -862,6 +862,8 @@ def apply_conflict_decisions(merged, conflicts, path):
|
||||
if d.get("farbschlag"):
|
||||
a["farbschlag"] = d["farbschlag"]
|
||||
a["farbschlagVariants"] = [d["farbschlag"]]
|
||||
if d.get("dateOfDeath"): # D5 death-date resolutions
|
||||
a["death"] = norm_dob(d["dateOfDeath"])
|
||||
if a.get("conflict"):
|
||||
a["conflict"] = False
|
||||
conflicts[:] = [c for c in conflicts if c.get("id") != a["id"]]
|
||||
|
||||
Reference in New Issue
Block a user