]> git.openstreetmap.org Git - rails.git/blobdiff - app/models/way.rb
Merging 17824:17845 from trunk to blocking branch.
[rails.git] / app / models / way.rb
index 8788bd671b1e2ffdd9b1c9bd82c8f371edabc45a..639f4e69a770ad94e1d2ccda8884d90cabffa459 100644 (file)
@@ -34,6 +34,7 @@ class Way < ActiveRecord::Base
       doc.find('//osm/way').each do |pt|
         return Way.from_xml_node(pt, create)
       end
+      raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/way element.")
     rescue LibXML::XML::Error, ArgumentError => ex
       raise OSM::APIBadXMLError.new("way", xml, ex.message)
     end
@@ -234,7 +235,7 @@ class Way < ActiveRecord::Base
   def preconditions_ok?(old_nodes = [])
     return false if self.nds.empty?
     if self.nds.length > APP_CONFIG['max_number_of_way_nodes']
-      raise OSM::APITooManyWayNodesError.new(self.nds.length, APP_CONFIG['max_number_of_way_nodes'])
+      raise OSM::APITooManyWayNodesError.new(self.id, self.nds.length, APP_CONFIG['max_number_of_way_nodes'])
     end
 
     # check only the new nodes, for efficiency - old nodes having been checked last time and can't