Refactor, try to limit dependencies

src/Dodge/Data/CrGroupParams.hs

@@ -1,26 +1,25 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
-module Dodge.Data.CrGroupParams
-    where
-import GHC.Generics
-import Data.Aeson
-import Geometry.Data
-import qualified Data.IntSet as IS
+{-# LANGUAGE TemplateHaskell #-}
+
+module Dodge.Data.CrGroupParams where
+
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import qualified Data.IntSet as IS
+import Geometry.Data
+
 data CrGroupParams = CrGroupParams
-    { _crGroupParamID   :: Int
-    , _crGroupIDs       :: IS.IntSet
-    , _crGroupCenter    :: Point2
-    , _crGroupUpdate    :: CrGroupUpdate --World -> CrGroupParams -> Maybe CrGroupParams
+    { _crGroupParamID :: Int
+    , _crGroupIDs :: IS.IntSet
+    , _crGroupCenter :: Point2
+    , _crGroupUpdate :: CrGroupUpdate --World -> CrGroupParams -> Maybe CrGroupParams
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CrGroupParams  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON CrGroupParams 
+    deriving (Eq, Ord, Show, Read)
+
 data CrGroupUpdate = DefaultCrGroupUpdate
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CrGroupUpdate  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON CrGroupUpdate 
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''CrGroupParams
+deriveJSON defaultOptions ''CrGroupParams
+deriveJSON defaultOptions ''CrGroupUpdate