Merge remote-tracking branch 'osmlab/iD-1.6.0'

[rails.git] / app / controllers / changeset_controller.rb

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index f92293fde852530c175197a5efc80251b4e1804e..b236ba6b577b9e02a906d9a787ddf6e328f15203 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -33,29 +33,29 @@ class ChangesetController < ApplicationController
   end
 
   ##
   end
 
   ##

-  # Return XML giving the basic info about the changeset. Does not 
+  # Return XML giving the basic info about the changeset. Does not

   # return anything about the nodes, ways and relations in the changeset.
   def read
     changeset = Changeset.find(params[:id])
     render :text => changeset.to_xml.to_s, :content_type => "text/xml"
   end
   # return anything about the nodes, ways and relations in the changeset.
   def read
     changeset = Changeset.find(params[:id])
     render :text => changeset.to_xml.to_s, :content_type => "text/xml"
   end

-  
+

   ##
   # marks a changeset as closed. this may be called multiple times
   # on the same changeset, so is idempotent.
   ##
   # marks a changeset as closed. this may be called multiple times
   # on the same changeset, so is idempotent.

-  def close 
+  def close

     assert_method :put
     assert_method :put

-    
-    changeset = Changeset.find(params[:id])    
+
+    changeset = Changeset.find(params[:id])

     check_changeset_consistency(changeset, @user)
 
     # to close the changeset, we'll just set its closed_at time to
     check_changeset_consistency(changeset, @user)
 
     # to close the changeset, we'll just set its closed_at time to

-    # now. this might not be enough if there are concurrency issues, 
+    # now. this might not be enough if there are concurrency issues,

     # but we'll have to wait and see.
     changeset.set_closed_time_now
 
     changeset.save!
     # but we'll have to wait and see.
     changeset.set_closed_time_now
 
     changeset.save!

-    render :nothing => true
+    render :text => ""

   end
 
   ##
   end
 
   ##


@@ -70,11 +70,11 @@ class ChangesetController < ApplicationController
 
     cs = Changeset.find(params[:id])
     check_changeset_consistency(cs, @user)
 
     cs = Changeset.find(params[:id])
     check_changeset_consistency(cs, @user)

-    
+

     # keep an array of lons and lats
     lon = Array.new
     lat = Array.new
     # keep an array of lons and lats
     lon = Array.new
     lat = Array.new

-    
+

     # the request is in pseudo-osm format... this is kind-of an
     # abuse, maybe should change to some other format?
     doc = XML::Parser.string(request.raw_post).parse
     # the request is in pseudo-osm format... this is kind-of an
     # abuse, maybe should change to some other format?
     doc = XML::Parser.string(request.raw_post).parse


@@ -82,17 +82,17 @@ class ChangesetController < ApplicationController
       lon << n['lon'].to_f * GeoRecord::SCALE
       lat << n['lat'].to_f * GeoRecord::SCALE
     end
       lon << n['lon'].to_f * GeoRecord::SCALE
       lat << n['lat'].to_f * GeoRecord::SCALE
     end

-    
+

     # add the existing bounding box to the lon-lat array
     lon << cs.min_lon unless cs.min_lon.nil?
     lat << cs.min_lat unless cs.min_lat.nil?
     lon << cs.max_lon unless cs.max_lon.nil?
     lat << cs.max_lat unless cs.max_lat.nil?
     # add the existing bounding box to the lon-lat array
     lon << cs.min_lon unless cs.min_lon.nil?
     lat << cs.min_lat unless cs.min_lat.nil?
     lon << cs.max_lon unless cs.max_lon.nil?
     lat << cs.max_lat unless cs.max_lat.nil?

-    
+

     # collapse the arrays to minimum and maximum
     # collapse the arrays to minimum and maximum

-    cs.min_lon, cs.min_lat, cs.max_lon, cs.max_lat = 
+    cs.min_lon, cs.min_lat, cs.max_lon, cs.max_lat =

       lon.min, lat.min, lon.max, lat.max
       lon.min, lat.min, lon.max, lat.max

