Allow empty geoms to test equal

libgeos · Aug 2, 2024 · 2c9b3cd · 2c9b3cd
1 parent 41bd100
commit 2c9b3cd
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 29 deletions.
diff --git a/include/geos/operation/relateng/RelatePredicate.h b/include/geos/operation/relateng/RelatePredicate.h
@@ -490,12 +490,20 @@ class EqualsTopoPredicate : public IMPredicate {
         return std::string("equals");
     }
 
+    bool requireInteraction() const override {
+        //-- allow EMPTY = EMPTY
+        return false;
+    };
+
     void init(int _dimA, int _dimB) override {
         IMPredicate::init(_dimA, _dimB);
-        require(dimA == dimB);
+        //-- don't require equal dims, because EMPTY = EMPTY for all dims
     }
 
     void init(const Envelope& envA, const Envelope& envB) override {
+        //-- handle EMPTY = EMPTY cases
+        setValueIf(true, envA.isNull() && envB.isNull());
+
         require(envA.equals(&envB));
     }
 

diff --git a/src/operation/relateng/RelateNG.cpp b/src/operation/relateng/RelateNG.cpp
@@ -151,10 +151,6 @@ RelateNG::evaluate(const Geometry* b, TopologyPredicate& predicate)
 
     RelateGeometry geomB(b, boundaryNodeRule);
 
-    if (geomA.isEmpty() && geomB.isEmpty()) {
-        //TODO: what if predicate is disjoint?  Perhaps use result on disjoint envs?
-        return finishValue(predicate);
-    }
     int dimA = geomA.getDimensionReal();
     int dimB = geomB.getDimensionReal();
 

diff --git a/tests/unit/operation/relateng/RelateNGTest.cpp b/tests/unit/operation/relateng/RelateNGTest.cpp
@@ -841,37 +841,32 @@ void object::test<60> ()
 
 //================  Empty Geometries  ==============
 
+//-- test equals against all combinations of empty geometries
 template<>
 template<>
 void object::test<61> ()
 {
-    std::string a = "POINT EMPTY";
-    std::string b = "POINT EMPTY";
-    checkRelate(a, b, "FFFFFFFF2");
-    checkEquals(a, b, true);
-}
-
-template<>
-template<>
-void object::test<62> ()
-{
-    std::string a = "LINESTRING EMPTY";
-    std::string b = "LINESTRING EMPTY";
-    checkRelate(a, b, "FFFFFFFF2");
-    checkEquals(a, b, true);
-}
+    std::string empties[] = {
+        "POINT EMPTY",
+        "LINESTRING EMPTY",
+        "POLYGON EMPTY",
+        "MULTIPOINT EMPTY",
+        "MULTILINESTRING EMPTY",
+        "MULTIPOLYGON EMPTY",
+        "GEOMETRYCOLLECTION EMPTY"
+    };
+    int nempty = 7;
+    for (int i = 0; i < nempty; i++) {
+        for (int j = 0; j < nempty; j++) {
+            std::string a = empties[i];
+            std::string b = empties[j];
+            checkRelate(a, b, "FFFFFFFF2");
+            checkEquals(a, b, true);
+        }
+    }
 
-template<>
-template<>
-void object::test<63> ()
-{
-    std::string a = "GEOMETRYCOLLECTION EMPTY";
-    std::string b = "GEOMETRYCOLLECTION EMPTY";
-    checkRelate(a, b, "FFFFFFFF2");
-    checkEquals(a, b, true);
 }
 
 
 
-
 } // namespace tut