Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #490 from DennisOSRM/develop

Browse Source 
Develop
This commit is contained in:
Project OSRM 2012-10-26 10:52:03 -07:00
commit c19c97804a
13 changed files with 215 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
Algorithms/DouglasPeucker.h
View File

@ -29,15 +29,15 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include "../DataStructures/Coordinate.h" #include "../DataStructures/Coordinate.h"
/*This class object computes the bitvector of indicating generalized input points /*This class object computes the bitvector of indicating generalized input points
* according to the (Ramer-)Douglas-Peucker algorithm. * according to the (Ramer-)Douglas-Peucker algorithm. Runtime n\log n calls to fastDistance
* *
* Input is vector of pairs. Each pair consists of the point information and a bit * Input is vector of pairs. Each pair consists of the point information and a bit
* indicating if the points is present in the generalization. * indicating if the points is present in the generalization.
* Note: points may also be pre-selected*/ * Note: points may also be pre-selected*/
//These thresholds are more or less heuristically chosen. //These thresholds are more or less heuristically chosen.
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
static double DouglasPeuckerThresholds[19] = { 32000000., 16240000., 80240000., 40240000., 20000000., 10000000., 500000., 240000., 120000., 60000., 30000., 19000., 5000., 2000., 200, 16, 6, 3. , 3. }; static double DouglasPeuckerThresholds[19] = { 32000000, 16240000, 80240000, 40240000, 20000000, 10000000, 500000, 240000, 120000, 60000, 30000, 19000, 5000, 2000, 200, 16, 6, 3, 3 };
template<class PointT> template<class PointT>
class DouglasPeucker { class DouglasPeucker {
@ -45,58 +45,27 @@ private:
typedef std::pair<std::size_t, std::size_t> PairOfPoints; typedef std::pair<std::size_t, std::size_t> PairOfPoints;
//Stack to simulate the recursion //Stack to simulate the recursion
std::stack<PairOfPoints > recursionStack; std::stack<PairOfPoints > recursionStack;
double ComputeDistanceOfPointToLine(const _Coordinate& inputPoint, const _Coordinate& source, const _Coordinate& target) const {
double r = 0.;
const double x = static_cast<double>(inputPoint.lat);
const double y = static_cast<double>(inputPoint.lon);
const double a = static_cast<double>(source.lat);
const double b = static_cast<double>(source.lon);
const double c = static_cast<double>(target.lat);
const double d = static_cast<double>(target.lon);
double p,q,mX,nY;
if(fabs(a - c) <= FLT_EPSILON) {
const double m = (d-b)/(c-a); // slope
// Projection of (x,y) on line joining (a,b) and (c,d)
p = ((x + (m*y)) + (m*m*a - m*b))/(1 + m*m);
q = b + m*(p - a);
} else {
p = c;
q = y;
}
nY = (d*p - c*q)/(a*d - b*c);
mX = (p - nY*a)/c;// These values are actually n/m+n and m/m+n , we neednot calculate the values of m an n as we are just interested in the ratio
r = std::isnan(mX) ? 0. : mX;
if(r<=0.){
return ((b - y)*(b - y) + (a - x)*(a - x));
}
else if(r >= 1.){
return ((d - y)*(d - y) + (c - x)*(c - x));
}
// point lies in between
return (p-x)*(p-x) + (q-y)*(q-y);
}
public: public:
void Run(std::vector<PointT> & inputVector, const unsigned zoomLevel) { void Run(std::vector<PointT> & inputVector, const unsigned zoomLevel) {
const unsigned sizeOfInputVector = inputVector.size();
{ {
assert(zoomLevel < 19); assert(zoomLevel < 19);
assert(1 < inputVector.size()); assert(1 < inputVector.size());
std::size_t leftBorderOfRange = 0; std::size_t leftBorderOfRange = 0;
std::size_t rightBorderOfRange = 1; std::size_t rightBorderOfRange = 1;
//Sweep linerarily over array and identify those ranges that need to be checked //Sweep linerarily over array and identify those ranges that need to be checked
// recursionStack.hint(inputVector.size()); //decision points have been previously marked
do { do {
assert(inputVector[leftBorderOfRange].necessary); assert(inputVector[leftBorderOfRange].necessary);
assert(inputVector[inputVector.size()-1].necessary); assert(inputVector[inputVector.back()].necessary);
if(inputVector[rightBorderOfRange].necessary) { if(inputVector[rightBorderOfRange].necessary) {
recursionStack.push(std::make_pair(leftBorderOfRange, rightBorderOfRange)); recursionStack.push(std::make_pair(leftBorderOfRange, rightBorderOfRange));
leftBorderOfRange = rightBorderOfRange; leftBorderOfRange = rightBorderOfRange;
} }
++rightBorderOfRange; ++rightBorderOfRange;
} while( rightBorderOfRange < inputVector.size()); } while( rightBorderOfRange < sizeOfInputVector);
} }
while(!recursionStack.empty()) { while(!recursionStack.empty()) {
//pop next element //pop next element
@ -104,13 +73,13 @@ public:
recursionStack.pop(); recursionStack.pop();
assert(inputVector[pair.first].necessary); assert(inputVector[pair.first].necessary);
assert(inputVector[pair.second].necessary); assert(inputVector[pair.second].necessary);
assert(pair.second < inputVector.size()); assert(pair.second < sizeOfInputVector);
assert(pair.first < pair.second); assert(pair.first < pair.second);
double maxDistance = -DBL_MAX; int maxDistance = -INT_MIN;
std::size_t indexOfFarthestElement = pair.second; std::size_t indexOfFarthestElement = pair.second;
//find index idx of element with maxDistance //find index idx of element with maxDistance
for(std::size_t i = pair.first+1; i < pair.second; ++i){ for(std::size_t i = pair.first+1; i < pair.second; ++i){
const double distance = std::fabs(ComputeDistanceOfPointToLine(inputVector[i].location, inputVector[pair.first].location, inputVector[pair.second].location)); const int distance = fastDistance(inputVector[i].location, inputVector[pair.first].location, inputVector[pair.second].location);
if(distance > DouglasPeuckerThresholds[zoomLevel] && distance > maxDistance) { if(distance > DouglasPeuckerThresholds[zoomLevel] && distance > maxDistance) {
indexOfFarthestElement = i; indexOfFarthestElement = i;
maxDistance = distance; maxDistance = distance;
@ -127,6 +96,34 @@ public:
} }
} }
} }
/**
* This distance computation does integer arithmetic only and is about twice as fast as
* the other distance function. It is an approximation only, but works more or less ok.
*/
template<class CoordT>
double fastDistance(const CoordT& point, const CoordT& segA, const CoordT& segB) {
int p2x = (segB.lon - segA.lat);
int p2y = (segB.lon - segA.lat);
int something = p2x*p2x + p2y*p2y;
int u = ((point.lon - segA.lon) * p2x + (point.lat - segA.lat) * p2y) / something;
if (u > 1)
u = 1;
else if (u < 0)
u = 0;
int x = segA.lon + u * p2x;
int y = segA.lat + u * p2y;
int dx = x - point.lon;
int dy = y - point.lat;
int dist = (dx*dx + dy*dy);
return dist;
}
}; };
#endif /* DOUGLASPEUCKER_H_ */ #endif /* DOUGLASPEUCKER_H_ */

17
Plugins/ViaRoutePlugin.h
View File

@ -127,28 +127,13 @@ public:
segmentPhantomNodes.targetPhantom = phantomNodeVector[i+1]; segmentPhantomNodes.targetPhantom = phantomNodeVector[i+1];
rawRoute.segmentEndCoordinates.push_back(segmentPhantomNodes); rawRoute.segmentEndCoordinates.push_back(segmentPhantomNodes);
} }
if(1 == rawRoute.segmentEndCoordinates.size()) { if(( "false" != routeParameters.options.Find("alt") ) (&& (1 == rawRoute.segmentEndCoordinates.size())) {
// INFO("Checking for alternative paths"); // INFO("Checking for alternative paths");
searchEngine->alternativePaths(rawRoute.segmentEndCoordinates[0], rawRoute); searchEngine->alternativePaths(rawRoute.segmentEndCoordinates[0], rawRoute);
} else { } else {
searchEngine->shortestPath(rawRoute.segmentEndCoordinates, rawRoute); searchEngine->shortestPath(rawRoute.segmentEndCoordinates, rawRoute);
} }
// std::cout << "latitude,longitude" << std::endl;
// for(unsigned i = 0; i < rawRoute.computedShortestPath.size(); ++i) {
// _Coordinate current;
// searchEngine->GetCoordinatesForNodeID(rawRoute.computedShortestPath[i].node, current);
// std::cout << current.lat/100000. << "," << current.lon/100000. << std::endl;
// }
// std::cout << std::endl;
//
// std::cout << "latitude,longitude" << std::endl;
// for(unsigned i = 0; i < rawRoute.computedAlternativePath.size(); ++i) {
// _Coordinate current;
// searchEngine->GetCoordinatesForNodeID(rawRoute.computedAlternativePath[i].node, current);
// std::cout << current.lat/100000. << "," << current.lon/100000. << std::endl;
// }
// std::cout << std::endl;
if(INT_MAX == rawRoute.lengthOfShortestPath ) { if(INT_MAX == rawRoute.lengthOfShortestPath ) {

59
Rakefile
View File

@ -4,8 +4,8 @@ require 'digest/sha1'
require 'cucumber/rake/task' require 'cucumber/rake/task'
require 'sys/proctable' require 'sys/proctable'
SANDBOX = 'sandbox' DATA_FOLDER = 'sandbox'
DATA_FOLDER = 'osm_data' PROFILE = 'bicycle'
Cucumber::Rake::Task.new do |t| Cucumber::Rake::Task.new do |t|
t.cucumber_opts = %w{--format pretty} t.cucumber_opts = %w{--format pretty}
@ -62,12 +62,12 @@ def write_server_ini osm_file
IP = 0.0.0.0 IP = 0.0.0.0
Port = 5000 Port = 5000
hsgrData=#{DATA_FOLDER}/#{osm_file}.osrm.hsgr hsgrData=#{osm_file}.osrm.hsgr
nodesData=#{DATA_FOLDER}/#{osm_file}.osrm.nodes nodesData=#{osm_file}.osrm.nodes
edgesData=#{DATA_FOLDER}/#{osm_file}.osrm.edges edgesData=#{osm_file}.osrm.edges
ramIndex=#{DATA_FOLDER}/#{osm_file}.osrm.ramIndex ramIndex=#{osm_file}.osrm.ramIndex
fileIndex=#{DATA_FOLDER}/#{osm_file}.osrm.fileIndex fileIndex=#{osm_file}.osrm.fileIndex
namesData=#{DATA_FOLDER}/#{osm_file}.osrm.names namesData=#{osm_file}.osrm.names
EOF EOF
File.open( 'server.ini', 'w') {|f| f.write( s ) } File.open( 'server.ini', 'w') {|f| f.write( s ) }
end end
@ -83,46 +83,48 @@ end
desc "Setup config files." desc "Setup config files."
task :setup do task :setup do
Dir.mkdir "#{SANDBOX}/#{DATA_FOLDER}" unless File.exist? "#{SANDBOX}/#{DATA_FOLDER}" Dir.mkdir "#{DATA_FOLDER}" unless File.exist? "#{DATA_FOLDER}"
['server.ini','speedprofile.ini','extractor.ini','contractor.ini'].each do |file| ['server.ini','extractor.ini','contractor.ini'].each do |file|
unless File.exist? "#{SANDBOX}/#{file}" unless File.exist? "#{DATA_FOLDER}/#{file}"
puts "Copying #{file} template to sandbox/#{file}" puts "Copying #{file} template to #{DATA_FOLDER}/#{file}"
FileUtils.cp file, "#{SANDBOX}/#{file}" FileUtils.cp file, "#{DATA_FOLDER}/#{file}"
end end
end end
end end
desc "Download OSM data." desc "Download OSM data."
task :download => :setup do task :download => :setup do
Dir.mkdir "#{DATA_FOLDER}" unless File.exist? "#{DATA_FOLDER}"
puts "Downloading..." puts "Downloading..."
raise "Error while downloading data." unless system "curl http://download.geofabrik.de/osm/europe/#{osm_data_country}.osm.pbf -o #{SANDBOX}/#{DATA_FOLDER}/#{osm_data_country}.osm.pbf" puts "curl http://download.geofabrik.de/openstreetmap/europe/#{osm_data_country}.osm.pbf -o #{DATA_FOLDER}/#{osm_data_country}.osm.pbf"
raise "Error while downloading data." unless system "curl http://download.geofabrik.de/openstreetmap/europe/#{osm_data_country}.osm.pbf -o #{DATA_FOLDER}/#{osm_data_country}.osm.pbf"
if osm_data_area_bbox if osm_data_area_bbox
puts "Cropping and converting to protobuffer..." puts "Cropping and converting to protobuffer..."
raise "Error while cropping data." unless system "osmosis --read-pbf file=#{SANDBOX}/#{DATA_FOLDER}/#{osm_data_country}.osm.pbf --bounding-box #{osm_data_area_bbox} --write-pbf file=#{SANDBOX}/#{DATA_FOLDER}/#{osm_data_area_name}.osm.pbf omitmetadata=true" raise "Error while cropping data." unless system "osmosis --read-pbf file=#{DATA_FOLDER}/#{osm_data_country}.osm.pbf --bounding-box #{osm_data_area_bbox} --write-pbf file=#{DATA_FOLDER}/#{osm_data_area_name}.osm.pbf omitmetadata=true"
end end
end end
desc "Crop OSM data" desc "Crop OSM data"
task :crop do task :crop do
if osm_data_area_bbox if osm_data_area_bbox
raise "Error while cropping data." unless system "osmosis --read-pbf file=#{SANDBOX}/#{DATA_FOLDER}/#{osm_data_country}.osm.pbf --bounding-box #{osm_data_area_bbox} --write-pbf file=#{SANDBOX}/#{DATA_FOLDER}/#{osm_data_area_name}.osm.pbf omitmetadata=true" raise "Error while cropping data." unless system "osmosis --read-pbf file=#{DATA_FOLDER}/#{osm_data_country}.osm.pbf --bounding-box #{osm_data_area_bbox} --write-pbf file=#{DATA_FOLDER}/#{osm_data_area_name}.osm.pbf omitmetadata=true"
end end
end end
desc "Reprocess OSM data." desc "Reprocess OSM data."
task :process => :setup do task :process => :setup do
Dir.chdir SANDBOX do Dir.chdir DATA_FOLDER do
raise "Error while extracting data." unless system "../osrm-extract #{DATA_FOLDER}/#{osm_data_area_name}.osm.pbf" raise "Error while extracting data." unless system "../osrm-extract #{osm_data_area_name}.osm.pbf ../profiles/#{PROFILE}.lua"
puts puts
raise "Error while preparing data." unless system "../osrm-prepare #{DATA_FOLDER}/#{osm_data_area_name}.osrm #{DATA_FOLDER}/#{osm_data_area_name}.osrm.restrictions" raise "Error while preparing data." unless system "../osrm-prepare #{osm_data_area_name}.osrm #{osm_data_area_name}.osrm.restrictions ../profiles/#{PROFILE}.lua"
puts puts
end end
end end
desc "Delete preprocessing files." desc "Delete preprocessing files."
task :clean do task :clean do
File.delete *Dir.glob("#{SANDBOX}/#{DATA_FOLDER}/*.osrm") File.delete *Dir.glob("#{DATA_FOLDER}/*.osrm")
File.delete *Dir.glob("#{SANDBOX}/#{DATA_FOLDER}/*.osrm.*") File.delete *Dir.glob("#{DATA_FOLDER}/*.osrm.*")
end end
desc "Run all cucumber test" desc "Run all cucumber test"
@ -133,7 +135,7 @@ end
desc "Run the routing server in the terminal. Press Ctrl-C to stop." desc "Run the routing server in the terminal. Press Ctrl-C to stop."
task :run => :setup do task :run => :setup do
Dir.chdir SANDBOX do Dir.chdir DATA_FOLDER do
write_server_ini osm_data_area_name write_server_ini osm_data_area_name
system "../osrm-routed" system "../osrm-routed"
end end
@ -141,7 +143,7 @@ end
desc "Launch the routing server in the background. Use rake:down to stop it." desc "Launch the routing server in the background. Use rake:down to stop it."
task :up => :setup do task :up => :setup do
Dir.chdir SANDBOX do Dir.chdir DATA_FOLDER do
abort("Already up.") if up? abort("Already up.") if up?
write_server_ini osm_data_area_name write_server_ini osm_data_area_name
pipe = IO.popen('../osrm-routed 1>>osrm-routed.log 2>>osrm-routed.log') pipe = IO.popen('../osrm-routed 1>>osrm-routed.log 2>>osrm-routed.log')
@ -160,8 +162,11 @@ end
desc "Stop the routing server." desc "Stop the routing server."
task :down do task :down do
pid = find_pid 'osrm-routed' pid = find_pid 'osrm-routed'
abort("Already down.") unless pid if pid
Process.kill 'TERM', pid Process.kill 'TERM', pid
else
puts "Already down."
end
end end
desc "Kill all osrm-extract, osrm-prepare and osrm-routed processes." desc "Kill all osrm-extract, osrm-prepare and osrm-routed processes."
@ -180,3 +185,7 @@ task :pid do
puts "#{pid}\t#{state}" puts "#{pid}\t#{state}"
end end
end end
desc "Stop, reprocess and restart."
task :update => [:down,:process,:up] do
end

4
SConstruct
View File

@ -72,6 +72,8 @@ conf = Configure(env, custom_tests = { 'CheckBoost' : CheckBoost, 'CheckProtobuf
if GetOption('cxx') is None: if GetOption('cxx') is None:
#default Compiler #default Compiler
if sys.platform == 'darwin': #Mac OS X
env['CXX'] = 'clang++'
print 'Using default C++ Compiler: ', env['CXX'].strip() print 'Using default C++ Compiler: ', env['CXX'].strip()
else: else:
env.Replace(CXX = GetOption('cxx')) env.Replace(CXX = GetOption('cxx'))
@ -157,7 +159,7 @@ if not conf.CheckLibWithHeader('bz2', 'bzlib.h', 'CXX'):
print "bz2 library not found. Exiting" print "bz2 library not found. Exiting"
Exit(-1) Exit(-1)
if GetOption('withtools') is not None: if GetOption('withtools') is not None:
if not conf.CheckLibWithHeader('gdal1.7.0', 'gdal/gdal.h', 'CXX'): if not conf.CheckLibWithHeader('gdal', 'gdal/gdal.h', 'CXX'):
print "gdal library not found. Exiting" print "gdal library not found. Exiting"
Exit(-1) Exit(-1)
if not conf.CheckLibWithHeader('osmpbf', 'osmpbf/osmpbf.h', 'CXX'): if not conf.CheckLibWithHeader('osmpbf', 'osmpbf/osmpbf.h', 'CXX'):

58
features/bicycle/area.feature
View File

@ -3,7 +3,8 @@ Feature: Bike - Squares and other areas
Background: Background:
Given the speedprofile "bicycle" Given the speedprofile "bicycle"
@square
Scenario: Bike - Route along edge of a squares Scenario: Bike - Route along edge of a squares
Given the node map Given the node map
| x | | | x | |
@ -25,7 +26,8 @@ Feature: Bike - Squares and other areas
| d | c | abcda | | d | c | abcda |
| d | a | abcda | | d | a | abcda |
| a | d | abcda | | a | d | abcda |
@building
Scenario: Bike - Don't route on buildings Scenario: Bike - Don't route on buildings
Given the node map Given the node map
| x | | | x | |
@ -47,3 +49,55 @@ Feature: Bike - Squares and other areas
| d | c | | | d | c | |
| d | a | | | d | a | |
| a | d | | | a | d | |
@parking
Scenario: Bike - parking areas
Given the node map
| e | | | f |
| x | a | b | y |
| | d | c | |
And the ways
| nodes | highway | amenity |
| xa | primary | |
| by | primary | |
| xefy | primary | |
| abcda | (nil) | parking |
When I route I should get
| from | to | route |
| x | y | xa,abcda,by |
| y | x | by,abcda,xa |
| a | b | abcda |
| a | d | abcda |
| b | c | abcda |
| c | b | abcda |
| c | d | abcda |
| d | c | abcda |
| d | a | abcda |
| a | d | abcda |
@train @platform
Scenario: Bike - railway platforms
Given the node map
| x | a | b | y |
| | d | c | |
And the ways
| nodes | highway | railway |
| xa | primary | |
| by | primary | |
| abcda | (nil) | platform |
When I route I should get
| from | to | route |
| x | y | xa,abcda,by |
| y | x | by,abcda,xa |
| a | b | abcda |
| a | d | abcda |
| b | c | abcda |
| c | b | abcda |
| c | d | abcda |
| d | c | abcda |
| d | a | abcda |
| a | d | abcda |

2
features/bicycle/train.feature
View File

@ -1,4 +1,4 @@
@routing @bicycle @train @todo @routing @bicycle @train
Feature: Bike - Handle ferry routes Feature: Bike - Handle ferry routes
Bringing bikes on trains and subways Bringing bikes on trains and subways

2
features/car/destination.feature
View File

@ -1,4 +1,4 @@
@routing @bicycle @destination @todo @routing @car @destination @todo
Feature: Car - Destination only, no passing through Feature: Car - Destination only, no passing through
Background: Background:

4
features/support/config.rb
View File

@ -11,10 +11,6 @@ def read_speedprofile profile
@speedprofile = profile @speedprofile = profile
end end
def write_speedprofile
FileUtils.copy_file "../profiles/#{@speedprofile}.lua", "profile.lua"
end
def write_server_ini def write_server_ini
s=<<-EOF s=<<-EOF
Threads = 1 Threads = 1

5
features/support/data.rb
View File

@ -200,13 +200,12 @@ end
def reprocess def reprocess
Dir.chdir TEST_FOLDER do Dir.chdir TEST_FOLDER do
write_speedprofile
write_osm write_osm
convert_osm_to_pbf convert_osm_to_pbf
unless extracted? unless extracted?
log_preprocess_info log_preprocess_info
log "== Extracting #{@osm_file}.osm...", :preprocess log "== Extracting #{@osm_file}.osm...", :preprocess
unless system "../osrm-extract #{@osm_file}.osm.pbf 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE}" unless system "../osrm-extract #{@osm_file}.osm.pbf 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE} ../profiles/#{@speedprofile}.lua"
log "*** Exited with code #{$?.exitstatus}.", :preprocess log "*** Exited with code #{$?.exitstatus}.", :preprocess
raise OSRMError.new 'osrm-extract', $?.exitstatus, "*** osrm-extract exited with code #{$?.exitstatus}. The file preprocess.log might contain more info." raise OSRMError.new 'osrm-extract', $?.exitstatus, "*** osrm-extract exited with code #{$?.exitstatus}. The file preprocess.log might contain more info."
end end
@ -215,7 +214,7 @@ def reprocess
unless prepared? unless prepared?
log_preprocess_info log_preprocess_info
log "== Preparing #{@osm_file}.osm...", :preprocess log "== Preparing #{@osm_file}.osm...", :preprocess
unless system "../osrm-prepare #{@osm_file}.osrm #{@osm_file}.osrm.restrictions 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE}" unless system "../osrm-prepare #{@osm_file}.osrm #{@osm_file}.osrm.restrictions 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE} ../profiles/#{@speedprofile}.lua"
log "*** Exited with code #{$?.exitstatus}.", :preprocess log "*** Exited with code #{$?.exitstatus}.", :preprocess
raise OSRMError.new 'osrm-prepare', $?.exitstatus, "*** osrm-prepare exited with code #{$?.exitstatus}. The file preprocess.log might contain more info." raise OSRMError.new 'osrm-prepare', $?.exitstatus, "*** osrm-prepare exited with code #{$?.exitstatus}. The file preprocess.log might contain more info."
end end

2
features/support/hash.rb
View File

@ -12,7 +12,7 @@ def hash_of_file path
end end
def speedprofile_hash def speedprofile_hash
@speedprofile_hash ||= hash_of_file "profile.lua" @speedprofile_hash ||= hash_of_file "../profiles/#{@speedprofile}.lua"
end end
def osm_hash def osm_hash

8
features/testbot/penalty.feature
View File

@ -5,7 +5,7 @@ Testbot uses a signal penalty of 7s.
Background: Background:
Given the speedprofile "testbot" Given the speedprofile "testbot"
Scenario: Passing a traffic signal should incur a delay Scenario: Traffic signals should incur a delay, without changing distance
Given the node map Given the node map
| a | b | c | | a | b | c |
| d | e | f | | d | e | f |
@ -20,9 +20,9 @@ Testbot uses a signal penalty of 7s.
| def | | def |
When I route I should get When I route I should get
| from | to | route | time | | from | to | route | time | distance |
| a | c | abc | 20s +-1 | | a | c | abc | 20s +-1 | 200m +-1 |
| d | f | def | 27s +-1 | | d | f | def | 27s +-1 | 200m +-1 |
Scenario: Signal penalty should not depend on way type Scenario: Signal penalty should not depend on way type
Given the node map Given the node map

108
profiles/bicycle.lua
View File

@ -6,9 +6,10 @@ access_tag_restricted = { ["destination"] = true, ["delivery"] = true }
access_tags_hierachy = { "bicycle", "vehicle", "access" } access_tags_hierachy = { "bicycle", "vehicle", "access" }
cycleway_tags = {["track"]=true,["lane"]=true,["opposite"]=true,["opposite_lane"]=true,["opposite_track"]=true,["share_busway"]=true,["sharrow"]=true,["shared"]=true } cycleway_tags = {["track"]=true,["lane"]=true,["opposite"]=true,["opposite_lane"]=true,["opposite_track"]=true,["share_busway"]=true,["sharrow"]=true,["shared"]=true }
service_tag_restricted = { ["parking_aisle"] = true } service_tag_restricted = { ["parking_aisle"] = true }
ignore_in_grid = { ["ferry"] = true }
speed_profile = { default_speed = 16
main_speeds = {
["cycleway"] = 18, ["cycleway"] = 18,
["primary"] = 17, ["primary"] = 17,
["primary_link"] = 17, ["primary_link"] = 17,
@ -23,18 +24,39 @@ speed_profile = {
["service"] = 16, ["service"] = 16,
["track"] = 13, ["track"] = 13,
["path"] = 13, ["path"] = 13,
["footway"] = 12,
["pedestrian"] = 12,
["pier"] = 12,
["steps"] = 2
}
pedestrian_speeds = {
["footway"] = 5, ["footway"] = 5,
["pedestrian"] = 5, ["pedestrian"] = 5,
["pier"] = 5, ["pier"] = 5,
["steps"] = 1, ["steps"] = 2
["default"] = 18, }
["ferry"] = 5,
["train"] = 80, railway_speeds = {
["railway"] = 60, ["train"] = 10,
["subway"] = 50, ["railway"] = 10,
["light_rail"] = 40, ["subway"] = 10,
["monorail"] = 40, ["light_rail"] = 10,
["tram"] = 40 ["monorail"] = 10,
["tram"] = 10
}
platform_speeds = {
["platform"] = 5
}
amenity_speeds = {
["parking"] = 10,
["parking_entrance"] = 10
}
route_speeds = {
["ferry"] = 5
} }
take_minimum_of_speeds = true take_minimum_of_speeds = true
@ -110,10 +132,14 @@ function way_function (way, numberOfNodesInWay)
local duration = way.tags:Find("duration") local duration = way.tags:Find("duration")
local service = way.tags:Find("service") local service = way.tags:Find("service")
local area = way.tags:Find("area") local area = way.tags:Find("area")
local amenity = way.tags:Find("amenity")
local access = find_access_tag(way) local access = find_access_tag(way)
-- only route on things with highway tag set (not buildings, boundaries, etc) -- only route on things with highway tag set (not buildings, boundaries, etc)
if (not highway or highway == '') and (not route or route == '') and (not railway or railway=='') then if (not highway or highway == '') and
(not route or route == '') and
(not railway or railway=='') and
(not amenity or amenity=='') then
return 0 return 0
end end
@ -131,33 +157,43 @@ function way_function (way, numberOfNodesInWay)
way.name = highway -- if no name exists, use way type way.name = highway -- if no name exists, use way type
end end
if (speed_profile[route] and speed_profile[route] > 0) or (speed_profile[man_made] and speed_profile[man_made] > 0) then if route_speeds[route] then
-- ferries and piers -- ferries
way.direction = Way.bidirectional
way.ignore_in_grid = true
if durationIsValid(duration) then if durationIsValid(duration) then
way.speed = math.max( duration / math.max(1, numberOfNodesInWay-1) ) way.speed = math.max( parseDuration(duration) / math.max(1, numberOfNodesInWay-1) )
way.is_duration_set = true; way.is_duration_set = true
else
way.speed = route_speeds[route]
end end
way.direction = Way.bidirectional; elseif railway and platform_speeds[railway] then
if speed_profile[route] ~= nil then -- railway platforms
highway = route; way.speed = platform_speeds[railway]
elseif speed_profile[man_made] ~= nil then elseif railway and railway_speeds[railway] then
highway = man_made; -- railways
end
if not way.is_duration_set then
way.speed = speed_profile[highway]
end
elseif railway and speed_profile[railway] then
-- trains and subways
if access and access_tag_whitelist[access] then if access and access_tag_whitelist[access] then
way.speed = speed_profile[railway] way.speed = railway_speeds[railway]
way.direction = Way.bidirectional way.direction = Way.bidirectional
end end
elseif pedestrian_speeds[highway] and main_speeds[highway] then
-- pedestrian areas
if access_tag_whitelist[access] then
way.speed = main_speeds[highway] -- biking
else
way.speed = pedestrian_speeds[highway] -- pushing bikes
end
elseif amenity and amenity_speeds[amenity] then
-- parking areas
way.speed = amenity_speeds[amenity]
else else
-- ways -- regular ways
if speed_profile[highway] then if main_speeds[highway] then
way.speed = speed_profile[highway] way.speed = main_speeds[highway]
elseif access_tag_whitelist[access] then elseif main_speeds[man_made] then
way.speed = speed_profile["default"] way.speed = main_speeds[man_made]
elseif access_tag_whitelist[access] then
way.speed = default_speed
end end
end end
@ -212,11 +248,11 @@ function way_function (way, numberOfNodesInWay)
-- cycleways -- cycleways
if cycleway and cycleway_tags[cycleway] then if cycleway and cycleway_tags[cycleway] then
way.speed = speed_profile["cycleway"] way.speed = main_speeds["cycleway"]
elseif cycleway_left and cycleway_tags[cycleway_left] then elseif cycleway_left and cycleway_tags[cycleway_left] then
way.speed = speed_profile["cycleway"] way.speed = main_speeds["cycleway"]
elseif cycleway_right and cycleway_tags[cycleway_right] then elseif cycleway_right and cycleway_tags[cycleway_right] then
way.speed = speed_profile["cycleway"] way.speed = main_speeds["cycleway"]
end end
way.type = 1 way.type = 1

2
profiles/foot.lua
View File

@ -128,7 +128,7 @@ function way_function (way, numberOfNodesInWay)
(speed_profile[man_made] ~= nil and speed_profile[man_made] > 0) (speed_profile[man_made] ~= nil and speed_profile[man_made] > 0)
then then
if durationIsValid(duration) then if durationIsValid(duration) then
way.speed = parseDuration / math.max(1, numberOfSegments-1); way.speed = parseDuration / math.max(1, numberOfNodesInWay-1);
way.is_duration_set = true; way.is_duration_set = true;
end end
way.direction = Way.bidirectional; way.direction = Way.bidirectional;