Use tile based query when creating a way from unwayed segments.

[rails.git] / app / models / segment.rb

diff --git a/app/models/segment.rb b/app/models/segment.rb
index 14949879dc6d3cb98cab74621bb2909034f42ba4..6916b79b1ef8ad7eedd631e66f6a2368e8babab4 100644 (file)
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -2,8 +2,9 @@ class Segment < ActiveRecord::Base
   require 'xml/libxml'
   set_table_name 'current_segments'
 
-  validates_numericality_of :node_a
-  validates_numericality_of :node_b
+  validates_presence_of :user_id, :timestamp
+  validates_inclusion_of :visible, :in => [ true, false ]
+  validates_numericality_of :node_a, :node_b
 
   has_many :old_segments, :foreign_key => :id
   belongs_to :user
@@ -13,57 +14,57 @@ class Segment < ActiveRecord::Base
   belongs_to :to_node, :class_name => 'Node', :foreign_key => 'node_b'
 
   def self.from_xml(xml, create=false)
-    p = XML::Parser.new
-    p.string = xml
-    doc = p.parse
-
-    segment = Segment.new
+    begin
+      p = XML::Parser.new
+      p.string = xml
+      doc = p.parse
 
-    doc.find('//osm/segment').each do |pt|
+      segment = Segment.new
 
-      segment.node_a = pt['from'].to_i
-      segment.node_b = pt['to'].to_i
+      doc.find('//osm/segment').each do |pt|
+        segment.node_a = pt['from'].to_i
+        segment.node_b = pt['to'].to_i
 
-      if pt['id'] != '0'
-        segment.id = pt['id'].to_i
-      end
+        unless create
+          if pt['id'] != '0'
+            segment.id = pt['id'].to_i
+          end
+        end
 
-      segment.visible = true
+        segment.visible = true
 
-      if create
-        segment.timestamp = Time.now
-      else
-        if pt['timestamp']
-          segment.timestamp = Time.parse(pt['timestamp'])
+        if create
+          segment.timestamp = Time.now
+        else
+          if pt['timestamp']
+            segment.timestamp = Time.parse(pt['timestamp'])
+          end
         end
-      end
-
-      tags = []
 
-      pt.find('tag').each do |tag|
-        tags << [tag['k'],tag['v']]
-      end
+        tags = []
 
-      tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
-      tags = '' if tags.nil?
+        pt.find('tag').each do |tag|
+          tags << [tag['k'],tag['v']]
+        end
 
-      segment.tags = tags
+        tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
+        tags = '' if tags.nil?
 
+        segment.tags = tags
+      end
+    rescue
+      segment = nil
     end
+
     return segment
   end
 
-  def save_with_history
-    begin
-      Segment.transaction do
-        self.timestamp = Time.now
-        self.save
-        old_segment = OldSegment.from_segment(self)
-        old_segment.save
-      end
-      return true
-    rescue Exception => ex
-      return nil
+  def save_with_history!
+    Segment.transaction do
+      self.timestamp = Time.now
+      self.save!
+      old_segment = OldSegment.from_segment(self)
+      old_segment.save!
     end
   end
 
@@ -80,14 +81,16 @@ class Segment < ActiveRecord::Base
     el1['to'] = self.node_b.to_s
 
     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'] = self.user.display_name if self.user.data_public?
-    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?
 
     Segment.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s