Close a number of holes in the API by making it validate changes

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 85b52aa88e6e8b4c8329536e4a1a3144eaec0d58..5a26e221684fbcd7b6ac87d37bee4811c2365391 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -6,60 +6,93 @@ class Way < ActiveRecord::Base
   has_many :way_segments, :foreign_key => 'id'
   has_many :way_tags, :foreign_key => 'id'
 
   has_many :way_segments, :foreign_key => 'id'
   has_many :way_tags, :foreign_key => 'id'
 

+  has_many :old_ways, :foreign_key => :id
+

   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|
-      unless 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
 
   def to_xml
     end
 
     return way
   end
 
   def to_xml

-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Node.new 'osm'
-    root['version'] = '0.4'
-    root['generator'] = 'OpenStreetMap server'
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc
+  end

 
 

-    doc.root = root
-    
+  def to_xml_node(visible_segments = nil, user_display_name_cache = nil)

     el1 = XML::Node.new 'way'
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1 = XML::Node.new 'way'
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

+
+    user_display_name_cache = {} if user_display_name_cache.nil?

     
     

-    self.way_segments.each do |seg| # FIXME need to make sure they come back in the right order
-      e = XML::Node.new 'seg'
-      e['id'] = seg.segment_id.to_s
-      el1 << e
+    if user_display_name_cache and user_display_name_cache[self.user_id]
+      # use the cache if available
+    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] unless user_display_name_cache[self.user_id].nil?
+
+    # make sure segments are output in sequence_id order
+    ordered_segments = []
+    self.way_segments.each do |seg|
+      if visible_segments
+        # if there is a list of visible segments then use that to weed out deleted segments
+        if visible_segments[seg.segment_id]
+          ordered_segments[seg.sequence_id] = seg.segment_id.to_s
+        end
+      else
+        # otherwise, manually go to the db to check things
+        if seg.segment.visible? and seg.segment.from_node.visible? and seg.segment.to_node.visible?
+          ordered_segments[seg.sequence_id] = seg.segment_id.to_s
+        end
+      end
+    end
+
+    ordered_segments.each do |seg_id|
+      if seg_id and seg_id != '0'
+        e = XML::Node.new 'seg'
+        e['id'] = seg_id
+        el1 << e
+      end

     end
  
     self.way_tags.each do |tag|
     end
  
     self.way_tags.each do |tag|


@@ -68,18 +101,26 @@ class Way < ActiveRecord::Base
       e['v'] = tag.v
       el1 << e
     end
       e['v'] = tag.v
       el1 << e
     end

-  
-    root << el1
-    return doc
-  end
+    return el1
+  end 

 
   def segs
 
   def segs

-    @segs = Array.new unless @segs
+    unless @segs
+        @segs = Array.new
+        self.way_segments.each do |seg|
+            @segs += [seg.segment_id]
+        end
+    end

     @segs
   end
 
   def tags
     @segs
   end
 
   def tags

-    @tags = Hash.new unless @tags
+    unless @tags
+        @tags = Hash.new
+        self.way_tags.each do |tag|
+            @tags[tag.k] = tag.v
+        end
+    end

     @tags
   end
 
     @tags
   end
 


@@ -102,35 +143,54 @@ class Way < ActiveRecord::Base
   end
 
   def save_with_history
   end
 
   def save_with_history

-    t = Time.now
-    self.timestamp = t
-    self.save
+    begin
+      Way.transaction do
+        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
-    end
+        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!
+        end

 
 

-    WaySegment.delete_all(['id = ?', self.id])
+        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
+        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
+        end
+
+        old_way = OldWay.from_way(self)
+        old_way.timestamp = t
+        old_way.save_with_dependencies!
+      end
+
+      return true
+    rescue
+      return nil

     end
     end

+  end

 
 

-    old_way = OldWay.from_way(self)
-    old_way.timestamp = t
-    old_way.save_with_dependencies
+  def preconditions_ok?
+    return false if self.segs.empty?
+    self.segs.each do |n|
+      segment = Segment.find(n)
+      unless segment and segment.visible and segment.preconditions_ok?
+        return false
+      end
+    end
+    return true

   end
 
 end
   end
 
 end