TomH's patches

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 52aeff3cbe4c79db9e1539d0772ba72a8f24ed0c..328148fe18daf712f478e7372bd1cf7caeaf5640 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -7,7 +7,7 @@ class ApplicationController < ActionController::Base
   end
 
   def require_user
-    redirect_to :controller => 'user', :action => 'login' unless @user
+    redirect_to :controller => 'user', :action => 'login', :next_controller => controller_name, :next_action => action_name unless @user
   end
 
   def authorize(realm='Web Password', errormessage="Couldn't authenticate you") 

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index afa2722a1f99ab82782eb2610468dd0e49d0bb09..f8e2a5761d58575189b74c36b72af987ea44ef9c 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -1,12 +1,12 @@
 class DiaryEntryController < ApplicationController
   layout 'site'
   
-  before_filter :authorize_web, :only => [:new]
+  before_filter :authorize_web
   before_filter :require_user, :only => [:new]
 
   def new
     if params[:diary_entry]     
-      @entry = DiaryEntry.new(@params[:diary_entry])
+      @entry = DiaryEntry.new(params[:diary_entry])
       @entry.user = @user
       if @entry.save 
         redirect_to :controller => 'user', :action => 'diary', :display_name => @user.display_name 

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index cf1a176f1f6be64b081f66fbc3d30c446fb02986..fd8fff4dcee1b6375553345059a14b361caae298 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -97,7 +97,11 @@ class UserController < ApplicationController
         u.timeout = 1.day.from_now
         u.save
         session[:token] = u.token
-        redirect_to :controller => 'site', :action => 'index'
+        if params[:next_controller] and params[:next_action]
+          redirect_to :controller => params[:next_controller], :action => params[:next_action]
+        else
+          redirect_to :controller => 'site', :action => 'index'
+        end
         return
       else
         flash[:notice] = "Couldn't log in with those details"
@@ -115,7 +119,11 @@ class UserController < ApplicationController
       end
     end
     session[:token] = nil
-    redirect_to :controller => 'site', :action => 'index'
+    if params[:next_controller] and params[:next_action]
+      redirect_to :controller => params[:next_controller], :action => params[:next_action]
+    else
+      redirect_to :controller => 'site', :action => 'index'
+    end
   end
 
   def confirm

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 8d2ac722ecfec3618df7f7ef1319a7622c1ead26..f42048b882c3269c8f432b6a2c6809d167f4f882 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -26,9 +26,9 @@
     <span id="greeting">
       <% if @user %>
         Welcome, <%= link_to @user.display_name, {:controller => 'user', :action => 'view', :display_name => @user.display_name}, {:id => 'loginanchor'}%> |
-        <%= link_to 'logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%>
+        <%= link_to 'logout', {:controller => 'user', :action => 'logout', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%>
       <% else %>
-        <%= link_to 'log in', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> |
+        <%= link_to 'log in', {:controller => 'user', :action => 'login', :next_controller => @controller.controller_name, :next_action => @controller.action_name}, {:id => 'loginanchor'}%> |
         <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
       <% end %>
     </span>

diff --git a/app/views/trace/list.rhtml b/app/views/trace/list.rhtml
index 4ca59dabecbd9c3d81c585fcf171f0191e65ffbb..48d5e21c7d70772978df9b98b89fa3b030247cf8 100644 (file)
--- a/app/views/trace/list.rhtml
+++ b/app/views/trace/list.rhtml
@@ -8,7 +8,7 @@
 <% if @user %>
   <%= link_to 'See just your traces', {:controller => 'trace', :action => 'mine'} %>
 <% else %>
-  <%= link_to 'login', {:controller => 'user', :action => 'login'} %> to see just your traces
+  <%= link_to 'login', {:controller => 'user', :action => 'login', :next_controller => 'traces', :next_action => 'mine'} %> to see just your traces
 <% end %>
 <% if @tag %>
  | <%= link_to 'See all traces', {:controller => 'trace', :action => 'list'} %>

diff --git a/config/routes.rb b/config/routes.rb
index 2420de1ca1ee5d2dfada78f52bd9d18635635157..8f1dc9230188d43248631e3656747faff4d0588a 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -45,6 +45,8 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/user/confirm', :controller => 'user', :action => 'confirm'
   map.connect '/user/go_public', :controller => 'user', :action => 'go_public'
   map.connect '/user/reset_password', :controller => 'user', :action => 'reset_password'
+  map.connect '/user/login/:next_controller/:next_action', :controller => 'user', :action => 'login'
+  map.connect '/user/logout/:next_controller/:next_action', :controller => 'user', :action => 'logout'
   map.connect '/index.html', :controller => 'site', :action => 'index'
   map.connect '/edit.html', :controller => 'site', :action => 'edit'
   map.connect '/search.html', :controller => 'way_tag', :action => 'search'

diff --git a/lib/osm.rb b/lib/osm.rb
index 9e2ab04ada1cc752c39f739d5763a40a5d7b271a..6c3cf07c48f654cfac4b347e52871d2bdaa8a98b 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -68,14 +68,12 @@ module OSM
     attr_reader :tracksegs
 
     def initialize(filename)
-      @filename = filename
       @possible_points = 0
       @actual_points = 0
       @tracksegs = 0
-    end
+      @points = []
 
-    def points
-      file = File.new(@filename)
+      file = File.new(filename)
       parser = REXML::Parsers::SAX2Parser.new( file )
 
       lat = -1
@@ -114,7 +112,7 @@ module OSM
           ele = '0' unless gotele
           if lat < 90 && lat > -90 && lon > -180 && lon < 180
             @actual_points += 1
-            yield Hash['latitude' => lat,'longitude' => lon,'timestamp' => date,'altitude' => ele,'segment' => @tracksegs]
+            @points.push(Hash['latitude' => lat,'longitude' => lon,'timestamp' => date,'altitude' => ele,'segment' => @tracksegs])
           end
         end
         gotlatlon = false
@@ -124,6 +122,10 @@ module OSM
       parser.parse
     end
 
+    def points
+      @points.each { |p| yield p }
+    end
+
     def get_picture(min_lat, min_lon, max_lat, max_lon, num_points)
       #puts "getting picfor bbox #{min_lat},#{min_lon} - #{max_lat},#{max_lon}"
       frames = 10