Refactor, try to limit dependencies

src/Dodge/Data/RadarBlip.hs

@@ -1,21 +1,22 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.RadarBlip where
-import GHC.Generics
-import Data.Aeson
+
 import Color
-import Geometry
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Geometry
+
 data RadarBlip = RadarBlip
-    { _rbColor      :: Color
-    , _rbTime       :: Int
-    , _rbMaxTime    :: Int
-    , _rbRad        :: Float
-    , _rbPos        :: Point2
+    { _rbColor :: Color
+    , _rbTime :: Int
+    , _rbMaxTime :: Int
+    , _rbRad :: Float
+    , _rbPos :: Point2
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON RadarBlip  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON RadarBlip 
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''RadarBlip
+deriveJSON defaultOptions ''RadarBlip