use scalajs pickling

1 files changed, 16 insertions, 2 deletions

diff --git a/vfd-backend/app/controllers/Application.scala b/vfd-backend/app/controllers/Application.scala
index 5a473b4..f048a07 100644
--- a/vfd-backend/app/controllers/Application.scala
+++ b/vfd-backend/app/controllers/Application.scala
@@ -5,7 +5,6 @@ import play.api.mvc._
 import play.api.Play.current
 import play.api.mvc.WebSocket.FrameFormatter
 
-import play.api.libs.functional.syntax._
 import play.api.libs.json._
 
 import vfd.uav.DataFrame
@@ -22,7 +21,22 @@ object Application extends Controller {
     Ok(views.html.index())
   }
 
-  implicit val dataFrameFormat = Json.format[DataFrame]
+  implicit object DataFrameFormat extends Format[DataFrame] {
+    import org.scalajs.spickling._
+    import org.scalajs.spickling.playjson._
+    import play.api.data.validation.ValidationError
+
+    PicklerRegistry.register[DataFrame]
+
+    def writes(o: DataFrame): JsValue = PicklerRegistry.pickle(o)
+
+    def reads(j: JsValue): JsResult[DataFrame] = PicklerRegistry.unpickle(j) match {
+      case df: DataFrame => JsSuccess(df)
+      case _ => JsError("unpickling yielded wrong type")
+    }
+  }
+
+  //implicit val dataFrameFormat = Json.format[DataFrame]
   implicit val dataFrameFormatter = FrameFormatter.jsonFrame[DataFrame]
 
   def socket = WebSocket.acceptWithActor[String, DataFrame] { request =>