-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.53..v0.2.54 changeset PoiPolygonMatchCreator.cpp
Garret Voltz edited this page Mar 31, 2020
·
1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatchCreator.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatchCreator.cpp
index ca783cc..8f910a7 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatchCreator.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatchCreator.cpp
@@ -35,6 +35,8 @@
#include <hoot/core/util/ConfigOptions.h>
#include <hoot/core/util/Factory.h>
#include <hoot/core/util/StringUtils.h>
+#include <hoot/core/criterion/PoiCriterion.h>
+#include <hoot/core/criterion/BuildingCriterion.h>
// Std
#include <float.h>
@@ -84,8 +86,6 @@ void PoiPolygonMatchCreator::createMatches(const ConstOsmMapPtr& map,
QElapsedTimer timer;
timer.start();
- //poi.polygon.additional.search.distance
- //poi.polygon.match.distance.threshold
QString searchRadiusStr;
const double additionalDistance = ConfigOptions().getPoiPolygonAdditionalSearchDistance();
if (additionalDistance <= 0)
@@ -95,8 +95,15 @@ void PoiPolygonMatchCreator::createMatches(const ConstOsmMapPtr& map,
else
{
searchRadiusStr =
- "within a feature dependent search radius plus an additional distance of " +
- QString::number(additionalDistance, 'g', 2) + " meters";
+ "within a feature dependent search radius plus an additional distance of ";
+ if (additionalDistance < 1000)
+ {
+ searchRadiusStr += QString::number(additionalDistance, 'g', 3) + " meters";
+ }
+ else
+ {
+ searchRadiusStr += QString::number(additionalDistance / 1000.0, 'g', 3) + " kilometers";
+ }
}
LOG_STATUS("Looking for matches with: " << className() << " " << searchRadiusStr << "...");
LOG_VARD(*threshold);
@@ -569,4 +576,12 @@ std::shared_ptr<PoiPolygonRfClassifier> PoiPolygonMatchCreator::_getRf()
return _rf;
}
+QStringList PoiPolygonMatchCreator::getCriteria() const
+{
+ QStringList criteria;
+ criteria.append(QString::fromStdString(PoiCriterion::className()));
+ criteria.append(QString::fromStdString(BuildingCriterion::className()));
+ return criteria;
+}
+
}