X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/56fd5c4d90c7d3757fb97ff16c40aaa307ae1d22..1557f9cf8973abf4af50de95b4f995a59b601cea:/app/controllers/site_controller.rb?ds=sidebyside

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 7c8ee32b3..cea37fbf3 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -36,9 +36,10 @@ class SiteController < ApplicationController
   end
 
   def edit
-    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
+    editor = preferred_editor
 
     if editor == "remote"
+      require_oauth
       render :action => :index
       return
     end
@@ -53,6 +54,10 @@ class SiteController < ApplicationController
       bbox = Way.find(params[:way]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon
+    elsif params[:note]
+      note = Note.find(params[:note])
+      @lat = note.lat
+      @lon = note.lon
     elsif params[:gpx]
       trace = Trace.visible_to(@user).find(params[:gpx])
       @lat = trace.latitude