apitest: Get positions of pieces

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

diff --git a/apitest/at-otter.rs b/apitest/at-otter.rs
index 053f060d16b76acc1333463c10a57124a2c20d4a..62a470be356d69e09b0d01dd6b0618a14bf352eb 100644 (file)
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -130,6 +130,7 @@ impl Ctx {
 #[derive(Debug,Clone)]
 struct PieceInfo<I> {
   id: String,
+  pos: Pos,
   info: I,
 }
 
@@ -143,10 +144,15 @@ impl Session {
         let puse = puse.value();
         let puse = puse.as_element().ok_or(Loop::Continue)?;
         let attr = puse.attr("data-info").ok_or(Loop::Break)?;
+        let pos = Pos::from_iter(["x","y"].iter().map(|attr|{
+          puse
+            .attr(attr).unwrap()
+            .parse().unwrap()
+        })).unwrap();
         let id = puse.id.as_ref().unwrap();
         let id = id.strip_prefix("use").unwrap().to_string();
         let info = serde_json::from_str(attr).unwrap();
-        Loop::ok(PieceInfo { id, info })
+        Loop::ok(PieceInfo { id, pos, info })
       })
       .collect()
   }