change copyright line from personal names to project
This commit is contained in:
parent
79b9bdf7ce
commit
3bd27ae8c5
2
Gemfile
2
Gemfile
@ -4,4 +4,4 @@ gem "cucumber"
|
|||||||
gem "rake"
|
gem "rake"
|
||||||
gem "osmlib-base"
|
gem "osmlib-base"
|
||||||
gem "sys-proctable"
|
gem "sys-proctable"
|
||||||
gem "rspec-expectations"
|
gem "rspec-expectations"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -95,8 +95,8 @@ template <typename GraphT> class BFSComponentExplorer
|
|||||||
* Explores the current component that starts at node using BFS.
|
* Explores the current component that starts at node using BFS.
|
||||||
*/
|
*/
|
||||||
unsigned ExploreComponent(std::queue<std::pair<NodeID, NodeID>> &bfs_queue,
|
unsigned ExploreComponent(std::queue<std::pair<NodeID, NodeID>> &bfs_queue,
|
||||||
NodeID node,
|
NodeID node,
|
||||||
unsigned current_component)
|
unsigned current_component)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
Graphical representation of variables:
|
Graphical representation of variables:
|
||||||
@ -118,7 +118,7 @@ template <typename GraphT> class BFSComponentExplorer
|
|||||||
std::pair<NodeID, NodeID> current_queue_item = bfs_queue.front();
|
std::pair<NodeID, NodeID> current_queue_item = bfs_queue.front();
|
||||||
bfs_queue.pop();
|
bfs_queue.pop();
|
||||||
|
|
||||||
const NodeID v = current_queue_item.first; // current node
|
const NodeID v = current_queue_item.first; // current node
|
||||||
const NodeID u = current_queue_item.second; // parent
|
const NodeID u = current_queue_item.second; // parent
|
||||||
// increment size counter of current component
|
// increment size counter of current component
|
||||||
++current_component_size;
|
++current_component_size;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -35,7 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
|
||||||
/* This class object computes the bitvector of indicating generalized input
|
/* This class object computes the bitvector of indicating generalized input
|
||||||
* points according to the (Ramer-)Douglas-Peucker algorithm.
|
* points according to the (Ramer-)Douglas-Peucker algorithm.
|
||||||
*
|
*
|
||||||
@ -43,7 +42,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
* bit indicating if the points is present in the generalization.
|
* bit indicating if the points is present in the generalization.
|
||||||
* Note: points may also be pre-selected*/
|
* Note: points may also be pre-selected*/
|
||||||
|
|
||||||
static const std::array<int, 19> DOUGLAS_PEUCKER_THRESHOLDS {{
|
static const std::array<int, 19> DOUGLAS_PEUCKER_THRESHOLDS{{
|
||||||
512440, // z0
|
512440, // z0
|
||||||
256720, // z1
|
256720, // z1
|
||||||
122560, // z2
|
122560, // z2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -54,7 +54,8 @@ template <class DataFacadeT, class SegmentT> struct ExtractRouteNames
|
|||||||
|
|
||||||
for (const SegmentT &segment : segment_list)
|
for (const SegmentT &segment : segment_list)
|
||||||
{
|
{
|
||||||
if (segment.name_id != blocked_name_id && segment.length > result_segment.length && segment.name_id != 0)
|
if (segment.name_id != blocked_name_id && segment.length > result_segment.length &&
|
||||||
|
segment.name_id != 0)
|
||||||
{
|
{
|
||||||
result_segment = segment;
|
result_segment = segment;
|
||||||
}
|
}
|
||||||
@ -73,9 +74,13 @@ template <class DataFacadeT, class SegmentT> struct ExtractRouteNames
|
|||||||
SegmentT alternative_segment_1, alternative_segment_2;
|
SegmentT alternative_segment_1, alternative_segment_2;
|
||||||
|
|
||||||
auto length_comperator = [](const SegmentT &a, const SegmentT &b)
|
auto length_comperator = [](const SegmentT &a, const SegmentT &b)
|
||||||
{ return a.length > b.length; };
|
{
|
||||||
|
return a.length > b.length;
|
||||||
|
};
|
||||||
auto name_id_comperator = [](const SegmentT &a, const SegmentT &b)
|
auto name_id_comperator = [](const SegmentT &a, const SegmentT &b)
|
||||||
{ return a.name_id < b.name_id; };
|
{
|
||||||
|
return a.name_id < b.name_id;
|
||||||
|
};
|
||||||
|
|
||||||
if (shortest_path_segments.empty())
|
if (shortest_path_segments.empty())
|
||||||
{
|
{
|
||||||
@ -87,8 +92,7 @@ template <class DataFacadeT, class SegmentT> struct ExtractRouteNames
|
|||||||
shortest_segment_1 = shortest_path_segments[0];
|
shortest_segment_1 = shortest_path_segments[0];
|
||||||
if (!alternative_path_segments.empty())
|
if (!alternative_path_segments.empty())
|
||||||
{
|
{
|
||||||
std::sort(alternative_path_segments.begin(),
|
std::sort(alternative_path_segments.begin(), alternative_path_segments.end(),
|
||||||
alternative_path_segments.end(),
|
|
||||||
length_comperator);
|
length_comperator);
|
||||||
|
|
||||||
// also pick the longest segment for the alternative path
|
// also pick the longest segment for the alternative path
|
||||||
@ -99,16 +103,13 @@ template <class DataFacadeT, class SegmentT> struct ExtractRouteNames
|
|||||||
// alternative
|
// alternative
|
||||||
std::vector<SegmentT> shortest_path_set_difference(shortest_path_segments.size());
|
std::vector<SegmentT> shortest_path_set_difference(shortest_path_segments.size());
|
||||||
std::sort(shortest_path_segments.begin(), shortest_path_segments.end(), name_id_comperator);
|
std::sort(shortest_path_segments.begin(), shortest_path_segments.end(), name_id_comperator);
|
||||||
std::sort(alternative_path_segments.begin(), alternative_path_segments.end(), name_id_comperator);
|
std::sort(alternative_path_segments.begin(), alternative_path_segments.end(),
|
||||||
std::set_difference(shortest_path_segments.begin(),
|
name_id_comperator);
|
||||||
shortest_path_segments.end(),
|
std::set_difference(shortest_path_segments.begin(), shortest_path_segments.end(),
|
||||||
alternative_path_segments.begin(),
|
alternative_path_segments.begin(), alternative_path_segments.end(),
|
||||||
alternative_path_segments.end(),
|
shortest_path_set_difference.begin(), name_id_comperator);
|
||||||
shortest_path_set_difference.begin(),
|
|
||||||
name_id_comperator);
|
|
||||||
|
|
||||||
std::sort(shortest_path_set_difference.begin(),
|
std::sort(shortest_path_set_difference.begin(), shortest_path_set_difference.end(),
|
||||||
shortest_path_set_difference.end(),
|
|
||||||
length_comperator);
|
length_comperator);
|
||||||
shortest_segment_2 =
|
shortest_segment_2 =
|
||||||
PickNextLongestSegment(shortest_path_set_difference, shortest_segment_1.name_id);
|
PickNextLongestSegment(shortest_path_set_difference, shortest_segment_1.name_id);
|
||||||
@ -116,29 +117,23 @@ template <class DataFacadeT, class SegmentT> struct ExtractRouteNames
|
|||||||
// compute the set difference (for alternative path) depending on names between shortest and
|
// compute the set difference (for alternative path) depending on names between shortest and
|
||||||
// alternative
|
// alternative
|
||||||
// vectors are still sorted, no need to do again
|
// vectors are still sorted, no need to do again
|
||||||
BOOST_ASSERT(std::is_sorted(shortest_path_segments.begin(),
|
BOOST_ASSERT(std::is_sorted(shortest_path_segments.begin(), shortest_path_segments.end(),
|
||||||
shortest_path_segments.end(),
|
|
||||||
name_id_comperator));
|
name_id_comperator));
|
||||||
BOOST_ASSERT(std::is_sorted(alternative_path_segments.begin(),
|
BOOST_ASSERT(std::is_sorted(alternative_path_segments.begin(),
|
||||||
alternative_path_segments.end(),
|
alternative_path_segments.end(), name_id_comperator));
|
||||||
name_id_comperator));
|
|
||||||
|
|
||||||
std::vector<SegmentT> alternative_path_set_difference(alternative_path_segments.size());
|
std::vector<SegmentT> alternative_path_set_difference(alternative_path_segments.size());
|
||||||
std::set_difference(alternative_path_segments.begin(),
|
std::set_difference(alternative_path_segments.begin(), alternative_path_segments.end(),
|
||||||
alternative_path_segments.end(),
|
shortest_path_segments.begin(), shortest_path_segments.end(),
|
||||||
shortest_path_segments.begin(),
|
alternative_path_set_difference.begin(), name_id_comperator);
|
||||||
shortest_path_segments.end(),
|
|
||||||
alternative_path_set_difference.begin(),
|
|
||||||
name_id_comperator);
|
|
||||||
|
|
||||||
std::sort(alternative_path_set_difference.begin(),
|
std::sort(alternative_path_set_difference.begin(), alternative_path_set_difference.end(),
|
||||||
alternative_path_set_difference.end(),
|
|
||||||
length_comperator);
|
length_comperator);
|
||||||
|
|
||||||
if (!alternative_path_segments.empty())
|
if (!alternative_path_segments.empty())
|
||||||
{
|
{
|
||||||
alternative_segment_2 = PickNextLongestSegment(alternative_path_set_difference,
|
alternative_segment_2 = PickNextLongestSegment(alternative_path_set_difference,
|
||||||
alternative_segment_1.name_id);
|
alternative_segment_1.name_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
// move the segments into the order in which they occur.
|
// move the segments into the order in which they occur.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -40,9 +40,10 @@ template <typename Data> class ConcurrentQueue
|
|||||||
inline void push(const Data &data)
|
inline void push(const Data &data)
|
||||||
{
|
{
|
||||||
std::unique_lock<std::mutex> lock(m_mutex);
|
std::unique_lock<std::mutex> lock(m_mutex);
|
||||||
m_not_full.wait(lock,
|
m_not_full.wait(lock, [this]
|
||||||
[this]
|
{
|
||||||
{ return m_internal_queue.size() < m_internal_queue.capacity(); });
|
return m_internal_queue.size() < m_internal_queue.capacity();
|
||||||
|
});
|
||||||
m_internal_queue.push_back(data);
|
m_internal_queue.push_back(data);
|
||||||
m_not_empty.notify_one();
|
m_not_empty.notify_one();
|
||||||
}
|
}
|
||||||
@ -52,9 +53,10 @@ template <typename Data> class ConcurrentQueue
|
|||||||
inline void wait_and_pop(Data &popped_value)
|
inline void wait_and_pop(Data &popped_value)
|
||||||
{
|
{
|
||||||
std::unique_lock<std::mutex> lock(m_mutex);
|
std::unique_lock<std::mutex> lock(m_mutex);
|
||||||
m_not_empty.wait(lock,
|
m_not_empty.wait(lock, [this]
|
||||||
[this]
|
{
|
||||||
{ return !m_internal_queue.empty(); });
|
return !m_internal_queue.empty();
|
||||||
|
});
|
||||||
popped_value = m_internal_queue.front();
|
popped_value = m_internal_queue.front();
|
||||||
m_internal_queue.pop_front();
|
m_internal_queue.pop_front();
|
||||||
m_not_full.notify_one();
|
m_not_full.notify_one();
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -45,11 +45,8 @@ ExternalMemoryNode ExternalMemoryNode::min_value()
|
|||||||
|
|
||||||
ExternalMemoryNode ExternalMemoryNode::max_value()
|
ExternalMemoryNode ExternalMemoryNode::max_value()
|
||||||
{
|
{
|
||||||
return ExternalMemoryNode(std::numeric_limits<int>::max(),
|
return ExternalMemoryNode(std::numeric_limits<int>::max(), std::numeric_limits<int>::max(),
|
||||||
std::numeric_limits<int>::max(),
|
std::numeric_limits<unsigned>::max(), false, false);
|
||||||
std::numeric_limits<unsigned>::max(),
|
|
||||||
false,
|
|
||||||
false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ExternalMemoryNodeSTXXLCompare::operator()(const ExternalMemoryNode &left,
|
bool ExternalMemoryNodeSTXXLCompare::operator()(const ExternalMemoryNode &left,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -58,8 +58,8 @@ NodeBasedEdge::NodeBasedEdge(NodeID source,
|
|||||||
bool access_restricted,
|
bool access_restricted,
|
||||||
TravelMode travel_mode,
|
TravelMode travel_mode,
|
||||||
bool is_split)
|
bool is_split)
|
||||||
: source(source), target(target), name_id(name_id), weight(weight),
|
: source(source), target(target), name_id(name_id), weight(weight), forward(forward),
|
||||||
forward(forward), backward(backward), roundabout(roundabout), in_tiny_cc(in_tiny_cc),
|
backward(backward), roundabout(roundabout), in_tiny_cc(in_tiny_cc),
|
||||||
access_restricted(access_restricted), is_split(is_split), travel_mode(travel_mode)
|
access_restricted(access_restricted), is_split(is_split), travel_mode(travel_mode)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -40,10 +40,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
struct PathData
|
struct PathData
|
||||||
{
|
{
|
||||||
PathData()
|
PathData()
|
||||||
: node(SPECIAL_NODEID), name_id(INVALID_EDGE_WEIGHT),
|
: node(SPECIAL_NODEID), name_id(INVALID_EDGE_WEIGHT), segment_duration(INVALID_EDGE_WEIGHT),
|
||||||
segment_duration(INVALID_EDGE_WEIGHT),
|
turn_instruction(TurnInstruction::NoTurn), travel_mode(TRAVEL_MODE_INACCESSIBLE)
|
||||||
turn_instruction(TurnInstruction::NoTurn),
|
|
||||||
travel_mode(TRAVEL_MODE_INACCESSIBLE)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -52,8 +50,8 @@ struct PathData
|
|||||||
TurnInstruction turn_instruction,
|
TurnInstruction turn_instruction,
|
||||||
EdgeWeight segment_duration,
|
EdgeWeight segment_duration,
|
||||||
TravelMode travel_mode)
|
TravelMode travel_mode)
|
||||||
: node(node), name_id(name_id), segment_duration(segment_duration), turn_instruction(turn_instruction),
|
: node(node), name_id(name_id), segment_duration(segment_duration),
|
||||||
travel_mode(travel_mode)
|
turn_instruction(turn_instruction), travel_mode(travel_mode)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
NodeID node;
|
NodeID node;
|
||||||
@ -80,9 +78,8 @@ struct InternalRouteResult
|
|||||||
return (leg != unpacked_path_segments.size() - 1);
|
return (leg != unpacked_path_segments.size() - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
InternalRouteResult() :
|
InternalRouteResult()
|
||||||
shortest_path_length(INVALID_EDGE_WEIGHT),
|
: shortest_path_length(INVALID_EDGE_WEIGHT), alternative_path_length(INVALID_EDGE_WEIGHT)
|
||||||
alternative_path_length(INVALID_EDGE_WEIGHT)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -48,9 +48,8 @@ struct OriginalEdgeData
|
|||||||
|
|
||||||
OriginalEdgeData()
|
OriginalEdgeData()
|
||||||
: via_node(std::numeric_limits<unsigned>::max()),
|
: via_node(std::numeric_limits<unsigned>::max()),
|
||||||
name_id(std::numeric_limits<unsigned>::max()),
|
name_id(std::numeric_limits<unsigned>::max()), turn_instruction(TurnInstruction::NoTurn),
|
||||||
turn_instruction(TurnInstruction::NoTurn), compressed_geometry(false),
|
compressed_geometry(false), travel_mode(TRAVEL_MODE_INACCESSIBLE)
|
||||||
travel_mode(TRAVEL_MODE_INACCESSIBLE)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -36,7 +36,7 @@ class Percent
|
|||||||
public:
|
public:
|
||||||
explicit Percent(unsigned max_value, unsigned step = 5) { reinit(max_value, step); }
|
explicit Percent(unsigned max_value, unsigned step = 5) { reinit(max_value, step); }
|
||||||
|
|
||||||
// Reinitializes
|
// Reinitializes
|
||||||
void reinit(unsigned max_value, unsigned step = 5)
|
void reinit(unsigned max_value, unsigned step = 5)
|
||||||
{
|
{
|
||||||
m_max_value = max_value;
|
m_max_value = max_value;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
struct QueryNode
|
struct QueryNode
|
||||||
{
|
{
|
||||||
using key_type = NodeID; // type of NodeID
|
using key_type = NodeID; // type of NodeID
|
||||||
using value_type = int; // type of lat,lons
|
using value_type = int; // type of lat,lons
|
||||||
|
|
||||||
explicit QueryNode(int lat, int lon, NodeID node_id) : lat(lat), lon(lon), node_id(node_id) {}
|
explicit QueryNode(int lat, int lon, NodeID node_id) : lat(lat), lon(lon), node_id(node_id) {}
|
||||||
QueryNode()
|
QueryNode()
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -108,8 +108,7 @@ struct InputRestrictionContainer
|
|||||||
struct CmpRestrictionContainerByFrom
|
struct CmpRestrictionContainerByFrom
|
||||||
{
|
{
|
||||||
typedef InputRestrictionContainer value_type;
|
typedef InputRestrictionContainer value_type;
|
||||||
bool operator()(const InputRestrictionContainer &a,
|
bool operator()(const InputRestrictionContainer &a, const InputRestrictionContainer &b) const
|
||||||
const InputRestrictionContainer &b) const
|
|
||||||
{
|
{
|
||||||
return a.restriction.from.way < b.restriction.from.way;
|
return a.restriction.from.way < b.restriction.from.way;
|
||||||
}
|
}
|
||||||
@ -120,8 +119,7 @@ struct CmpRestrictionContainerByFrom
|
|||||||
struct CmpRestrictionContainerByTo
|
struct CmpRestrictionContainerByTo
|
||||||
{
|
{
|
||||||
typedef InputRestrictionContainer value_type;
|
typedef InputRestrictionContainer value_type;
|
||||||
bool operator()(const InputRestrictionContainer &a,
|
bool operator()(const InputRestrictionContainer &a, const InputRestrictionContainer &b) const
|
||||||
const InputRestrictionContainer &b) const
|
|
||||||
{
|
{
|
||||||
return a.restriction.to.way < b.restriction.to.way;
|
return a.restriction.to.way < b.restriction.to.way;
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -27,54 +27,51 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
|
|
||||||
#include "restriction_map.hpp"
|
#include "restriction_map.hpp"
|
||||||
|
|
||||||
RestrictionMap::RestrictionMap(const std::vector<TurnRestriction> &restriction_list)
|
RestrictionMap::RestrictionMap(const std::vector<TurnRestriction> &restriction_list) : m_count(0)
|
||||||
: m_count(0)
|
{
|
||||||
|
// decompose restriction consisting of a start, via and end node into a
|
||||||
|
// a pair of starting edge and a list of all end nodes
|
||||||
|
for (auto &restriction : restriction_list)
|
||||||
{
|
{
|
||||||
// decompose restriction consisting of a start, via and end node into a
|
m_restriction_start_nodes.insert(restriction.from.node);
|
||||||
// a pair of starting edge and a list of all end nodes
|
m_no_turn_via_node_set.insert(restriction.via.node);
|
||||||
for (auto &restriction : restriction_list)
|
|
||||||
|
RestrictionSource restriction_source = {restriction.from.node, restriction.via.node};
|
||||||
|
|
||||||
|
std::size_t index;
|
||||||
|
auto restriction_iter = m_restriction_map.find(restriction_source);
|
||||||
|
if (restriction_iter == m_restriction_map.end())
|
||||||
{
|
{
|
||||||
m_restriction_start_nodes.insert(restriction.from.node);
|
index = m_restriction_bucket_list.size();
|
||||||
m_no_turn_via_node_set.insert(restriction.via.node);
|
m_restriction_bucket_list.resize(index + 1);
|
||||||
|
m_restriction_map.emplace(restriction_source, index);
|
||||||
RestrictionSource restriction_source = {restriction.from.node, restriction.via.node};
|
|
||||||
|
|
||||||
std::size_t index;
|
|
||||||
auto restriction_iter = m_restriction_map.find(restriction_source);
|
|
||||||
if (restriction_iter == m_restriction_map.end())
|
|
||||||
{
|
|
||||||
index = m_restriction_bucket_list.size();
|
|
||||||
m_restriction_bucket_list.resize(index + 1);
|
|
||||||
m_restriction_map.emplace(restriction_source, index);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
index = restriction_iter->second;
|
|
||||||
// Map already contains an is_only_*-restriction
|
|
||||||
if (m_restriction_bucket_list.at(index).begin()->is_only)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
else if (restriction.flags.is_only)
|
|
||||||
{
|
|
||||||
// We are going to insert an is_only_*-restriction. There can be only one.
|
|
||||||
m_count -= m_restriction_bucket_list.at(index).size();
|
|
||||||
m_restriction_bucket_list.at(index).clear();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
++m_count;
|
|
||||||
m_restriction_bucket_list.at(index)
|
|
||||||
.emplace_back(restriction.to.node, restriction.flags.is_only);
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
index = restriction_iter->second;
|
||||||
|
// Map already contains an is_only_*-restriction
|
||||||
|
if (m_restriction_bucket_list.at(index).begin()->is_only)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else if (restriction.flags.is_only)
|
||||||
|
{
|
||||||
|
// We are going to insert an is_only_*-restriction. There can be only one.
|
||||||
|
m_count -= m_restriction_bucket_list.at(index).size();
|
||||||
|
m_restriction_bucket_list.at(index).clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
++m_count;
|
||||||
|
m_restriction_bucket_list.at(index)
|
||||||
|
.emplace_back(restriction.to.node, restriction.flags.is_only);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
bool RestrictionMap::IsViaNode(const NodeID node) const
|
bool RestrictionMap::IsViaNode(const NodeID node) const
|
||||||
{
|
{
|
||||||
return m_no_turn_via_node_set.find(node) != m_no_turn_via_node_set.end();
|
return m_no_turn_via_node_set.find(node) != m_no_turn_via_node_set.end();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Replaces start edge (v, w) with (u, w). Only start node changes.
|
// Replaces start edge (v, w) with (u, w). Only start node changes.
|
||||||
void RestrictionMap::FixupStartingTurnRestriction(const NodeID node_u,
|
void RestrictionMap::FixupStartingTurnRestriction(const NodeID node_u,
|
||||||
const NodeID node_v,
|
const NodeID node_v,
|
||||||
@ -156,7 +153,7 @@ bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID node_u,
|
|||||||
for (const RestrictionTarget &restriction_target : bucket)
|
for (const RestrictionTarget &restriction_target : bucket)
|
||||||
{
|
{
|
||||||
if (node_w == restriction_target.target_node && // target found
|
if (node_w == restriction_target.target_node && // target found
|
||||||
!restriction_target.is_only) // and not an only_-restr.
|
!restriction_target.is_only) // and not an only_-restr.
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -108,8 +108,8 @@ void RouteParameters::setGeometryFlag(const bool flag) { geometry = flag; }
|
|||||||
|
|
||||||
void RouteParameters::setCompressionFlag(const bool flag) { compression = flag; }
|
void RouteParameters::setCompressionFlag(const bool flag) { compression = flag; }
|
||||||
|
|
||||||
void
|
void RouteParameters::addCoordinate(
|
||||||
RouteParameters::addCoordinate(const boost::fusion::vector<double, double> &transmitted_coordinates)
|
const boost::fusion::vector<double, double> &transmitted_coordinates)
|
||||||
{
|
{
|
||||||
coordinates.emplace_back(
|
coordinates.emplace_back(
|
||||||
static_cast<int>(COORDINATE_PRECISION * boost::fusion::at_c<0>(transmitted_coordinates)),
|
static_cast<int>(COORDINATE_PRECISION * boost::fusion::at_c<0>(transmitted_coordinates)),
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -51,7 +51,8 @@ template <class DataFacadeT> class SearchEngine
|
|||||||
alternative_path(facade, engine_working_data), distance_table(facade, engine_working_data)
|
alternative_path(facade, engine_working_data), distance_table(facade, engine_working_data)
|
||||||
{
|
{
|
||||||
static_assert(!std::is_pointer<DataFacadeT>::value, "don't instantiate with ptr type");
|
static_assert(!std::is_pointer<DataFacadeT>::value, "don't instantiate with ptr type");
|
||||||
static_assert(std::is_object<DataFacadeT>::value, "don't instantiate with void, function, or reference");
|
static_assert(std::is_object<DataFacadeT>::value,
|
||||||
|
"don't instantiate with void, function, or reference");
|
||||||
}
|
}
|
||||||
|
|
||||||
~SearchEngine() {}
|
~SearchEngine() {}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -147,8 +147,8 @@ template <> class SharedMemoryWrapper<bool>
|
|||||||
template <typename DataT, bool UseSharedMemory> struct ShM
|
template <typename DataT, bool UseSharedMemory> struct ShM
|
||||||
{
|
{
|
||||||
using vector = typename std::conditional<UseSharedMemory,
|
using vector = typename std::conditional<UseSharedMemory,
|
||||||
SharedMemoryWrapper<DataT>,
|
SharedMemoryWrapper<DataT>,
|
||||||
std::vector<DataT>>::type;
|
std::vector<DataT>>::type;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SHARED_MEMORY_VECTOR_WRAPPER_HPP
|
#endif // SHARED_MEMORY_VECTOR_WRAPPER_HPP
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -138,8 +138,8 @@ class StaticKDTree
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
Iterator middle = tree.left + (tree.right - tree.left) / 2;
|
Iterator middle = tree.left + (tree.right - tree.left) / 2;
|
||||||
std::nth_element(
|
std::nth_element(kdtree + tree.left, kdtree + middle, kdtree + tree.right,
|
||||||
kdtree + tree.left, kdtree + middle, kdtree + tree.right, Less(tree.dimension));
|
Less(tree.dimension));
|
||||||
s.push(Tree(tree.left, middle, (tree.dimension + 1) % k));
|
s.push(Tree(tree.left, middle, (tree.dimension + 1) % k));
|
||||||
s.push(Tree(middle + 1, tree.right, (tree.dimension + 1) % k));
|
s.push(Tree(middle + 1, tree.right, (tree.dimension + 1) % k));
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -28,7 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#ifndef TRAVEL_MODE_HPP
|
#ifndef TRAVEL_MODE_HPP
|
||||||
#define TRAVEL_MODE_HPP
|
#define TRAVEL_MODE_HPP
|
||||||
|
|
||||||
namespace {
|
namespace
|
||||||
|
{
|
||||||
using TravelMode = unsigned char;
|
using TravelMode = unsigned char;
|
||||||
static const TravelMode TRAVEL_MODE_INACCESSIBLE = 0;
|
static const TravelMode TRAVEL_MODE_INACCESSIBLE = 0;
|
||||||
static const TravelMode TRAVEL_MODE_DEFAULT = 1;
|
static const TravelMode TRAVEL_MODE_DEFAULT = 1;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -30,10 +30,24 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
|
|
||||||
enum class TurnInstruction : unsigned char
|
enum class TurnInstruction : unsigned char
|
||||||
{
|
{
|
||||||
NoTurn = 0, GoStraight, TurnSlightRight, TurnRight, TurnSharpRight, UTurn,
|
NoTurn = 0,
|
||||||
TurnSharpLeft, TurnLeft, TurnSlightLeft, ReachViaLocation, HeadOn, EnterRoundAbout,
|
GoStraight,
|
||||||
LeaveRoundAbout, StayOnRoundAbout, StartAtEndOfStreet, ReachedYourDestination,
|
TurnSlightRight,
|
||||||
EnterAgainstAllowedDirection, LeaveAgainstAllowedDirection,
|
TurnRight,
|
||||||
|
TurnSharpRight,
|
||||||
|
UTurn,
|
||||||
|
TurnSharpLeft,
|
||||||
|
TurnLeft,
|
||||||
|
TurnSlightLeft,
|
||||||
|
ReachViaLocation,
|
||||||
|
HeadOn,
|
||||||
|
EnterRoundAbout,
|
||||||
|
LeaveRoundAbout,
|
||||||
|
StayOnRoundAbout,
|
||||||
|
StartAtEndOfStreet,
|
||||||
|
ReachedYourDestination,
|
||||||
|
EnterAgainstAllowedDirection,
|
||||||
|
LeaveAgainstAllowedDirection,
|
||||||
InverseAccessRestrictionFlag = 127,
|
InverseAccessRestrictionFlag = 127,
|
||||||
AccessRestrictionFlag = 128,
|
AccessRestrictionFlag = 128,
|
||||||
AccessRestrictionPenalty = 129
|
AccessRestrictionPenalty = 129
|
||||||
@ -42,7 +56,7 @@ enum class TurnInstruction : unsigned char
|
|||||||
struct TurnInstructionsClass
|
struct TurnInstructionsClass
|
||||||
{
|
{
|
||||||
TurnInstructionsClass() = delete;
|
TurnInstructionsClass() = delete;
|
||||||
TurnInstructionsClass(const TurnInstructionsClass&) = delete;
|
TurnInstructionsClass(const TurnInstructionsClass &) = delete;
|
||||||
|
|
||||||
static inline TurnInstruction GetTurnDirectionOfInstruction(const double angle)
|
static inline TurnInstruction GetTurnDirectionOfInstruction(const double angle)
|
||||||
{
|
{
|
||||||
@ -79,7 +93,8 @@ struct TurnInstructionsClass
|
|||||||
|
|
||||||
static inline bool TurnIsNecessary(const TurnInstruction turn_instruction)
|
static inline bool TurnIsNecessary(const TurnInstruction turn_instruction)
|
||||||
{
|
{
|
||||||
if (TurnInstruction::NoTurn == turn_instruction || TurnInstruction::StayOnRoundAbout == turn_instruction)
|
if (TurnInstruction::NoTurn == turn_instruction ||
|
||||||
|
TurnInstruction::StayOnRoundAbout == turn_instruction)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
@ -61,7 +61,6 @@ using QueryGraph = StaticGraph<QueryEdge::EdgeData>;
|
|||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2014, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2015, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2015, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
Copyright (c) 2013, Project OSRM, Dennis Luxen, others
|
Copyright (c) 2013, Project OSRM contributors
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user