- # Read in xml as text and return it's Node object representation
- def self.from_xml(xml, create=false)
- begin
- p = XML::Parser.new
- p.string = xml
- doc = p.parse
-
- node = Node.new
-
- doc.find('//osm/node').each do |pt|
- node.lat = pt['lat'].to_f
- node.lon = pt['lon'].to_f
-
- return nil unless node.in_world?
-
- unless create
- if pt['id'] != '0'
- node.id = pt['id'].to_i
- end
- end
-
- node.visible = pt['visible'] and pt['visible'] == 'true'
-
- if create
- node.timestamp = Time.now
- else
- if pt['timestamp']
- node.timestamp = Time.parse(pt['timestamp'])
- end
- end
-
- tags = []
-
- pt.find('tag').each do |tag|
- tags << [tag['k'],tag['v']]
- end
-
- node.tags = Tags.join(tags)
- end
- rescue
- node = nil
+ def self.from_xml_node(pt, create = false)
+ node = Node.new
+
+ fail OSM::APIBadXMLError.new("node", pt, "lat missing") if pt["lat"].nil?
+ fail OSM::APIBadXMLError.new("node", pt, "lon missing") if pt["lon"].nil?
+ node.lat = OSM.parse_float(pt["lat"], OSM::APIBadXMLError, "node", pt, "lat not a number")
+ node.lon = OSM.parse_float(pt["lon"], OSM::APIBadXMLError, "node", pt, "lon not a number")
+ fail OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt["changeset"].nil?
+ node.changeset_id = pt["changeset"].to_i
+
+ fail OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world?
+
+ # version must be present unless creating
+ fail OSM::APIBadXMLError.new("node", pt, "Version is required when updating") unless create || !pt["version"].nil?
+ node.version = create ? 0 : pt["version"].to_i
+
+ unless create
+ fail OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt["id"].nil?
+ node.id = pt["id"].to_i
+ # .to_i will return 0 if there is no number that can be parsed.
+ # We want to make sure that there is no id with zero anyway
+ fail OSM::APIBadUserInput.new("ID of node cannot be zero when updating.") if node.id == 0
+ end
+
+ # We don't care about the time, as it is explicitly set on create/update/delete
+ # We don't care about the visibility as it is implicit based on the action
+ # and set manually before the actual delete
+ node.visible = true
+
+ # Start with no tags
+ node.tags = {}
+
+ # Add in any tags from the XML
+ pt.find("tag").each do |tag|
+ fail OSM::APIBadXMLError.new("node", pt, "tag is missing key") if tag["k"].nil?
+ fail OSM::APIBadXMLError.new("node", pt, "tag is missing value") if tag["v"].nil?
+ node.add_tag_key_val(tag["k"], tag["v"])