Cleanup module pathing

src/Dodge/Data/RadarSweep.hs

@@ -1,20 +1,24 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
-module Dodge.Data.RadarSweep where
-import GHC.Generics
-import Data.Aeson
-import Dodge.Data.Object
-import Geometry.Data
+{-# LANGUAGE TemplateHaskell #-}
+
+module Dodge.Data.RadarSweep (
+    module Dodge.Data.RadarSweep,
+    module Dodge.Data.ObjectType,
+) where
+
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Dodge.Data.ObjectType
+import Geometry.Data
+
 data RadarSweep = RadarSweep
-    { _rsPos    :: Point2
-    , _rsRad    :: Float
+    { _rsPos :: Point2
+    , _rsRad :: Float
     , _rsObject :: ObjectType
-    , _rsTimer  :: Int
+    , _rsTimer :: Int
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON RadarSweep  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON RadarSweep 
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''RadarSweep
+deriveJSON defaultOptions ''RadarSweep