X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fb5f39f19ae00dad9ec896e216e8e813de42c151..995c9df1958a9f2333748179fe276bc9886b8a86:/app/models/way.rb?ds=sidebyside diff --git a/app/models/way.rb b/app/models/way.rb index b2bdfb39b..7c29a44b3 100644 --- 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| @@ -99,7 +101,10 @@ class Way < ActiveRecord::Base user_display_name_cache[self.changeset.user_id] = nil end - el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil? + if not user_display_name_cache[self.changeset.user_id].nil? + el1['user'] = user_display_name_cache[self.changeset.user_id] + el1['uid'] = self.changeset.user_id.to_s + end # make sure nodes are output in sequence_id order ordered_nodes = [] @@ -111,7 +116,7 @@ class Way < ActiveRecord::Base end else # otherwise, manually go to the db to check things - if nd.node.visible? and nd.node.visible? + if nd.node and nd.node.visible? ordered_nodes[nd.sequence_id] = nd.node_id.to_s end end @@ -169,12 +174,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 +229,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 @@ -212,7 +242,7 @@ class Way < ActiveRecord::Base if !new_way.preconditions_ok? raise OSM::APIPreconditionFailedError.new end - self.changeset_id = changeset_id + self.changeset_id = new_way.changeset_id self.tags = new_way.tags self.nds = new_way.nds self.visible = true @@ -222,7 +252,7 @@ class Way < ActiveRecord::Base def create_with_history(user) check_create_consistency(self, user) if !self.preconditions_ok? - raise OSM::APIPreconditionsFailedError.new + raise OSM::APIPreconditionFailedError.new end self.version = 0 self.visible = true @@ -231,6 +261,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 +273,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 = ? AND member_type='way' and member_id=? ", true, self.id]) raise OSM::APIPreconditionFailedError - # end FIXME else self.changeset_id = new_way.changeset_id self.tags = [] @@ -265,22 +291,24 @@ class Way < ActiveRecord::Base end end - # delete a way and it's nodes that aren't part of other ways, with history + # delete a way and its nodes that aren't part of other ways, with history # FIXME: merge the potlatch code to delete the relations - def delete_with_relations_and_nodes_and_history(user) + # and refactor to use delete_with_history! + def delete_with_relations_and_nodes_and_history(changeset_id) # delete the nodes not used by other ways self.unshared_node_ids.each do |node_id| n = Node.find(node_id) - n.user_id = user.id + n.changeset_id = changeset_id n.visible = false n.save_with_history! end - # FIXME needs more information passed in so that the changeset can be updated - self.user_id = user.id - - self.delete_with_history(user) + self.changeset_id = changeset_id + self.tags = [] + self.nds = [] + self.visible = false + self.save_with_history! end # Find nodes that belong to this way only @@ -299,4 +327,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