v0.2.53..v0.2.54 changeset LinearCriterion.h - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/criterion/LinearCriterion.h b/hoot-core/src/main/cpp/hoot/core/criterion/LinearCriterion.h
index f25641c..39f63d5 100644
--- a/hoot-core/src/main/cpp/hoot/core/criterion/LinearCriterion.h
+++ b/hoot-core/src/main/cpp/hoot/core/criterion/LinearCriterion.h
@@ -22,14 +22,14 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 
 #ifndef LINEARCRITERION_H
 #define LINEARCRITERION_H
 
 // Hoot
-#include <hoot/core/criterion/GeometryTypeCriterion.h>
+#include <hoot/core/criterion/ConflatableElementCriterion.h>
 
 namespace hoot
 {
@@ -37,7 +37,7 @@ namespace hoot
 /**
  * Identifies linear features
  */
-class LinearCriterion : public GeometryTypeCriterion
+class LinearCriterion : public ConflatableElementCriterion
 {
 public:
 
@@ -56,6 +56,7 @@ public:
   virtual QString toString() const override
   { return QString::fromStdString(className()).remove("hoot::"); }
 
+  virtual bool supportsSpecificConflation() const { return false; }
 };
 
 }