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

allow nil tags in highway columns in tests

Browse Source
This commit is contained in:
Emil Tin 2012-10-05 15:37:36 +02:00
parent 6eab47d768
commit 7400e60599
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
features/step_definitions/data.rb
View File

@ -65,11 +65,15 @@ Given /^the ways$/ do |table|
defaults = { 'highway' => 'primary' } defaults = { 'highway' => 'primary' }
tags = defaults.merge(row) tags = defaults.merge(row)
if row['highway'] == '(nil)'
tags.delete 'highway'
end
if row['name'] == nil if row['name'] == nil
tags['name'] = nodes tags['name'] = nodes
elsif (row['name'] == '""') || (row['name'] == "''") elsif (row['name'] == '""') || (row['name'] == "''")
tags['name'] = '' tags['name'] = ''
elsif row['name'] == '' elsif row['name'] == '' || row['name'] == '(nil)'
tags.delete 'name' tags.delete 'name'
else else
tags['name'] = row['name'] tags['name'] = row['name']

8
features/support/data.rb
View File

@ -81,11 +81,19 @@ def build_ways_from_table table
node_tags = {} node_tags = {}
tags.each_pair do |k,v| tags.each_pair do |k,v|
if k =~ /node\/(.*)/ if k =~ /node\/(.*)/
if v=='(nil)'
node_tags.delete k
else
node_tags[$1] = v node_tags[$1] = v
end
else
if v=='(nil)'
way_tags.delete k
else else
way_tags[k] = v way_tags[k] = v
end end
end end
end
way_tags['name'] = "w#{ri}" way_tags['name'] = "w#{ri}"
way << way_tags way << way_tags