X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6ccf25b347d90b2ae7b1f2e2b5c8f042e0790a3b..0975858cdb3430a7f717b3c972c3d6eb6e205784:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 6eecc853d..7e78aaf59 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -2,73 +2,78 @@ class Node < ActiveRecord::Base
   require 'xml/libxml'
   set_table_name 'current_nodes'
   
-
-  validates_numericality_of :latitude
-  validates_numericality_of :longitude
-  # FIXME validate lat and lon within the world
+  validates_presence_of :user_id, :timestamp
+  validates_inclusion_of :visible, :in => [ true, false ]
+  validates_numericality_of :latitude, :longitude
+  validate :validate_position
 
   has_many :old_nodes, :foreign_key => :id
   belongs_to :user
 
-  def self.from_xml(xml, create=false)
-    p = XML::Parser.new
-    p.string = xml
-    doc = p.parse
-
-    node = Node.new
+  def validate_position
+    errors.add_to_base("Node is not in the world") unless in_world?
+  end
 
-    doc.find('//osm/node').each do |pt|
+  def in_world?
+    return false if self.latitude < -90 or self.latitude > 90
+    return false if self.longitude < -180 or self.longitude > 180
+    return true
+  end
 
+  def self.from_xml(xml, create=false)
+    begin
+      p = XML::Parser.new
+      p.string = xml
+      doc = p.parse
+  
+      node = Node.new
 
-      node.latitude = pt['lat'].to_f
-      node.longitude = pt['lon'].to_f
+      doc.find('//osm/node').each do |pt|
+        node.latitude = pt['lat'].to_f
+        node.longitude = pt['lon'].to_f
 
-      if node.latitude > 90 or node.latitude < -90 or node.longitude > 180 or node.longitude < -180
-        return nil
-      end
+        return nil unless node.in_world?
 
-      unless create
-        if pt['id'] != '0'
-          node.id = pt['id'].to_i
+        unless create
+          if pt['id'] != '0'
+            node.id = pt['id'].to_i
+          end
         end
-      end
 
-      node.visible = pt['visible'] and pt['visible'] == 'true'
+        node.visible = pt['visible'] and pt['visible'] == 'true'
 
-      if create
-        node.timestamp = Time.now
-      else
-        if pt['timestamp']
-          node.timestamp = Time.parse(pt['timestamp'])
+        if create
+          node.timestamp = Time.now
+        else
+          if pt['timestamp']
+            node.timestamp = Time.parse(pt['timestamp'])
+          end
         end
-      end
 
-      tags = []
+        tags = []
 
-      pt.find('tag').each do |tag|
-        tags << [tag['k'],tag['v']]
-      end
-
-      tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
-      tags = '' if tags.nil?
+        pt.find('tag').each do |tag|
+          tags << [tag['k'],tag['v']]
+        end
 
-      node.tags = tags
+        tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
+        tags = '' if tags.nil?
 
+        node.tags = tags
+      end
+    rescue
+      node = nil
     end
+
     return node
   end
 
-  def save_with_history
-    begin
-      Node.transaction do
-        self.timestamp = Time.now
-        self.save
-        old_node = OldNode.from_node(self)
-        old_node.save
-      end
-      return true
-    rescue Exception => ex
-      return nil
+  def save_with_history!
+    Node.transaction do
+      self.timestamp = Time.now
+      self.save!
+      old_node = OldNode.from_node(self)
+      old_node.save!
     end
   end
 
@@ -84,15 +89,17 @@ class Node < ActiveRecord::Base
     el1['lat'] = self.latitude.to_s
     el1['lon'] = self.longitude.to_s
 
-    # el['user'] = self.user.display_name if self.user.data_public?
     user_display_name_cache = {} if user_display_name_cache.nil?
-    if user_display_name_cache and user_display_name_cache[self.user_id]
+
+    if user_display_name_cache and user_display_name_cache.key?(self.user_id)
       # use the cache if available
-    else
+    elsif self.user.data_public?
       user_display_name_cache[self.user_id] = self.user.display_name
+    else
+      user_display_name_cache[self.user_id] = nil
     end
 
-    el1['user'] = user_display_name_cache[self.user_id]
+    el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
 
     Node.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s