Linting

src/Geometry/Intersect.hs

@@ -9,9 +9,9 @@ intersectLineLine' :: Point2 -> Point2 -> Point2 -> Point2 -> Maybe Point2
 intersectLineLine' (x1,y1) (x2,y2) (x3,y3) (x4,y4)
     | den == 0 = Nothing
     | otherwise = Just (x1 + (x2-x1)*t'/den, y1 + (y2-y1)*t'/den)
-    where 
-        den = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4)
-        t'  = (x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)
+  where 
+    den = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4)
+    t'  = (x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)
 
 -- | If two segments intersect, return 'Just' that point.
 intersectSegSeg' :: Point2 -> Point2 -> Point2 -> Point2 -> Maybe Point2
@@ -23,10 +23,10 @@ intersectSegSeg' (x1,y1) (x2,y2) (x3,y3) (x4,y4)
     | den < 0 && (t' > 0 || u' > 0 || t' < den || u' < den)
         = Nothing
     | otherwise = Just (x1 + (x2-x1)*t'/den, y1 + (y2-y1)*t'/den)
-    where 
-        den = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4)
-        t'  = (x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)
-        u'  = (y1-y2)*(x1-x3) - (x1-x2)*(y1-y3)
+  where 
+    den = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4)
+    t'  = (x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)
+    u'  = (y1-y2)*(x1-x3) - (x1-x2)*(y1-y3)
 
 -- | Intended to intersect a segment with a half-line-segment, ie a segment
 -- extending infinitely in one direction.
@@ -39,10 +39,10 @@ intersectSegLineFrom' (x1,y1) (x2,y2) (x3,y3) (x4,y4)
     | den < 0 && ( t' > 0 || u' > 0 || t' < den )
         = Nothing
     | otherwise = Just (x1 + (x2-x1)*t'/den, y1 + (y2-y1)*t'/den)
-    where 
-        den = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4)
-        t'  = (x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)
-        u'  = (y1-y2)*(x1-x3) - (x1-x2)*(y1-y3)
+  where 
+    den = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4)
+    t'  = (x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)
+    u'  = (y1-y2)*(x1-x3) - (x1-x2)*(y1-y3)
 
 -- | Similar to 'intersectSegLineFrom'', but this version is probably not correct...
 intersectSegLineext :: Point2 -> Point2 -> Point2 -> Point2 -> Maybe Point2
@@ -54,10 +54,10 @@ intersectSegLineext (x1,y1) (x2,y2) (x3,y3) (x4,y4)
     | den < 0 && ( t' > 0 || u' > - den || t' < den )
         = Nothing
     | otherwise = Just (x1 + (x2-x1)*t'/den, y1 + (y2-y1)*t'/den)
-    where 
-        den = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4)
-        t'  = (x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)
-        u'  = (y1-y2)*(x1-x3) - (x1-x2)*(y1-y3)
+  where 
+    den = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4)
+    t'  = (x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)
+    u'  = (y1-y2)*(x1-x3) - (x1-x2)*(y1-y3)
 
 -- | Intersect a segment with a line.
 intersectSegLine' :: Point2 -> Point2 -> Point2 -> Point2 -> Maybe Point2
@@ -69,10 +69,10 @@ intersectSegLine' (x1,y1) (x2,y2) (x3,y3) (x4,y4)
     | den < 0 && (t' > 0 || t' < den)
         = Nothing
     | otherwise = Just (x1 + (x2-x1)*t'/den, y1 + (y2-y1)*t'/den)
-    where 
-        den = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4)
-        t'  = (x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)
-        u'  = (y1-y2)*(x1-x3) - (x1-x2)*(y1-y3)
+  where 
+    den = (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4)
+    t'  = (x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)
+    u'  = (y1-y2)*(x1-x3) - (x1-x2)*(y1-y3)
 
 -- | Due to floating point issues, 'intersectSegSeg'' is not always 
 -- accurate---'myIntersectSegSeg'
