allow nil tags in highway columns in tests

features/step_definitions/data.rb

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

features/support/data.rb

@@ -81,9 +81,17 @@ def build_ways_from_table table
     node_tags = {}
     tags.each_pair do |k,v|
       if k =~ /node\/(.*)/
-        node_tags[$1] = v
+        if v=='(nil)'
+          node_tags.delete k
+        else
+          node_tags[$1] = v
+        end
       else
-        way_tags[k] = v
+        if v=='(nil)'
+          way_tags.delete k
+        else
+          way_tags[k] = v
+        end
       end
     end