Added first attempt at bounding box support in changesets and tests for the same.

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

diff --git a/app/models/way.rb b/app/models/way.rb
index f26d7658b14589eb0b81187c2cb42882db37b9a2..4143291c1f47eda44189fe803b855edd3e616612 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -51,6 +51,8 @@ class Way < ActiveRecord::Base
       if pt['timestamp']
         way.timestamp = Time.parse(pt['timestamp'])
       end
+      # if visible isn't present then it defaults to true
+      way.visible = (pt['visible'] or true)
     end
 
     pt.find('tag').each do |tag|
@@ -169,12 +171,32 @@ class Way < ActiveRecord::Base
 
   def add_tag_keyval(k, v)
     @tags = Hash.new unless @tags
+
+    # duplicate tags are now forbidden, so we can't allow values
+    # in the hash to be overwritten.
+    raise OSM::APIDuplicateTagsError.new if @tags.include? k
+
     @tags[k] = v
   end
 
+  ##
+  # the integer coords (i.e: unscaled) bounding box of the way, assuming
+  # straight line segments.
+  def bbox
+    lons = nodes.collect { |n| n.longitude }
+    lats = nodes.collect { |n| n.latitude }
+    [ lons.min, lats.min, lons.max, lats.max ]
+  end
+
   def save_with_history!
     t = Time.now
 
+    # update the bounding box, but don't save it as the controller knows the 
+    # lifetime of the change better. note that this has to be done both before 
+    # and after the save, so that nodes from both versions are included in the 
+    # bbox.
+    changeset.update_bbox!(bbox) unless nodes.empty?
+
     Way.transaction do
       self.version += 1
       self.timestamp = t
@@ -204,6 +226,11 @@ class Way < ActiveRecord::Base
       old_way = OldWay.from_way(self)
       old_way.timestamp = t
       old_way.save_with_dependencies!
+
+      # update and commit the bounding box, now that way nodes 
+      # have been updated and we're in a transaction.
+      changeset.update_bbox!(bbox) unless nodes.empty?
+      changeset.save!
     end
   end
 
@@ -231,6 +258,9 @@ class Way < ActiveRecord::Base
 
   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'])
+    end
     self.nds.each do |n|
       node = Node.find(:first, :conditions => ["id = ?", n])
       unless node and node.visible
@@ -240,19 +270,12 @@ class Way < ActiveRecord::Base
     return true
   end
 
-  def delete_with_history(new_way, user)
+  def delete_with_history!(new_way, user)
     check_consistency(self, new_way, user)
     if self.visible
-      # FIXME
-      # this should actually delete the relations,
-      # not just throw a PreconditionFailed if it's a member of a relation!!
-      # WHY?? The editor should decide whether the node is in the relation or not!
-
-      # FIXME: this should probably renamed to delete_with_history
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
-                             :conditions => [ "visible = 1 AND member_type='way' and member_id=?", self.id])
+                             :conditions => [ "visible = 1 AND member_type='way' and member_id=? ", self.id])
         raise OSM::APIPreconditionFailedError
-      # end FIXME
       else
         self.changeset_id = new_way.changeset_id
         self.tags = []
@@ -299,4 +322,21 @@ class Way < ActiveRecord::Base
   def tags_as_hash
     return self.tags
   end
+
+  ##
+  # if any referenced nodes are placeholder IDs (i.e: are negative) then
+  # this calling this method will fix them using the map from placeholders 
+  # to IDs +id_map+. 
+  def fix_placeholders!(id_map)
+    self.nds.map! do |node_id|
+      if node_id < 0
+        new_id = id_map[:node][node_id]
+        raise "invalid placeholder for #{node_id.inspect}: #{new_id.inspect}" if new_id.nil?
+        new_id
+      else
+        node_id
+      end
+    end
+  end
+
 end