Skip to content

v0.2.52..v0.2.53 changeset HighwaySnapMergerJs.cpp

Garret Voltz edited this page Feb 12, 2020 · 1 revision
diff --git a/hoot-js/src/main/cpp/hoot/js/conflate/merging/HighwaySnapMergerJs.cpp b/hoot-js/src/main/cpp/hoot/js/conflate/merging/HighwaySnapMergerJs.cpp
index 1b1d6ed..d67791d 100644
--- a/hoot-js/src/main/cpp/hoot/js/conflate/merging/HighwaySnapMergerJs.cpp
+++ b/hoot-js/src/main/cpp/hoot/js/conflate/merging/HighwaySnapMergerJs.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "HighwaySnapMergerJs.h"
 
@@ -112,8 +112,10 @@ void HighwaySnapMergerJs::apply(const FunctionCallbackInfo<Value>& args)
   MergerBase::PairsSet pairs = toCpp<MergerBase::PairsSet>(args[2]);
   vector<pair<ElementId, ElementId>> replaced =
       toCpp<vector<pair<ElementId, ElementId>>>(args[3]);
+  const QString matchedBy = toCpp<QString>(args[4]);
 
   HighwaySnapMergerPtr snapMerger(new HighwaySnapMerger(pairs, sublineMatcher));
+  snapMerger->setMatchedBy(matchedBy);
   snapMerger->apply(map, replaced);
 
   // modify the parameter that was passed in
Clone this wiki locally