From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 22 Mar 2021 19:23:43 +0000 (+0000)
Subject: hidden: When one of the occultations is Visible, show it
X-Git-Tag: otter-0.5.0~493
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=338ce1b0596ced4e3bb3693c07a5ef5a6f0c10e7;p=otter.git

hidden: When one of the occultations is Visible, show it

We don't defer to the caller's log_visible here.  (That is actually
misnamed.)  The caller may have generated that from the old
occultation state.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/hidden.rs b/src/hidden.rs
index 3154bf81..beb01b47 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -504,9 +504,7 @@ fn recalculate_occultation_general<
       );
 
     let log = match most_obscure.map_displaced(|_|((),())).pri_occulted() {
-      Some(PriOG::Visible(_y)) => {
-        log_visible
-      }
+      Some(prioc@ PriOG::Visible(_)) |
       Some(prioc@ PriOG::Occulted) |
       Some(prioc@ PriOG::Displaced(..)) => {
         let show = prioc.describe(ioccults, gpc, ipc);