Merge pull request #4094 from Project-OSRM/refactor/rapidash

Replace timezone shapefile parsing with geojson parsing
This commit is contained in:
Patrick Niklaus
2017-06-02 20:01:04 +00:00
committed by GitHub
321 changed files with 54225 additions and 231 deletions
+4 -2
View File
@@ -464,6 +464,8 @@ bool IsRestrictionValid(const Timezoner &tz_handler,
// Get local time of the restriction
const auto &local_time = tz_handler(point_t{lon, lat});
if (!local_time)
return false;
// TODO: check restriction type [:<transportation mode>][:<direction>]
// http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Tagging
@@ -471,7 +473,7 @@ bool IsRestrictionValid(const Timezoner &tz_handler,
// TODO: parsing will fail for combined conditions, e.g. Sa-Su AND weight>7
// http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Combined_conditions:_AND
if (osrm::util::CheckOpeningHours(condition, local_time))
if (osrm::util::CheckOpeningHours(condition, *local_time))
return true;
return false;
@@ -835,7 +837,7 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
});
}
if (update_turn_penalties)
if (update_turn_penalties || update_conditional_turns)
{
const auto save_penalties = [](const auto &filename, const auto &data) -> void {
storage::io::FileWriter writer(filename, storage::io::FileWriter::GenerateFingerprint);