Don't preload the nodes as it seems to break the ordering

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 1757e771a9fc085a5c85c8b8c7906d5ebdf56aad..df11a275aeae34eae7516b3ed91f3720d6ea53c7 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -6,7 +6,7 @@ class SiteController < ApplicationController
   before_filter :set_locale
   before_filter :redirect_browse_params, :only => :index
   before_filter :redirect_map_params, :only => [:index, :edit, :export]
   before_filter :set_locale
   before_filter :redirect_browse_params, :only => :index
   before_filter :redirect_map_params, :only => [:index, :edit, :export]

-  before_filter :require_user, :only => [:edit, :welcome]
+  before_filter :require_user, :only => [:welcome]

   before_filter :require_oauth, :only => [:index]
 
   def index
   before_filter :require_oauth, :only => [:index]
 
   def index


@@ -17,7 +17,7 @@ class SiteController < ApplicationController
 
   def permalink
     lon, lat, zoom = ShortLink::decode(params[:code])
 
   def permalink
     lon, lat, zoom = ShortLink::decode(params[:code])

-    new_params = params.except(:code, :lon, :lat, :zoom)
+    new_params = params.except(:code, :lon, :lat, :zoom, :layers, :node, :way, :relation, :changeset)

 
     if new_params.has_key? :m
       new_params.delete :m
 
     if new_params.has_key? :m
       new_params.delete :m


@@ -25,10 +25,33 @@ class SiteController < ApplicationController
       new_params[:mlon] = lon
     end
 
       new_params[:mlon] = lon
     end
 

-    new_params[:controller] = 'site'
-    new_params[:action] = 'index'
+    if params.has_key? :node
+      new_params[:controller] = 'browse'
+      new_params[:action] = 'node'
+      new_params[:id] = params[:node]
+    elsif params.has_key? :way
+      new_params[:controller] = 'browse'
+      new_params[:action] = 'way'
+      new_params[:id] = params[:way]
+    elsif params.has_key? :relation
+      new_params[:controller] = 'browse'
+      new_params[:action] = 'relation'
+      new_params[:id] = params[:relation]
+    elsif params.has_key? :changeset
+      new_params[:controller] = 'browse'
+      new_params[:action] = 'changeset'
+      new_params[:id] = params[:changeset]
+    else
+      new_params[:controller] = 'site'
+      new_params[:action] = 'index'
+    end
+

     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
 
     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
 

+    if params.has_key? :layers
+      new_params[:anchor] += "&layers=#{params[:layers]}"
+    end
+

     redirect_to new_params
   end
 
     redirect_to new_params
   end
 


@@ -42,26 +65,32 @@ class SiteController < ApplicationController
 
     if editor == "remote"
       require_oauth
 
     if editor == "remote"
       require_oauth

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

       return
       return

+    else
+      require_user

     end
 
     if params[:node]
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon
     end
 
     if params[:node]
       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 +107,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 +132,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