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

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 65bb3158debd3c545c47b869ed6de3c50a900ba6..c65119235372875d120c28f816e27dd3beb76ac6 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -3,42 +3,45 @@ class Way < ActiveRecord::Base
   
   belongs_to :user
 
   
   belongs_to :user
 

-  has_many :way_segments, :foreign_key => 'id'
+  has_many :way_segments, :foreign_key => 'id', :order => 'sequence_id'

   has_many :way_tags, :foreign_key => 'id'
 
   has_many :way_tags, :foreign_key => 'id'
 

-  has_many :old_ways, :foreign_key => :id
+  has_many :old_ways, :foreign_key => 'id', :order => 'version'

 
   set_table_name 'current_ways'
 
   def self.from_xml(xml, create=false)
 
   set_table_name 'current_ways'
 
   def self.from_xml(xml, create=false)

-    p = XML::Parser.new
-    p.string = xml
-    doc = p.parse
+    begin
+      p = XML::Parser.new
+      p.string = xml
+      doc = p.parse

 
 

-    way = Way.new
+      way = Way.new

 
 

-    doc.find('//osm/way').each do |pt|
-      if !create and pt['id'] != '0'
-        way.id = pt['id'].to_i
-      end
+      doc.find('//osm/way').each do |pt|
+        if !create and pt['id'] != '0'
+          way.id = pt['id'].to_i
+        end

 
 

-      if create
-        way.timestamp = Time.now
-        way.visible = true
-      else
-        if pt['timestamp']
-          way.timestamp = Time.parse(pt['timestamp'])
+        if create
+          way.timestamp = Time.now
+          way.visible = true
+        else
+          if pt['timestamp']
+            way.timestamp = Time.parse(pt['timestamp'])
+          end

         end
         end

-      end

 
 

-      pt.find('tag').each do |tag|
-        way.add_tag_keyval(tag['k'], tag['v'])
-      end
+        pt.find('tag').each do |tag|
+          way.add_tag_keyval(tag['k'], tag['v'])
+        end

 
 

-      pt.find('seg').each do |seg|
-        way.add_seg_num(seg['id'])
+        pt.find('seg').each do |seg|
+          way.add_seg_num(seg['id'])
+        end

       end
       end

-
+    rescue
+      way = nil

     end
 
     return way
     end
 
     return way


@@ -58,14 +61,15 @@ class Way < ActiveRecord::Base
 
     user_display_name_cache = {} if user_display_name_cache.nil?
     
 
     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
       # use the cache if available

-    else
+    elsif self.user.data_public?

       user_display_name_cache[self.user_id] = self.user.display_name
       user_display_name_cache[self.user_id] = self.user.display_name

+    else
+      user_display_name_cache[self.user_id] = nil

     end
     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?

 
     # make sure segments are output in sequence_id order
     ordered_segments = []
 
     # make sure segments are output in sequence_id order
     ordered_segments = []


@@ -84,7 +88,7 @@ class Way < ActiveRecord::Base
     end
 
     ordered_segments.each do |seg_id|
     end
 
     ordered_segments.each do |seg_id|

-      if seg_id
+      if seg_id and seg_id != '0'

         e = XML::Node.new 'seg'
         e['id'] = seg_id
         el1 << e
         e = XML::Node.new 'seg'
         e['id'] = seg_id
         el1 << e


@@ -138,41 +142,53 @@ class Way < ActiveRecord::Base
     @tags[k] = v
   end
 
     @tags[k] = v
   end
 

-  def save_with_history
+  def save_with_history!

     t = Time.now
     t = Time.now

-    self.timestamp = t
-    self.save
-    
-    WayTag.delete_all(['id = ?', self.id])
-
-    self.tags.each do |k,v|
-      tag = WayTag.new
-      tag.k = k
-      tag.v = v
-      tag.id = self.id
-      tag.save
+
+    Way.transaction do
+      self.timestamp = t
+      self.save!

     end
 
     end
 

-    WaySegment.delete_all(['id = ?', self.id])
-    
-    i = 0
-    self.segs.each do |n|
-      seg = WaySegment.new
-      seg.id = self.id
-      seg.segment_id = n
-      seg.sequence_id = i
-      seg.save
-      i += 1
+    WayTag.transaction do
+      tags = self.tags
+
+      WayTag.delete_all(['id = ?', self.id])
+
+      tags.each do |k,v|
+        tag = WayTag.new
+        tag.k = k
+        tag.v = v
+        tag.id = self.id
+        tag.save!
+      end
+    end
+
+    WaySegment.transaction do
+      segs = self.segs
+
+      WaySegment.delete_all(['id = ?', self.id])
+
+      i = 1
+      segs.each do |n|
+        seg = WaySegment.new
+        seg.id = self.id
+        seg.segment_id = n
+        seg.sequence_id = i
+        seg.save!
+        i += 1
+      end

     end
 
     old_way = OldWay.from_way(self)
     old_way.timestamp = t
     end
 
     old_way = OldWay.from_way(self)
     old_way.timestamp = t

-    old_way.save_with_dependencies
+    old_way.save_with_dependencies!

   end
 
   def preconditions_ok?
   end
 
   def preconditions_ok?

+    return false if self.segs.empty?

     self.segs.each do |n|
     self.segs.each do |n|

-      segment = Segment.find(n)
+      segment = Segment.find(:first, :conditions => ["id = ?", n])

       unless segment and segment.visible and segment.preconditions_ok?
         return false
       end
       unless segment and segment.visible and segment.preconditions_ok?
         return false
       end