-    
+

     # save the larger bounding box and return the changeset, which
     # will include the bigger bounding box.
     cs.save!
     # save the larger bounding box and return the changeset, which
     # will include the bigger bounding box.
     cs.save!


@@ -109,7 +109,7 @@ class ChangesetController < ApplicationController
   # Furthermore, each element in the diff can only reference the current
   # changeset.
   #
   # Furthermore, each element in the diff can only reference the current
   # changeset.
   #

-  # Returns: a diffResult document, as described in 
+  # Returns: a diffResult document, as described in

   # http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6
   def upload
     # only allow POST requests, as the upload method is most definitely
   # http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6
   def upload
     # only allow POST requests, as the upload method is most definitely


@@ -120,7 +120,7 @@ class ChangesetController < ApplicationController
 
     changeset = Changeset.find(params[:id])
     check_changeset_consistency(changeset, @user)
 
     changeset = Changeset.find(params[:id])
     check_changeset_consistency(changeset, @user)

-    
+

     diff_reader = DiffReader.new(request.raw_post, changeset)
     Changeset.transaction do
       result = diff_reader.commit
     diff_reader = DiffReader.new(request.raw_post, changeset)
     Changeset.transaction do
       result = diff_reader.commit


@@ -132,60 +132,61 @@ class ChangesetController < ApplicationController
   # download the changeset as an osmChange document.
   #
   # to make it easier to revert diffs it would be better if the osmChange
   # download the changeset as an osmChange document.
   #
   # to make it easier to revert diffs it would be better if the osmChange

-  # format were reversible, i.e: contained both old and new versions of 
+  # format were reversible, i.e: contained both old and new versions of

   # modified elements. but it doesn't at the moment...
   #
   # this method cannot order the database changes fully (i.e: timestamp and
   # version number may be too coarse) so the resulting diff may not apply
   # modified elements. but it doesn't at the moment...
   #
   # this method cannot order the database changes fully (i.e: timestamp and
   # version number may be too coarse) so the resulting diff may not apply

-  # to a different database. however since changesets are not atomic this 
+  # to a different database. however since changesets are not atomic this

   # behaviour cannot be guaranteed anyway and is the result of a design
   # choice.
   def download
     changeset = Changeset.find(params[:id])
   # behaviour cannot be guaranteed anyway and is the result of a design
   # choice.
   def download
     changeset = Changeset.find(params[:id])

-    
-    # get all the elements in the changeset and stick them in a big array.
-    elements = [changeset.old_nodes, 
-                changeset.old_ways, 
-                changeset.old_relations].flatten
-    
-    # sort the elements by timestamp and version number, as this is the 
-    # almost sensible ordering available. this would be much nicer if 
-    # global (SVN-style) versioning were used - then that would be 
+
+    # get all the elements in the changeset which haven't been redacted
+    # and stick them in a big array.
+    elements = [changeset.old_nodes.unredacted,
+                changeset.old_ways.unredacted,
+                changeset.old_relations.unredacted].flatten
+
+    # sort the elements by timestamp and version number, as this is the
+    # almost sensible ordering available. this would be much nicer if
+    # global (SVN-style) versioning were used - then that would be

     # unambiguous.
     # unambiguous.

-    elements.sort! do |a, b| 
+    elements.sort! do |a, b|

       if (a.timestamp == b.timestamp)
         a.version <=> b.version
       else
       if (a.timestamp == b.timestamp)
         a.version <=> b.version
       else

-        a.timestamp <=> b.timestamp 
+        a.timestamp <=> b.timestamp

       end
     end
       end
     end

-    
+
+    # create changeset and user caches
+    changeset_cache = {}
+    user_display_name_cache = {}
+

     # create an osmChange document for the output
     result = OSM::API.new.get_xml_doc
     result.root.name = "osmChange"
 
     # generate an output element for each operation. note: we avoid looking
     # create an osmChange document for the output
     result = OSM::API.new.get_xml_doc
     result.root.name = "osmChange"
 
     # generate an output element for each operation. note: we avoid looking

