pass common API error text through to Potlatch so it can be shown to the user

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 94a6fa7548faf23299219d5e7f9d5aed72e82847..97f44c1171337375bb72166153f86be7f3837fff 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -51,7 +51,7 @@ class Way < ActiveRecord::Base
 
     # This next section isn't required for the create, update, or delete of ways
     if create
 
     # This next section isn't required for the create, update, or delete of ways
     if create

-      way.timestamp = Time.now
+      way.timestamp = Time.now.getutc

       way.visible = true
     else
       if pt['timestamp']
       way.visible = true
     else
       if pt['timestamp']


@@ -199,8 +199,8 @@ class Way < ActiveRecord::Base
 
   def update_from(new_way, user)
     check_consistency(self, new_way, user)
 
   def update_from(new_way, user)
     check_consistency(self, new_way, user)

-    if !new_way.preconditions_ok?
-      raise OSM::APIPreconditionFailedError.new
+    unless new_way.preconditions_ok?
+      raise OSM::APIPreconditionFailedError("Cannot update way #{self.id}: data is invalid.")

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


@@ -213,8 +213,8 @@ class Way < ActiveRecord::Base
 
   def create_with_history(user)
     check_create_consistency(self, user)
 
   def create_with_history(user)
     check_create_consistency(self, user)

-    if !self.preconditions_ok?
-      raise OSM::APIPreconditionFailedError.new
+    unless self.preconditions_ok?
+      raise OSM::APIPreconditionFailedError("Cannot create way: data is invalid.")

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


@@ -224,7 +224,7 @@ class Way < ActiveRecord::Base
   def preconditions_ok?
     return false if self.nds.empty?
     if self.nds.length > APP_CONFIG['max_number_of_way_nodes']
   def preconditions_ok?
     return false if self.nds.empty?
     if self.nds.length > APP_CONFIG['max_number_of_way_nodes']

-      raise OSM::APITooManyWayNodesError.new(self.nds.count, APP_CONFIG['max_number_of_way_nodes'])
+      raise OSM::APITooManyWayNodesError.new(self.nds.length, APP_CONFIG['max_number_of_way_nodes'])

     end
     self.nds.each do |n|
       node = Node.find(:first, :conditions => ["id = ?", n])
     end
     self.nds.each do |n|
       node = Node.find(:first, :conditions => ["id = ?", n])


@@ -246,7 +246,7 @@ class Way < ActiveRecord::Base
     Way.transaction do
       check_consistency(self, new_way, user)
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
     Way.transaction do
       check_consistency(self, new_way, user)
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",

-                             :conditions => [ "visible = ? AND member_type='way' and member_id=? ", true, self.id])
+                             :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id])

         raise OSM::APIPreconditionFailedError.new("You need to make sure that this way is not a member of a relation.")
       else
         self.changeset_id = new_way.changeset_id
         raise OSM::APIPreconditionFailedError.new("You need to make sure that this way is not a member of a relation.")
       else
         self.changeset_id = new_way.changeset_id


@@ -296,7 +296,7 @@ class Way < ActiveRecord::Base
   private
   
   def save_with_history!
   private
   
   def save_with_history!

-    t = Time.now
+    t = Time.now.getutc

 
     # 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 
 
     # 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