v0.2.53..v0.2.54 changeset AbstractDistanceExtractor.cpp - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/algorithms/extractors/AbstractDistanceExtractor.cpp b/hoot-core/src/main/cpp/hoot/core/algorithms/extractors/AbstractDistanceExtractor.cpp
index a920fa1..7e28456 100644
--- a/hoot-core/src/main/cpp/hoot/core/algorithms/extractors/AbstractDistanceExtractor.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/algorithms/extractors/AbstractDistanceExtractor.cpp
@@ -23,7 +23,7 @@
  * copyrights will be updated automatically.
  *
  * @copyright Copyright (C) 2005 VividSolutions (http://www.vividsolutions.com/)
- * @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 "AbstractDistanceExtractor.h"
 
@@ -38,21 +38,24 @@ namespace hoot
 {
 
 double AbstractDistanceExtractor::combinedEnvelopeDiagonalDistance(const OsmMap& map,
-  const std::shared_ptr<const Element>& target, const std::shared_ptr<const Element>& candidate) const
+  const std::shared_ptr<const Element>& target,
+  const std::shared_ptr<const Element>& candidate) const
 {
   ConstOsmMapPtr m = map.shared_from_this();
   std::shared_ptr<Envelope> env(target->getEnvelope(m));
   std::shared_ptr<Envelope> candidateEnv(candidate->getEnvelope(m));
   env->expandToInclude(candidateEnv.get());
-  return sqrt(env->getWidth() * env->getWidth() + env->getHeight() * env->getHeight());
+  const double result =
+    sqrt(env->getWidth() * env->getWidth() + env->getHeight() * env->getHeight());
+  return result;
 }
 
 double AbstractDistanceExtractor::extract(const OsmMap& map,
                                           const std::shared_ptr<const Element>& target,
                                           const std::shared_ptr<const Element>& candidate) const
 {
-  return 1 - distance(map, target, candidate) /
-    combinedEnvelopeDiagonalDistance(map, target, candidate);
+  return
+    1 - distance(map, target, candidate) / combinedEnvelopeDiagonalDistance(map, target, candidate);
 }
 
 }