v0.2.53..v0.2.54 changeset WayNodeCriterion.cpp

diff --git a/hoot-core/src/main/cpp/hoot/core/criterion/WayNodeCriterion.cpp b/hoot-core/src/main/cpp/hoot/core/criterion/WayNodeCriterion.cpp
index e274c49..c959489 100644
--- a/hoot-core/src/main/cpp/hoot/core/criterion/WayNodeCriterion.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/criterion/WayNodeCriterion.cpp
@@ -41,16 +41,70 @@ WayNodeCriterion::WayNodeCriterion()
 {
 }
 
+WayNodeCriterion::WayNodeCriterion(ConstOsmMapPtr map) :
+_map(map)
+{
+}
+
 bool WayNodeCriterion::isSatisfied(const ConstElementPtr& e) const
 {
-  LOG_VART(_map.get());
-  if (_map.get())
+  if (e->getElementType() != ElementType::Node)
+  {
+    return false;
+  }
+
+  if (!_map)
+  {
+    throw HootException("You must set a map before calling: " + toString());
+  }
+
+  const std::set<long>& containingWays =
+    _map->getIndex().getNodeToWayMap()->getWaysByNode(e->getId());
+  if (containingWays.size() == 0)
+  {
+    return false;
+  }
+
+  for (std::set<long>::const_iterator it = containingWays.begin(); it != containingWays.end(); ++it)
   {
-    LOG_VART(_map->size());
+    const long containingWayId = *it;
+    if (!_map->containsElement(ElementId(ElementType::Way, containingWayId)))
+    {
+      return false;
+    }
+    if (_parentCriterion && !_parentCriterion->isSatisfied(_map->getWay(containingWayId)))
+    {
+      return false;
+    }
   }
-  return
-    e->getElementType() == ElementType::Node &&
-    _map->getIndex().getNodeToWayMap()->getWaysByNode(e->getId()).size() > 0;
+
+  return true;
+}
+
+long WayNodeCriterion::getFirstOwningWayId(const ConstNodePtr& node)
+{
+  long result = 0;
+
+  if (!_map)
+  {
+    throw HootException("You must set a map before calling WayNodeCriterion");
+  }
+
+  const std::set<long> waysContainingNode =
+    _map->getIndex().getNodeToWayMap()->getWaysByNode(node->getId());
+  for (std::set<long>::const_iterator it = waysContainingNode.begin();
+       it != waysContainingNode.end(); ++it)
+  {
+    const long containingWayId = *it;
+    if (_map->containsElement(ElementId(ElementType::Way, containingWayId)) &&
+        (!_parentCriterion || _parentCriterion->isSatisfied(_map->getWay(containingWayId))))
+    {
+      return containingWayId;
+      break;
+    }
+  }
+
+  return result;
 }
 
 }