-    # at the history because it is simpler - but it would be more correct to 
+    # at the history because it is simpler - but it would be more correct to

     # check these assertions.
     elements.each do |elt|
       result.root <<
     # check these assertions.
     elements.each do |elt|
       result.root <<

-        if (elt.version == 1) 
+        if (elt.version == 1)

           # first version, so it must be newly-created.
           created = XML::Node.new "create"
           # first version, so it must be newly-created.
           created = XML::Node.new "create"

-          created << elt.to_xml_node
+          created << elt.to_xml_node(changeset_cache, user_display_name_cache)

         else
         else

-          # get the previous version from the element history
-          prev_elt = elt.class.find([elt.id, elt.version])

           unless elt.visible
           unless elt.visible

-            # if the element isn't visible then it must have been deleted, so
-            # output the *previous* XML
+            # if the element isn't visible then it must have been deleted

             deleted = XML::Node.new "delete"
             deleted = XML::Node.new "delete"

-            deleted << prev_elt.to_xml_node
+            deleted << elt.to_xml_node(changeset_cache, user_display_name_cache)

           else
           else

-            # must be a modify, for which we don't need the previous version
-            # yet...
+            # must be a modify

             modified = XML::Node.new "modify"
             modified = XML::Node.new "modify"

-            modified << elt.to_xml_node
+            modified << elt.to_xml_node(changeset_cache, user_display_name_cache)

           end
         end
     end
           end
         end
     end


@@ -203,12 +204,13 @@ class ChangesetController < ApplicationController
 
     # create the conditions that the user asked for. some or all of
     # these may be nil.
 
     # create the conditions that the user asked for. some or all of
     # these may be nil.

-    changesets = Changeset.scoped
+    changesets = Changeset.all

     changesets = conditions_bbox(changesets, bbox)
     changesets = conditions_user(changesets, params['user'], params['display_name'])
     changesets = conditions_time(changesets, params['time'])
     changesets = conditions_open(changesets, params['open'])
     changesets = conditions_closed(changesets, params['closed'])
     changesets = conditions_bbox(changesets, bbox)
     changesets = conditions_user(changesets, params['user'], params['display_name'])
     changesets = conditions_time(changesets, params['time'])
     changesets = conditions_open(changesets, params['open'])
     changesets = conditions_closed(changesets, params['closed'])

+    changesets = conditions_ids(changesets, params['changesets'])

 
     # create the results document
     results = OSM::API.new.get_xml_doc
 
     # create the results document
     results = OSM::API.new.get_xml_doc


@@ -220,7 +222,7 @@ class ChangesetController < ApplicationController
 
     render :text => results.to_s, :content_type => "text/xml"
   end
 
     render :text => results.to_s, :content_type => "text/xml"
   end

-  
+

   ##
   # updates a changeset's tags. none of the changeset's attributes are
   # user-modifiable, so they will be ignored.
   ##
   # updates a changeset's tags. none of the changeset's attributes are
   # user-modifiable, so they will be ignored.


@@ -241,78 +243,60 @@ class ChangesetController < ApplicationController
       changeset.update_from(new_changeset, @user)
       render :text => changeset.to_xml, :mime_type => "text/xml"
     else
       changeset.update_from(new_changeset, @user)
       render :text => changeset.to_xml, :mime_type => "text/xml"
     else

-      
-      render :nothing => true, :status => :bad_request
+
+      render :text => "", :status => :bad_request

     end
   end
 
   ##
   # list edits (open changesets) in reverse chronological order
   def list
     end
   end
 
   ##
   # list edits (open changesets) in reverse chronological order
   def list

