X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/65eb6af30377bb98a0da691f69d3ad9b68b831e2..6d5c551a7c0c7002acdc62eb9ec1041866da6f84:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index dd8d96d12..3a1d580e0 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -58,7 +58,7 @@ class Node < ActiveRecord::Base find_by_area(min_lat, min_lon, max_lat, max_lon, :conditions => {:visible => true}, - :limit => APP_CONFIG['max_number_of_nodes']+1) + :limit => MAX_NUMBER_OF_NODES+1) end # Read in xml as text and return it's Node object representation @@ -70,6 +70,7 @@ class Node < ActiveRecord::Base doc.find('//osm/node').each do |pt| return Node.from_xml_node(pt, create) end + raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.") rescue LibXML::XML::Error, ArgumentError => ex raise OSM::APIBadXMLError.new("node", xml, ex.message) end @@ -141,6 +142,7 @@ class Node < ActiveRecord::Base raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by relation #{rel.relation.id}.") unless rel.nil? self.changeset_id = new_node.changeset_id + self.tags = {} self.visible = false # update the changeset with the deleted position