X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3ca642271aac133eb3f0b32e9c5d096e61479cbe..33a6b79bd78f1903011367f6a5adf2f91d160f74:/app/controllers/site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 7c8ee32b3..4945aaa4f 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -36,7 +36,7 @@ class SiteController < ApplicationController
   end
 
   def edit
-    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
+    editor = preferred_editor
 
     if editor == "remote"
       render :action => :index
@@ -53,6 +53,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
@@ -67,6 +71,9 @@ class SiteController < ApplicationController
   def welcome
   end
 
+  def help
+  end
+
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end