GmMultiPolyIntersector for python - fix Get/Set Query

Aquaveo · Jan 4, 2024 · 4ea0ab5 · 4ea0ab5
1 parent 320557c
commit 4ea0ab5
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/xmsgrid/python/geometry/GmMultiPolyIntersector_py.cpp b/xmsgrid/python/geometry/GmMultiPolyIntersector_py.cpp
@@ -37,8 +37,7 @@ void initGmMultiPolyIntersector(py::module &m) {
     BSHP<xms::GmMultiPolyIntersector> rval(xms::GmMultiPolyIntersector::New(*vec_pts, *vec_polys, sorter, starting_id));
     rval->SetQuery(query == "covered_by" ? xms::GMMPIQ_COVEREDBY : xms::GMMPIQ_INTERSECTS);
     return rval;
-  }), py::arg("points"), py::arg("polys"), py::arg("starting_id") = 1, py::arg("query") = "covered_by")
-  .def_property("query", &xms::GmMultiPolyIntersector::GetQuery, &xms::GmMultiPolyIntersector::SetQuery);
+  }), py::arg("points"), py::arg("polys"), py::arg("starting_id") = 1, py::arg("query") = "covered_by");
   // ---------------------------------------------------------------------------
   // function: TraverseLineSegment
   // ---------------------------------------------------------------------------
@@ -57,4 +56,17 @@ void initGmMultiPolyIntersector(py::module &m) {
     xms::Pt3d p = xms::Pt3dFromPyIter(point);
     return self.PolygonFromPoint(p);
   }, py::arg("point"));
+  // ---------------------------------------------------------------------------
+  // function: GetQuery
+  // ---------------------------------------------------------------------------
+  gmMpi.def("GetQuery", [](xms::GmMultiPolyIntersector &self) -> std::string {
+    return self.GetQuery() == xms::GMMPIQ_COVEREDBY ? "covered_by" : "intersects";
+  });
+  // ---------------------------------------------------------------------------
+  // function: SetQuery
+  // ---------------------------------------------------------------------------
+  gmMpi.def("SetQuery", [](xms::GmMultiPolyIntersector &self, std::string query_str) {
+    GmMultiPolyIntersectorQueryEnum q = (query_str == "covered_by" ? xms::GMMPIQ_COVEREDBY : xms::GMMPIQ_INTERSECTS);
+    self.SetQuery(q);
+  });
 }