Adds Within trait and fixes more Contains edge cases #884
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michaelkirk
force-pushed
the
mkirk/contains-all
branch
from
35055a9
to
08f1cc5
Compare
This fixes 24 failures of `Within` in the JTS "validation" suite. The changes are in the `Contains` impl because `Within` is implemented on top of the `Contains` trait.
michaelkirk
force-pushed
the
mkirk/within
branch
from
237b051
to
c43cbc1
Compare
michaelkirk
commented
Aug 1, 2022
| if self.is_closed() && coord == &self.0[0] { | ||
| return true; | ||
| if coord == &self.0[0] || coord == self.0.last().unwrap() { | ||
| return self.is_closed(); | ||
| } |
There was a problem hiding this comment.
Here's an example of the kind of test that was failing before this change:
<case>
<desc>P/nsL.1-5-1: a point on a non-simple LineString's start point with crossing line segments [dim(0){A.P.Int = B.nsL.Bdy.SPx}]</desc>
<a>
POINT(110 110)
</a>
<b>
LINESTRING(110 110, 220 20, 20 20, 110 110, 220 220)
</b>
<test>
<op name="relate" arg1="A" arg2="B" arg3="F0FFFF102">true</op>
</test>
<test><op name="contains" arg1="A" arg2="B">false</op></test>
<test><op name="coveredBy" arg1="A" arg2="B">true</op></test>
<test><op name="covers" arg1="A" arg2="B">false</op></test>
<test><op name="crosses" arg1="A" arg2="B">false</op></test>
<test><op name="disjoint" arg1="A" arg2="B">false</op></test>
<test><op name="equalsTopo" arg1="A" arg2="B">false</op></test>
<test><op name="intersects" arg1="A" arg2="B">true</op></test>
<test><op name="overlaps" arg1="A" arg2="B">false</op></test>
<test><op name="touches" arg1="A" arg2="B">true</op></test>
<test><op name="within" arg1="A" arg2="B">false</op></test>
</case>
|
Now that #880 has been merged, this is ready for review! |
frewsxcv
approved these changes
Aug 13, 2022
|
bors r=frewsxcv |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CHANGES.mdif knowledge of this change could be valuable to users.Based on #880, so review that first.Merged! This is ready for review!The new
Withintrait is implemented in terms ofContains.Running the "within" tests from the JTS suite exposed some further inconsistencies with how we're handling line string edge cases.