v0.2.55..v0.2.56 changeset HighwayTagOnlyMerger.cpp
Garret Voltz edited this page Aug 14, 2020
·
3 revisions
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayTagOnlyMerger.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayTagOnlyMerger.cpp
index d0096a1..75e0c7e 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayTagOnlyMerger.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayTagOnlyMerger.cpp
@@ -46,36 +46,28 @@ namespace hoot
HOOT_FACTORY_REGISTER(Merger, HighwayTagOnlyMerger)
-HighwayTagOnlyMerger::HighwayTagOnlyMerger()
- : HighwaySnapMerger()
-{
-}
-
HighwayTagOnlyMerger::HighwayTagOnlyMerger(const std::set<std::pair<ElementId, ElementId>>& pairs,
- std::shared_ptr<PartialNetworkMerger> networkMerger)
- : HighwaySnapMerger(pairs, std::shared_ptr<SublineStringMatcher>()),
- _performBridgeGeometryMerging(
- ConfigOptions().getAttributeConflationAllowRefGeometryChangesForBridges()),
- _networkMerger(networkMerger)
+ std::shared_ptr<PartialNetworkMerger> networkMerger) :
+HighwaySnapMerger(pairs, std::shared_ptr<SublineStringMatcher>()),
+_performBridgeGeometryMerging(
+ConfigOptions().getAttributeConflationAllowRefGeometryChangesForBridges()),
+_networkMerger(networkMerger)
{
_removeTagsFromWayMembers = false;
_markAddedMultilineStringRelations = true;
}
-HighwayTagOnlyMerger::HighwayTagOnlyMerger(const std::set<std::pair<ElementId, ElementId>>& pairs,
- const std::shared_ptr<SublineStringMatcher>& sublineMatcher)
- : HighwaySnapMerger(pairs, sublineMatcher),
- _performBridgeGeometryMerging(
- ConfigOptions().getAttributeConflationAllowRefGeometryChangesForBridges())
+HighwayTagOnlyMerger::HighwayTagOnlyMerger(
+ const std::set<std::pair<ElementId, ElementId>>& pairs,
+ const std::shared_ptr<SublineStringMatcher>& sublineMatcher) :
+HighwaySnapMerger(pairs, sublineMatcher),
+_performBridgeGeometryMerging(
+ConfigOptions().getAttributeConflationAllowRefGeometryChangesForBridges())
{
_removeTagsFromWayMembers = false;
_markAddedMultilineStringRelations = true;
}
-HighwayTagOnlyMerger::~HighwayTagOnlyMerger()
-{
-}
-
void HighwayTagOnlyMerger::_determineKeeperFeature(ElementPtr element1, ElementPtr element2,
ElementPtr& keeper, ElementPtr& toRemove,
bool& removeSecondaryElement)