[geos-commits] [SCM] GEOS branch master updated. 67d8a2789de13ba8dd7865d3d43f9d3d60325783

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  67d8a2789de13ba8dd7865d3d43f9d3d60325783 (commit)
      from  ea8bde0b96494978e31624d7693eb8aebb148271 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 67d8a2789de13ba8dd7865d3d43f9d3d60325783
Author: Daniel Baston <dbaston at gmail.com>
Date:   Wed Jun 12 10:42:27 2019 -0400

    Fix incorrect return from OutermostLocationFilter

diff --git a/src/geom/prep/PreparedPolygonPredicate.cpp b/src/geom/prep/PreparedPolygonPredicate.cpp
index 886193c..cd6d4c5 100644
--- a/src/geom/prep/PreparedPolygonPredicate.cpp
+++ b/src/geom/prep/PreparedPolygonPredicate.cpp
@@ -98,7 +98,7 @@ struct OutermostLocationFilter : public GeometryComponentFilter {
 
         if (outermost_loc == Location::UNDEF || outermost_loc == Location::INTERIOR) {
             outermost_loc = loc;
-        } else if (Location::EXTERIOR) {
+        } else if (loc == Location::EXTERIOR) {
             outermost_loc = loc;
             done = true;
         }
diff --git a/tests/xmltester/tests/general/TestPreparedPolygonPredicate.xml b/tests/xmltester/tests/general/TestPreparedPolygonPredicate.xml
index c4e2a8d..b8a8cb4 100644
--- a/tests/xmltester/tests/general/TestPreparedPolygonPredicate.xml
+++ b/tests/xmltester/tests/general/TestPreparedPolygonPredicate.xml
@@ -116,6 +116,20 @@
 </case>
 
 <case>
+   <desc>A/mP - one point on boundary, one point interior, one point exterior
+   </desc>
+   <a>
+     POLYGON ((10 10, 60 100, 110 10, 10 10))
+   </a>
+   <b>
+     MULTIPOINT ((10 10), (20 20), (20 40))
+   </b>
+   <test>  <op name="contains"   		arg1="A" arg2="B">   false   </op> </test>
+   <test>  <op name="covers"     		arg1="A" arg2="B">   false   </op> </test>
+   <test>  <op name="intersects" 		arg1="A" arg2="B">   true   </op> </test>
+</case>
+
+<case>
   <desc>mA/L
   	A has 2 shells touching at one vertex and one non-vertex.
   	B passes between the shells, but is wholely contained

-----------------------------------------------------------------------

Summary of changes:
 src/geom/prep/PreparedPolygonPredicate.cpp                 |  2 +-
 .../tests/general/TestPreparedPolygonPredicate.xml         | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS