From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 13 May 2022 23:05:03 +0000 (+0100)
Subject: shapelib catalogue: Get description from trait
X-Git-Tag: otter-1.1.0~210
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bf3ceec25daa46c946a0150ffb6a2ce38c2c1f08;p=otter.git

shapelib catalogue: Get description from trait

We need to disambiguate this right now because we have a concrete
item here which impl both PieceTrait and InertPieceTrait.

That's going to change later.

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index ff26da32..5182f85f 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -925,7 +925,7 @@ impl Catalogue {
         itemname: (**k).to_owned(),
         sortkey: loaded.sortkey().map(|s| s.to_owned()),
         f0bbox,
-        f0desc: loaded.describe_face(default())?,
+        f0desc: PieceTrait::describe_html(&*loaded, &gpc, &default())?,
       };
       out.push(ier);
     }