Update to iD v1.3.6

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 1757e771a9fc085a5c85c8b8c7906d5ebdf56aad..779ea1a885dbbfd58064c772ed026c6be3ab6bdf 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -42,7 +42,7 @@ class SiteController < ApplicationController
 
     if editor == "remote"
       require_oauth
 
     if editor == "remote"
       require_oauth

-      render :action => :index
+      render :action => :index, :layout => map_layout

       return
     end
 
       return
     end
 


@@ -50,18 +50,22 @@ class SiteController < ApplicationController
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon

+      @zoom = 18

     elsif params[:way]
       bbox = Way.find(params[:way]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon
     elsif params[:way]
       bbox = Way.find(params[:way]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon

+      @zoom = 17

     elsif params[:note]
       note = Note.find(params[:note])
       @lat = note.lat
       @lon = note.lon
     elsif params[:note]
       note = Note.find(params[:note])
       @lat = note.lat
       @lon = note.lon

+      @zoom = 17

     elsif params[:gpx]
       trace = Trace.visible_to(@user).find(params[:gpx])
       @lat = trace.latitude
       @lon = trace.longitude
     elsif params[:gpx]
       trace = Trace.visible_to(@user).find(params[:gpx])
       @lat = trace.latitude
       @lon = trace.longitude

+      @zoom = 16

     end
   end
 
     end
   end
 


@@ -78,6 +82,12 @@ class SiteController < ApplicationController
   def about
   end
 
   def about
   end
 

+  def export
+  end
+
+  def offline
+  end
+

   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end


@@ -97,6 +107,8 @@ class SiteController < ApplicationController
       redirect_to relation_path(params[:relation])
     elsif params[:note]
       redirect_to browse_note_path(params[:note])
       redirect_to relation_path(params[:relation])
     elsif params[:note]
       redirect_to browse_note_path(params[:note])

+    elsif params[:query]
+      redirect_to search_path(:query => params[:query])

     end
   end
 
     end
   end