Add datafacade factory to select avoid flags

This commit is contained in:
Patrick Niklaus
2017-07-21 21:55:19 +00:00
committed by Patrick Niklaus
parent c8b142a676
commit 21686ee8a9
14 changed files with 183 additions and 71 deletions
+4 -1
View File
@@ -89,7 +89,10 @@ void SetAvoidableClasses(const ExtractorCallbacks::ClassesMap &classes_map,
throw util::exception("Only " + std::to_string(MAX_AVOIDABLE_CLASSES) + " avoidable combinations allowed.");
}
std::size_t combination_index = 0;
// The avoid index 0 is reserve for not avoiding anything
profile_properties.SetAvoidableClasses(0, 0);
std::size_t combination_index = 1;
for (const auto &combination : avoidable_classes)
{
ClassData mask = 0;
+1 -1
View File
@@ -189,7 +189,7 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti
throw util::exception("Maximum number of classes if " +
std::to_string(MAX_CLASS_INDEX + 1));
}
ClassData class_mask = 1u << classes_map.size();
ClassData class_mask = getClassData(classes_map.size());
classes_map[class_name] = class_mask;
return class_mask;
}