Skip to content

v0.2.53..v0.2.54 changeset ScriptMerger.cpp

Garret Voltz edited this page Mar 31, 2020 · 1 revision
diff --git a/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMerger.cpp b/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMerger.cpp
index bc3528f..94267b6 100644
--- a/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMerger.cpp
+++ b/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMerger.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "ScriptMerger.h"
 
@@ -95,8 +95,8 @@ void ScriptMerger::_applyMergePair(const OsmMapPtr& map,
 
   const bool mapContainsElement1 = map->containsElement(_eid1);
   const bool mapContainsElement2 = map->containsElement(_eid2);
-  //This contains check was put in place as the result of changing MergerFactory not throw an
-  //exception when a merger cannot be found for a set of match pairs.
+  // This contains and following pair size checks were put in place as the result of changing
+  // MergerFactory to not throw an exception when a merger cannot be found for a set of match pairs.
   if (!mapContainsElement1 || !mapContainsElement2)
   {
     if (logWarnCount < Log::getWarnMessageLimit())
@@ -118,8 +118,6 @@ void ScriptMerger::_applyMergePair(const OsmMapPtr& map,
     logWarnCount++;
     return;
   }
-  //This pair size check was put in place as the result of changing MergerFactory not throw an
-  //exception when a merger cannot be found for a set of match pairs.
   else if (_pairs.size() == 0)
   {
     if (logWarnCount < Log::getWarnMessageLimit())
Clone this wiki locally