@@ -86,34 +86,38 @@ myIntersectSegSeg a@(ax,ay) b@(bx,by) c@(cx,cy) d@(dx,dy) = case ratIntersectLin
         Just (x,y) -> if inbetween x && inbetween' y 
                         then Just (x,y)
                         else Nothing
-    where inbetween  x = ((ax <= x && x <= bx) || (bx <= x && x <= ax)) &&
-                         ((cx <= x && x <= dx) || (dx <= x && x <= cx))
-          inbetween' y = ((ay <= y && y <= by) || (by <= y && y <= ay)) &&
-                         ((cy <= y && y <= dy) || (dy <= y && y <= cy))
+  where 
+    inbetween  x = ((ax <= x && x <= bx) || (bx <= x && x <= ax)) 
+        &&  ((cx <= x && x <= dx) || (dx <= x && x <= cx))
+    inbetween' y = ((ay <= y && y <= by) || (by <= y && y <= ay)) 
+        &&  ((cy <= y && y <= dy) || (dy <= y && y <= cy))
 
 -- | Polymorphic intersection of fractional line points.
 myIntersectLineLine :: (Eq a,Fractional a) => (a,a) -> (a,a) -> (a,a) -> (a,a) -> Maybe (a,a)
 myIntersectLineLine a@(ax,ay) b c@(cx,cy) d
-    | linGrad a b == Nothing = fmap ((,) ax) $ axisInt (c *-* (ax,0)) (d *-* (ax,0))
-    | linGrad c d == Nothing = fmap ((,) cx) $ axisInt (a *-* (cx,0)) (b *-* (cx,0))
+    | linGrad a b == Nothing = ((,) ax) <$> axisInt (c *-* (ax,0)) (d *-* (ax,0))
+    | linGrad c d == Nothing = ((,) cx) <$> axisInt (a *-* (cx,0)) (b *-* (cx,0))
     | otherwise              
         = case linGrad a b ^-^ linGrad c d of
             Just 0 -> Nothing
-            _      -> liftA2 (,) newx
-                                 ((linGrad a b ^*^ newx) ^+^ axisInt a b)
-    where (^-^) = liftA2 (-)
-          (^+^) = liftA2 (+)
-          (^/^) = liftA2 (/)
-          (^*^) = liftA2 (*)
-          newx  = (axisInt c d ^-^ axisInt a b) ^/^ (linGrad a b ^-^ linGrad c d)
-          (*-*) (ax,ay) (bx,by) = (ax-bx,ay-by)
+            _      -> liftA2 (,) newx ((linGrad a b ^*^ newx) ^+^ axisInt a b)
+    
+  where 
+    (^-^) = liftA2 (-)
+    (^+^) = liftA2 (+)
+    (^/^) = liftA2 (/)
+    (^*^) = liftA2 (*)
+    newx  = (axisInt c d ^-^ axisInt a b) ^/^ (linGrad a b ^-^ linGrad c d)
+    (*-*) (ax,ay) (bx,by) = (ax-bx,ay-by)
 
 -- | Transforms floating points to rationals then performs line intersection.
 ratIntersectLineLine :: Point2 -> Point2 -> Point2 -> Point2 -> Maybe Point2
-ratIntersectLineLine a b c d = fmap toNumPoint2 $ myIntersectLineLine (toRatPoint2 a) (toRatPoint2 b) (toRatPoint2 c) (toRatPoint2 d)
-    where toRatPoint2 (x,y) = (toRational x, toRational y)
-          toNumPoint2 (x,y) = (fromRational x, fromRational y)
-          f = toRatPoint2 . roundPoint2
+ratIntersectLineLine a b c d = toNumPoint2 
+    <$> myIntersectLineLine (toRatPoint2 a) (toRatPoint2 b) (toRatPoint2 c) (toRatPoint2 d)
+  where 
+    toRatPoint2 (x,y) = (toRational x, toRational y)
+    toNumPoint2 (x,y) = (fromRational x, fromRational y)
+    f = toRatPoint2 . roundPoint2
 
 {- | Round the floats within a 'Point2' to the nearest integer.
 __Examples__