v0.2.55..v0.2.56 changeset ConflateCmd.cpp

diff --git a/hoot-core/src/main/cpp/hoot/core/cmd/ConflateCmd.cpp b/hoot-core/src/main/cpp/hoot/core/cmd/ConflateCmd.cpp
index 5a99135..6385403 100644
--- a/hoot-core/src/main/cpp/hoot/core/cmd/ConflateCmd.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/cmd/ConflateCmd.cpp
@@ -57,15 +57,13 @@
 #include <hoot/core/elements/VersionUtils.h>
 #include <hoot/core/ops/RemoveRoundabouts.h>
 #include <hoot/core/ops/ReplaceRoundabouts.h>
-#include <hoot/core/criterion/PointCriterion.h>
-#include <hoot/core/criterion/LinearCriterion.h>
-#include <hoot/core/criterion/PolygonCriterion.h>
 #include <hoot/core/conflate/matching/MatchFactory.h>
 #include <hoot/core/ops/MapCleaner.h>
 #include <hoot/core/io/ChangesetStatsFormat.h>
 #include <hoot/core/util/FileUtils.h>
 #include <hoot/core/conflate/SuperfluousConflateOpRemover.h>
 #include <hoot/core/util/MemoryUsageChecker.h>
+#include <hoot/core/algorithms/rubber-sheet/RubberSheet.h>
 
 // Standard
 #include <fstream>
@@ -293,6 +291,7 @@ int ConflateCmd::runSimple(QStringList& args)
   {
     _disableRoundaboutRemoval();
   }
+
   if (_filterOps)
   {
     // Let's see if we can remove any ops in the configuration that will have no effect on the
@@ -423,6 +422,12 @@ int ConflateCmd::runSimple(QStringList& args)
 
   if (ConfigOptions().getConflatePreOps().size() > 0)
   {
+    // By default rubbersheeting has no filters. When conflating, we need to add the ones from the
+    // config.
+    conf().set(
+      ConfigOptions::getRubberSheetElementCriteriaKey(),
+      ConfigOptions().getConflateRubberSheetElementCriteria());
+
     // apply any user specified pre-conflate operations
     LOG_STATUS("Running pre-conflate operations...");
     QElapsedTimer timer;