Refactor, try to limit dependencies

src/Dodge/Data/PosEvent.hs

@@ -1,23 +1,23 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.PosEvent where
-import GHC.Generics
-import Data.Aeson
-import Geometry.Data
+
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Geometry.Data
+
 data PosEventType = SparkSpawner
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON PosEventType  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON PosEventType 
+    deriving (Eq, Ord, Show, Read)
+
 data PosEvent = PosEvent
-    { _pvType   :: PosEventType
-    , _pvTimer  :: Int
-    , _pvPos    :: Point2
+    { _pvType :: PosEventType
+    , _pvTimer :: Int
+    , _pvPos :: Point2
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON PosEvent  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON PosEvent 
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''PosEvent
+deriveJSON defaultOptions ''PosEventType
+deriveJSON defaultOptions ''PosEvent