-    if request.format == :atom and params[:page]
-      redirect_to params.merge({ :page => nil }), :status => :moved_permanently
+    if request.format == :atom and params[:max_id]
+      redirect_to params.merge({ :max_id => nil }), :status => :moved_permanently
+      return
+    end
+
+    if params[:display_name]
+      user = User.find_by_display_name(params[:display_name])
+      if !user || !user.active?
+        render_unknown_user params[:display_name]
+        return
+      end
+    end
+
+    if (params[:friends] || params[:nearby]) && !@user && request.format == :html
+      require_user
+      return
+    end
+
+    if request.format == :html and !params[:list]
+      require_oauth
+      render :action => :history, :layout => map_layout

     else
     else

-      changesets = conditions_nonempty(Changeset.scoped)
+      changesets = conditions_nonempty(Changeset.all)

 
       if params[:display_name]
 
       if params[:display_name]

-        user = User.find_by_display_name(params[:display_name])
-        
-        if user and user.active?
-          if user.data_public? or user == @user
-            changesets = changesets.where(:user_id => user.id)
-          else
-            changesets = changesets.where("false")
-          end
-        elsif request.format == :html
-          @title = t 'user.no_such_user.title'
-          @not_found_user = params[:display_name]
-          render :template => 'user/no_such_user', :status => :not_found
-          return
+        if user.data_public? or user == @user
+          changesets = changesets.where(:user_id => user.id)
+        else
+          changesets = changesets.where("false")

         end
         end

+      elsif params[:bbox]
+        changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
+      elsif params[:friends] && @user
+        changesets = changesets.where(:user_id => @user.friend_users.identifiable)
+      elsif params[:nearby] && @user
+        changesets = changesets.where(:user_id => @user.nearby)

       end
 
       end
 

-      if params[:bbox]
-        bbox = BoundingBox.from_bbox_params(params)
-      elsif params[:minlon] and params[:minlat] and params[:maxlon] and params[:maxlat]
-        bbox = BoundingBox.from_lon_lat_params(params)
-      end
-
-      if bbox
-        changesets = conditions_bbox(changesets, bbox)
-        bbox_link = render_to_string :partial => "bbox", :object => bbox
-      end
-      
-      if user
-        user_link = render_to_string :partial => "user", :object => user
-      end
-      
-      if user and bbox
-        @title =  t 'changeset.list.title_user_bbox', :user => user.display_name, :bbox => bbox.to_s
-        @heading =  t 'changeset.list.heading_user_bbox', :user => user.display_name, :bbox => bbox.to_s
-        @description = t 'changeset.list.description_user_bbox', :user => user_link, :bbox => bbox_link
-      elsif user
-        @title =  t 'changeset.list.title_user', :user => user.display_name
-        @heading =  t 'changeset.list.heading_user', :user => user.display_name
-        @description = t 'changeset.list.description_user', :user => user_link
-      elsif bbox
-        @title =  t 'changeset.list.title_bbox', :bbox => bbox.to_s
-        @heading =  t 'changeset.list.heading_bbox', :bbox => bbox.to_s
-        @description = t 'changeset.list.description_bbox', :bbox => bbox_link
-      else
-        @title =  t 'changeset.list.title'
-        @heading =  t 'changeset.list.heading'
-        @description = t 'changeset.list.description'
+      if params[:max_id]
+        changesets = changesets.where("changesets.id <= ?", params[:max_id])

       end
 
       end
 

-      @page = (params[:page] || 1).to_i
-      @page_size = 20
+      @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags)

 
 

-      @bbox = bbox
-      
-      @edits = changesets.order("changesets.created_at DESC").offset((@page - 1) * @page_size).limit(@page_size).preload(:user, :changeset_tags)
+      render :action => :list, :layout => false

     end
     end

-
-    render :action => :list

   end
 
   ##
   end
 
   ##


@@ -324,7 +308,7 @@ class ChangesetController < ApplicationController
 private
   #------------------------------------------------------------
   # utility functions below.
 private
   #------------------------------------------------------------
   # utility functions below.

-  #------------------------------------------------------------  
+  #------------------------------------------------------------

 
   ##
   # if a bounding box was specified do some sanity checks.
 
   ##
   # if a bounding box was specified do some sanity checks.


