v0.2.49..v0.2.50 changeset NodesPerWayVisitor.h - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/visitors/NodesPerWayVisitor.h b/hoot-core/src/main/cpp/hoot/core/visitors/NodesPerWayVisitor.h
index d39d051..6017898 100644
--- a/hoot-core/src/main/cpp/hoot/core/visitors/NodesPerWayVisitor.h
+++ b/hoot-core/src/main/cpp/hoot/core/visitors/NodesPerWayVisitor.h
@@ -29,16 +29,25 @@
 #define NODES_PER_WAY_VISITOR_H
 
 // hoot
-#include <hoot/core/elements/ConstElementVisitor.h>
 #include <hoot/core/info/NumericStatistic.h>
 #include <hoot/core/info/OperationStatusInfo.h>
 #include <hoot/core/criterion/ElementTypeCriterion.h>
+#include <hoot/core/util/Configurable.h>
+#include <hoot/core/elements/ConstElementVisitor.h>
+#include <hoot/core/criterion/ElementCriterionConsumer.h>
 
 namespace hoot
 {
 
+/*
+ * Making this inherit from MultipleCriterionConsumerVisitor worked for some situations but caused
+ * incorrect output when this was used with CalculateStats op, so implementing single crierion
+ * support without inheritance. It appears the incorrect behavior has something to do with
+ * MultipleCriterionConsumerVisitor inheriting from ElementVisitor and not ConstElementVisitor but
+ * not exactly sure why yet. See related note in MultipleCriterionConsumerVisitor.
+ */
 class NodesPerWayVisitor : public ConstElementVisitor, public NumericStatistic,
-  public OperationStatusInfo
+  public OperationStatusInfo, public Configurable, public ElementCriterionConsumer
 {
 public:
 
@@ -46,8 +55,12 @@ public:
 
   NodesPerWayVisitor();
 
+  virtual void addCriterion(const ElementCriterionPtr& e);
+
   virtual void visit(const ConstElementPtr& e) override;
 
+  virtual void setConfiguration(const Settings& conf);
+
   virtual QString getDescription() const { return "Calculates way node statistics"; }
 
   virtual QString getInitStatusMessage() const
@@ -68,11 +81,16 @@ public:
 
 private:
 
-  WayCriterion _crit;
+  WayCriterion _wayCrit;
+  std::shared_ptr<ElementCriterion> _customCrit;
 
   int _totalWayNodes;
   int _minNodesPerWay;
   int _maxNodesPerWay;
+
+  bool _negateCriterion;
+
+  void _setCriterion(const QString& criterionName);
 };
 
 }