angle: Provide and use to_compass

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

diff --git a/daemon/session.rs b/daemon/session.rs
index eb6be01c6867fa6a20c1842a9bd174053d3a2f78..de75eed0c5153aa3ebb69324d2518f8c05dfac47 100644 (file)
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -118,9 +118,7 @@ fn session_inner(form: Json<SessionForm>,
       alldefs.push((pri.id, defs));
       let desc = pri.describe(&pr, p);
 
-      let vangle = match pri.angle(pr) {
-        PieceAngle::Compass(vangle) => vangle,
-      };
+      let vangle = pri.angle(pr).to_compass();
 
       let for_info = SessionPieceLoadJson {
         held: &pr.held,

diff --git a/src/gamestate.rs b/src/gamestate.rs
index ddadcf9f021dd04a6a64c2352b22e3a9785826a4..6fef4f9c11f9df499069c11b009d8b6f091975d6 100644 (file)
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -254,12 +254,14 @@ impl Debug for Html {
 
 impl VisiblePieceAngle {
   pub fn to_transform(self) -> VisibleAngleTransform {
+    VisibleAngleTransform(base_misc::raw_angle_transform(
+      self.to_compass().into()
+    ))
+  }
+
+  pub fn to_compass(self) -> CompassAngle {
     match self {
-      PieceAngle::Compass(angle) => VisibleAngleTransform(
-        base_misc::raw_angle_transform(
-          angle.into()
-        )
-      ),
+      PieceAngle::Compass(compass) => compass,
     }
   }
 }