@@ -361,13 +345,13 @@ private
       # make sure we found a user
       raise OSM::APINotFoundError.new if u.nil?
 
       # make sure we found a user
       raise OSM::APINotFoundError.new if u.nil?
 

-      # should be able to get changesets of public users only, or 
+      # should be able to get changesets of public users only, or

       # our own changesets regardless of public-ness.
       unless u.data_public?
         # get optional user auth stuff so that users can see their own
         # changesets if they're non-public
         setup_user_auth
       # our own changesets regardless of public-ness.
       unless u.data_public?
         # get optional user auth stuff so that users can see their own
         # changesets if they're non-public
         setup_user_auth

-        
+

         raise OSM::APINotFoundError if @user.nil? or @user.id != u.id
       end
       return changesets.where(:user_id => u.id)
         raise OSM::APINotFoundError if @user.nil? or @user.id != u.id
       end
       return changesets.where(:user_id => u.id)


@@ -378,14 +362,14 @@ private
 
   ##
   # restrict changes to those closed during a particular time period
 
   ##
   # restrict changes to those closed during a particular time period

-  def conditions_time(changesets, time) 
+  def conditions_time(changesets, time)

     unless time.nil?
     unless time.nil?

-      # if there is a range, i.e: comma separated, then the first is 
+      # if there is a range, i.e: comma separated, then the first is

       # low, second is high - same as with bounding boxes.
       if time.count(',') == 1
         # check that we actually have 2 elements in the array
         times = time.split(/,/)
       # low, second is high - same as with bounding boxes.
       if time.count(',') == 1
         # check that we actually have 2 elements in the array
         times = time.split(/,/)

-        raise OSM::APIBadUserInput.new("bad time range") if times.size != 2 
+        raise OSM::APIBadUserInput.new("bad time range") if times.size != 2

 
         from, to = times.collect { |t| DateTime.parse(t) }
         return changesets.where("closed_at >= ? and created_at <= ?", from, to)
 
         from, to = times.collect { |t| DateTime.parse(t) }
         return changesets.where("closed_at >= ? and created_at <= ?", from, to)


@@ -413,11 +397,11 @@ private
     if open.nil?
       return changesets
     else
     if open.nil?
       return changesets
     else

-      return changesets.where("closed_at >= ? and num_changes <= ?", 
+      return changesets.where("closed_at >= ? and num_changes <= ?",

                               Time.now.getutc, Changeset::MAX_ELEMENTS)
     end
   end
                               Time.now.getutc, Changeset::MAX_ELEMENTS)
     end
   end

-  
+

   ##
   # query changesets which are closed
   # ('closed at' time has passed or changes limit is hit)
   ##
   # query changesets which are closed
   # ('closed at' time has passed or changes limit is hit)


@@ -425,16 +409,30 @@ private
     if closed.nil?
       return changesets
     else
     if closed.nil?
       return changesets
     else

-      return changesets.where("closed_at < ? or num_changes > ?", 
+      return changesets.where("closed_at < ? or num_changes > ?",

                               Time.now.getutc, Changeset::MAX_ELEMENTS)
     end
   end
 
                               Time.now.getutc, Changeset::MAX_ELEMENTS)
     end
   end
 

+  ##
+  # query changesets by a list of ids
+  # (either specified as array or comma-separated string)
+  def conditions_ids(changesets, ids)
+    if ids.nil?
+      return changesets
+    elsif ids.empty?
+      raise OSM::APIBadUserInput.new("No changesets were given to search for")
+    else
+      ids = ids.split(',').collect { |n| n.to_i }
+      return changesets.where(:id => ids)
+    end
+  end
+

   ##
   # eliminate empty changesets (where the bbox has not been set)
   # this should be applied to all changeset list displays
   def conditions_nonempty(changesets)
     return changesets.where("num_changes > 0")
   end
   ##
   # eliminate empty changesets (where the bbox has not been set)
   # this should be applied to all changeset list displays
   def conditions_nonempty(changesets)
     return changesets.where("num_changes > 0")
   end

-  
+

 end
 end