Add annotate gem and associated rake task. Annotate models.

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

diff --git a/app/models/way.rb b/app/models/way.rb
index d0a252803631c7d1d81f391683cf8747d2718aba..1954f744ca9332d1c45c7bd133e27f9b7b24bed2 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,3 +1,22 @@
+# == Schema Information
+#
+# Table name: current_ways
+#
+#  id           :integer          not null, primary key
+#  changeset_id :integer          not null
+#  timestamp    :datetime         not null
+#  visible      :boolean          not null
+#  version      :integer          not null
+#
+# Indexes
+#
+#  current_ways_timestamp_idx  (timestamp)
+#
+# Foreign Keys
+#
+#  current_ways_changeset_id_fkey  (changeset_id => changesets.id)
+#
+

 class Way < ActiveRecord::Base
   require "xml/libxml"
 
 class Way < ActiveRecord::Base
   require "xml/libxml"
 


@@ -34,7 +53,7 @@ class Way < ActiveRecord::Base
 
   # Read in xml as text and return it's Way object representation
   def self.from_xml(xml, create = false)
 
   # Read in xml as text and return it's Way object representation
   def self.from_xml(xml, create = false)

-    p = XML::Parser.string(xml)
+    p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)

     doc = p.parse
 
     doc.find("//osm/way").each do |pt|
     doc = p.parse
 
     doc.find("//osm/way").each do |pt|


@@ -58,7 +77,7 @@ class Way < ActiveRecord::Base
       way.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
       way.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

-      raise OSM::APIBadUserInput.new("ID of way cannot be zero when updating.") if way.id == 0
+      raise OSM::APIBadUserInput, "ID of way cannot be zero when updating." if way.id.zero?

     end
 
     # We don't care about the timestamp nor the visibility as these are either
     end
 
     # We don't care about the timestamp nor the visibility as these are either


@@ -138,12 +157,12 @@ class Way < ActiveRecord::Base
   attr_writer :tags
 
   def add_nd_num(n)
   attr_writer :tags
 
   def add_nd_num(n)

-    @nds = [] unless @nds
+    @nds ||= []

     @nds << n.to_i
   end
 
   def add_tag_keyval(k, v)
     @nds << n.to_i
   end
 
   def add_tag_keyval(k, v)

-    @tags = {} unless @tags
+    @tags ||= {}

 
     # duplicate tags are now forbidden, so we can't allow values
     # in the hash to be overwritten.
 
     # duplicate tags are now forbidden, so we can't allow values
     # in the hash to be overwritten.


@@ -166,7 +185,7 @@ class Way < ActiveRecord::Base
       lock!
       check_consistency(self, new_way, user)
       unless new_way.preconditions_ok?(nds)
       lock!
       check_consistency(self, new_way, user)
       unless new_way.preconditions_ok?(nds)

-        raise OSM::APIPreconditionFailedError.new("Cannot update way #{id}: data is invalid.")
+        raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid."

       end
 
       self.changeset_id = new_way.changeset_id
       end
 
       self.changeset_id = new_way.changeset_id


@@ -181,7 +200,7 @@ class Way < ActiveRecord::Base
   def create_with_history(user)
     check_create_consistency(self, user)
     unless preconditions_ok?
   def create_with_history(user)
     check_create_consistency(self, user)
     unless preconditions_ok?

-      raise OSM::APIPreconditionFailedError.new("Cannot create way: data is invalid.")
+      raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid."

     end
     self.version = 0
     self.visible = true
     end
     self.version = 0
     self.visible = true


@@ -205,7 +224,7 @@ class Way < ActiveRecord::Base
 
       if db_nds.length < new_nds.length
         missing = new_nds - db_nds.collect(&:id)
 
       if db_nds.length < new_nds.length
         missing = new_nds - db_nds.collect(&:id)

-        raise OSM::APIPreconditionFailedError.new("Way #{id} requires the nodes with id in (#{missing.join(',')}), which either do not exist, or are not visible.")
+        raise OSM::APIPreconditionFailedError, "Way #{id} requires the nodes with id in (#{missing.join(',')}), which either do not exist, or are not visible."

       end
     end
 
       end
     end
 


@@ -222,7 +241,7 @@ class Way < ActiveRecord::Base
       lock!
       check_consistency(self, new_way, user)
       rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Way", :member_id => id }).order(:id)
       lock!
       check_consistency(self, new_way, user)
       rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Way", :member_id => id }).order(:id)

-      raise OSM::APIPreconditionFailedError.new("Way #{id} is still used by relations #{rels.collect(&:id).join(",")}.") unless rels.empty?
+      raise OSM::APIPreconditionFailedError, "Way #{id} is still used by relations #{rels.collect(&:id).join(',')}." unless rels.empty?

 
       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset
 
       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset


@@ -242,7 +261,7 @@ class Way < ActiveRecord::Base
     nds.map! do |node_id|
       if node_id < 0
         new_id = id_map[:node][node_id]
     nds.map! do |node_id|
       if node_id < 0
         new_id = id_map[:node][node_id]

-        raise OSM::APIBadUserInput.new("Placeholder node not found for reference #{node_id} in way #{id.nil? ? placeholder_id : id}") if new_id.nil?
+        raise OSM::APIBadUserInput, "Placeholder node not found for reference #{node_id} in way #{id.nil? ? placeholder_id : id}" if new_id.nil?

         new_id
       else
         node_id
         new_id
       else
         node_id


@@ -255,6 +274,9 @@ class Way < ActiveRecord::Base
   def save_with_history!
     t = Time.now.getutc
 
   def save_with_history!
     t = Time.now.getutc
 

+    self.version += 1
+    self.timestamp = t
+

     # update the bounding box, note that this has to be done both before
     # and after the save, so that nodes from both versions are included in the
     # bbox. we use a copy of the changeset so that it isn't reloaded
     # update the bounding box, note that this has to be done both before
     # and after the save, so that nodes from both versions are included in the
     # bbox. we use a copy of the changeset so that it isn't reloaded


@@ -263,12 +285,12 @@ class Way < ActiveRecord::Base
     cs.update_bbox!(bbox) unless nodes.empty?
 
     Way.transaction do
     cs.update_bbox!(bbox) unless nodes.empty?
 
     Way.transaction do

-      self.version += 1
-      self.timestamp = t
-      save!
+      # clone the object before saving it so that the original is
+      # still marked as dirty if we retry the transaction
+      clone.save!

 
       tags = self.tags
 
       tags = self.tags

-      WayTag.delete_all(:way_id => id)
+      WayTag.where(:way_id => id).delete_all

       tags.each do |k, v|
         tag = WayTag.new
         tag.way_id = id
       tags.each do |k, v|
         tag = WayTag.new
         tag.way_id = id


@@ -278,7 +300,7 @@ class Way < ActiveRecord::Base
       end
 
       nds = self.nds
       end
 
       nds = self.nds

-      WayNode.delete_all(:way_id => id)
+      WayNode.where(:way_id => id).delete_all

       sequence = 1
       nds.each do |n|
         nd = WayNode.new
       sequence = 1
       nds.each do |n|
         nd = WayNode.new