-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.48..v0.2.49 changeset PoiPolygonMatch.cpp
Garret Voltz edited this page Oct 2, 2019
·
1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatch.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatch.cpp
index 21a448e..5f5149b 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatch.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMatch.cpp
@@ -460,11 +460,11 @@ void PoiPolygonMatch::calculateMatch(const ElementId& eid1, const ElementId& eid
const QString nameMatchStr = _nameScore >= _nameScoreThreshold ? "yes" : "no";
const QString addressMatchStr = _addressScore >= 1.0 ? "yes" : "no";
const QString distanceMatchStr = _distance <= _matchDistanceThreshold ? "yes" : "no";
- // TODO: these score contributions are hardcoded
_explainText =
- QString("Features had an additive similarity score of %1, which is less than the required score of %2. Matches: distance: %3 (%4m; score: 2/2), type: %5 (score: %6/1), name: %7 (score: %8/1), address: %9 (score: %10/1). Max distance allowed for match: %11m, max distance allowed for review: %12m.")
+ QString("Similarity score: %1; less than match threshold: %2; meets review threshold: %3. distance: %4 (%5m; score: 2/2), type: %6 (score: %7/1), name: %8 (score: %9/1), address: %10 (score: %11/1). Max distance allowed for match: %12m, review: %13m.")
.arg(evidence)
.arg(_matchEvidenceThreshold)
+ .arg(_reviewEvidenceThreshold)
.arg(distanceMatchStr)
.arg(round(_distance))
.arg(typeMatchStr)
@@ -486,6 +486,11 @@ void PoiPolygonMatch::calculateMatch(const ElementId& eid1, const ElementId& eid
LOG_TRACE("**************************");
}
+MatchType PoiPolygonMatch::getType() const
+{
+ return _threshold->getType(_class);
+}
+
unsigned int PoiPolygonMatch::_getDistanceEvidence(ConstElementPtr poi, ConstElementPtr poly)
{
_distance = PoiPolygonDistanceExtractor().extract(*_map, poi, poly);