-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.52..v0.2.53 changeset ScriptMatch.cpp
Garret Voltz edited this page Feb 12, 2020
·
1 revision
diff --git a/hoot-js/src/main/cpp/hoot/js/conflate/matching/ScriptMatch.cpp b/hoot-js/src/main/cpp/hoot/js/conflate/matching/ScriptMatch.cpp
index 2935bc6..78ba30f 100644
--- a/hoot-js/src/main/cpp/hoot/js/conflate/matching/ScriptMatch.cpp
+++ b/hoot-js/src/main/cpp/hoot/js/conflate/matching/ScriptMatch.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 "ScriptMatch.h"
@@ -61,9 +61,9 @@ Match()
{
}
-ScriptMatch::ScriptMatch(const std::shared_ptr<PluginContext>& script, const Persistent<Object>& plugin,
- const ConstOsmMapPtr& map, const v8::Handle<Object>& mapObj, const ElementId& eid1,
- const ElementId& eid2, const ConstMatchThresholdPtr& mt) :
+ScriptMatch::ScriptMatch(const std::shared_ptr<PluginContext>& script,
+ const Persistent<Object>& plugin, const ConstOsmMapPtr& map, const v8::Handle<Object>& mapObj,
+ const ElementId& eid1, const ElementId& eid2, const ConstMatchThresholdPtr& mt) :
Match(mt),
_eid1(eid1),
_eid2(eid2),
@@ -129,9 +129,9 @@ void ScriptMatch::_calculateClassification(const ConstOsmMapPtr& map, Handle<Obj
{
if (_explainText.isEmpty())
{
- throw IllegalArgumentException("If the match is a review an appropriate explanation must "
- "be provided (E.g. { 'review': 1, "
- "'explain': 'some reason' }.");
+ throw IllegalArgumentException(
+ "If the match is a review an appropriate explanation must be provided (E.g. "
+ "{ 'review': 1, 'explain': 'some reason' }.");
}
}
}
@@ -378,7 +378,8 @@ Handle<Value> ScriptMatch::_callGetMatchFeatureDetails(const ConstOsmMapPtr& map
if (func.IsEmpty() || func->IsFunction() == false)
{
- throw IllegalArgumentException("getMatchFeatureDetails must be a valid function.");
+ throw IllegalArgumentException(
+ "getMatchFeatureDetails must be a valid function for match from: " + _matchName);
}
Handle<Object> mapObj = OsmMapJs::create(map);
@@ -451,7 +452,7 @@ std::map<QString, double> ScriptMatch::getFeatures(const ConstOsmMapPtr& map) co
QString ScriptMatch::toString() const
{
stringstream ss;
- ss << "ScriptMatch: " << _eid1 << ", " << _eid2 << " p: " << _p.toString();
+ ss << _matchName << "Match: " << _eid1 << ", " << _eid2 << " p: " << _p.toString();
return QString::fromStdString(ss.str());
}