X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ff03138a978406b431da71aba64941d87b509098..11aff90f63d79406e9efa1343c965a19dcf5dbba:/app/models/way.rb diff --git a/app/models/way.rb b/app/models/way.rb index 8788bd671..cc9343e7c 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -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 @@ -233,8 +234,8 @@ 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']) + if self.nds.length > MAX_NUMBER_OF_WAY_NODES + raise OSM::APITooManyWayNodesError.new(self.id, self.nds.length, MAX_NUMBER_OF_WAY_NODES) end # check only the new nodes, for efficiency - old nodes having been checked last time and can't