Updated format and ChangeLog

This commit is contained in:
Michael Krasnyk 2016-07-26 21:44:17 +02:00
parent 61e6afdef0
commit c918a7957b
No known key found for this signature in database
GPG Key ID: 3854C9454FE00649
4 changed files with 12 additions and 10 deletions

View File

@ -2,6 +2,7 @@
Changes from 5.3.0 Changes from 5.3.0
- Profiles - Profiles
- includes library guidance.lua that offers preliminary configuration on guidance. - includes library guidance.lua that offers preliminary configuration on guidance.
- added left_hand_driving flag in global profile properties
- Guidance - Guidance
- Handle Access tags for lanes, only considering valid lanes in lane-guidance (think car | car | bike | car) - Handle Access tags for lanes, only considering valid lanes in lane-guidance (think car | car | bike | car)
- API: - API:

View File

@ -1,10 +1,10 @@
#ifndef ENGINE_GUIDANCE_POST_PROCESSING_HPP #ifndef ENGINE_GUIDANCE_POST_PROCESSING_HPP
#define ENGINE_GUIDANCE_POST_PROCESSING_HPP #define ENGINE_GUIDANCE_POST_PROCESSING_HPP
#include "engine/datafacade/datafacade_base.hpp"
#include "engine/guidance/leg_geometry.hpp" #include "engine/guidance/leg_geometry.hpp"
#include "engine/guidance/route_step.hpp" #include "engine/guidance/route_step.hpp"
#include "engine/phantom_node.hpp" #include "engine/phantom_node.hpp"
#include "engine/datafacade/datafacade_base.hpp"
#include <vector> #include <vector>

View File

@ -5,8 +5,8 @@
#include "extractor/guidance/intersection.hpp" #include "extractor/guidance/intersection.hpp"
#include "extractor/guidance/intersection_handler.hpp" #include "extractor/guidance/intersection_handler.hpp"
#include "extractor/guidance/roundabout_type.hpp" #include "extractor/guidance/roundabout_type.hpp"
#include "extractor/query_node.hpp"
#include "extractor/profile_properties.hpp" #include "extractor/profile_properties.hpp"
#include "extractor/query_node.hpp"
#include "util/name_table.hpp" #include "util/name_table.hpp"
#include "util/node_based_graph.hpp" #include "util/node_based_graph.hpp"

View File

@ -28,8 +28,7 @@ RoundaboutHandler::RoundaboutHandler(const util::NodeBasedDynamicGraph &node_bas
const SuffixTable &street_name_suffix_table, const SuffixTable &street_name_suffix_table,
const ProfileProperties &profile_properties) const ProfileProperties &profile_properties)
: IntersectionHandler(node_based_graph, node_info_list, name_table, street_name_suffix_table), : IntersectionHandler(node_based_graph, node_info_list, name_table, street_name_suffix_table),
compressed_edge_container(compressed_edge_container), compressed_edge_container(compressed_edge_container), profile_properties(profile_properties)
profile_properties(profile_properties)
{ {
} }
@ -69,8 +68,8 @@ detail::RoundaboutFlags RoundaboutHandler::getRoundaboutFlags(
const bool lhs = profile_properties.left_hand_driving; const bool lhs = profile_properties.left_hand_driving;
const int step = lhs ? -1 : 1; const int step = lhs ? -1 : 1;
for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0; for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0; cnt < intersection.size();
cnt < intersection.size(); ++cnt, idx += step) ++cnt, idx += step)
{ {
const auto &road = intersection[idx]; const auto &road = intersection[idx];
const auto &edge_data = node_based_graph.GetEdgeData(road.turn.eid); const auto &edge_data = node_based_graph.GetEdgeData(road.turn.eid);
@ -108,8 +107,8 @@ void RoundaboutHandler::invalidateExitAgainstDirection(const NodeID from_nid,
bool past_roundabout_angle = false; bool past_roundabout_angle = false;
const bool lhs = profile_properties.left_hand_driving; const bool lhs = profile_properties.left_hand_driving;
const int step = lhs ? -1 : 1; const int step = lhs ? -1 : 1;
for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0; for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0; cnt < intersection.size();
cnt < intersection.size(); ++cnt, idx += step) ++cnt, idx += step)
{ {
auto &road = intersection[idx]; auto &road = intersection[idx];
const auto &edge_data = node_based_graph.GetEdgeData(road.turn.eid); const auto &edge_data = node_based_graph.GetEdgeData(road.turn.eid);
@ -373,7 +372,8 @@ Intersection RoundaboutHandler::handleRoundabouts(const RoundaboutType roundabou
// Shoule hopefully have only a single exit and continue // Shoule hopefully have only a single exit and continue
// at least for cars. How about bikes? // at least for cars. How about bikes?
for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0; for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0;
cnt < intersection.size(); ++cnt, idx += step) cnt < intersection.size();
++cnt, idx += step)
{ {
auto &road = intersection[idx]; auto &road = intersection[idx];
auto &turn = road.turn; auto &turn = road.turn;
@ -410,7 +410,8 @@ Intersection RoundaboutHandler::handleRoundabouts(const RoundaboutType roundabou
else else
{ {
for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0; for (std::size_t cnt = 0, idx = lhs ? intersection.size() - 1 : 0;
cnt < intersection.size(); ++cnt, idx += step) cnt < intersection.size();
++cnt, idx += step)
{ {
auto &road = intersection[idx]; auto &road = intersection[idx];
if (!road.entry_allowed) if (!road.entry_allowed)