[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Polygon #26

Merged
merged 17 commits into from
Sep 14, 2020
Merged

Polygon #26

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
44f6f32
Add Kinematics.positionAfter' to API
Sep 8, 2020
fa70700
triangle and polygon API
Sep 9, 2020
bf1371f
added GreatCircle.turn & side + started Polygon impl
Sep 11, 2020
44a66a4
hint & hindent
Sep 11, 2020
a84fae3
Doc
Sep 11, 2020
75ce872
Concave polygons
Sep 11, 2020
38570e5
simple polygons
Sep 12, 2020
d63b1ec
cleanup and doc
Sep 12, 2020
6cb5b23
cleanup
Sep 12, 2020
06079d5
circles and arcs
Sep 12, 2020
708358f
cleanup
Sep 12, 2020
c03fa26
polygon triangulation (triangle test TODO), fixes #21
Sep 13, 2020
ed8d868
triangle tests
Sep 13, 2020
8ce1b78
doc
Sep 13, 2020
b899dee
change log
Sep 13, 2020
fbb1f45
hint
Sep 13, 2020
2d4870f
Tests & doc
Sep 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cleanup and doc
  • Loading branch information
Cedric Liegeois committed Sep 12, 2020
commit d63b1ec5793e88f396efc22ee91ad3b89cc28367
2 changes: 1 addition & 1 deletion src/Data/Geo/Jord/Polygon.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ selfIntersects ps
(_, pairs) = makePairs' (ps, [])

intersects :: (Spherical a) => (MinorArc a, [MinorArc a]) -> Bool
intersects (ma, mas) = any (\ma' -> isJust (GreatCircle.intersection ma ma')) mas
intersects (ma, mas) = any (isJust . GreatCircle.intersection ma) mas

makePairs' ::
(Spherical a)
Expand Down
3 changes: 2 additions & 1 deletion test/Data/Geo/Jord/GreatCircleSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,8 @@ spec = do
GreatCircle.projection e ma `shouldBe` (Just e)
describe "side" $ do
it "retuns None if p1 is antipode of p2" $ do
GreatCircle.side ystad helsingborg (Geodetic.antipode helsingborg) `shouldBe` GreatCircle.None
GreatCircle.side ystad helsingborg (Geodetic.antipode helsingborg) `shouldBe`
GreatCircle.None
it "returns None if (p1, p2) are equal" $ do
GreatCircle.side ystad helsingborg helsingborg `shouldBe` GreatCircle.None
it "returns None if p0 is on the great circle" $ do
Expand Down