From 48cf524e84fdef42d6e5c459592a1f0245b524b3 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 26 Sep 2020 19:28:17 +0100
Subject: [PATCH] scale the library item size

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 library/wikimedia.toml | 2 +-
 src/shapelib.rs        | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/library/wikimedia.toml b/library/wikimedia.toml
index badda41f..e08d3e55 100644
--- a/library/wikimedia.toml
+++ b/library/wikimedia.toml
@@ -16,8 +16,8 @@ data_url_hashprefix = true
 
 [group.chess]
 outline = "Circle"
-size = [9]
 scale = 0.20
+size = [45]
 centre = [22.5, 22.5]
 category = "chess"
 item_prefix = "chess-"
diff --git a/src/shapelib.rs b/src/shapelib.rs
index 8b5676b3..ee453995 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -31,7 +31,7 @@ struct ItemData {
 
 #[derive(Debug,Deserialize)]
 struct GroupDetails {
-  size: Vec<f64>,
+  size: Vec<f64>, // scaled when put into GroupData
   category: String,
   #[serde(default)] centre: [f64; 2],
   #[serde(default)] flip: bool,
@@ -266,9 +266,13 @@ fn load_catalogue(libname: &str, dirname: &str, toml_path: &str) -> Contents {
     let gdefn = resolve_inherit(INHERIT_DEPTH_LIMIT,
                                 &groups, groupname, gdefn)?;
     let gdefn : GroupDefn = TV::Table(gdefn.into_owned()).try_into()?;
+    let d = GroupDetails {
+      size: gdefn.d.size.iter().map(|s| s * gdefn.d.scale).collect(),
+      ..gdefn.d
+    };
     let group = Arc::new(GroupData {
       groupname: groupname.clone(),
-      d: gdefn.d,
+      d,
     });
     for fe in gdefn.files.0 {
       let item_name = format!("{}{}{}", gdefn.item_prefix,
-- 
2.30.2