From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Mar 2021 15:22:41 +0000 (+0000)
Subject: shapelib hidden: Include outline info in OccultData
X-Git-Tag: otter-0.4.0~172
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5a54e66a2eeef156d15825518103248bf2b350bc;p=otter.git

shapelib hidden: Include outline info in OccultData

Nothing uses this yet

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 492d4d0d..0df9e823 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -53,6 +53,7 @@ struct ItemData {
 #[derive(Debug,Clone)]
 struct OccData {
   item_name: String,
+  outline: Outline,
   desc: Html,
 }
 
@@ -406,6 +407,7 @@ fn load_catalogue(libname: &str, dirname: &str, toml_path: &str) -> Contents {
           Some(Arc::new(OccData {
             item_name: subst(&item_name, "_c", &colour)?,
             desc: Html(subst(&fe.desc.0, "_colour", "")?),
+            outline: outline.clone(),
           }))
         },
       };