trace stuff in rails port

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 1c1b968d6fd6f8bc140f98dc4883861a27ce0dc8..0b39d52ce8b8def2d51b00494bfa4bb054309ac5 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -6,6 +6,10 @@ class TraceController < ApplicationController
     @traces = Trace.find(:all)
   end
 
+  def mine
+    @traces = Trace.find(:all, :conditions => ['user_id = ?', @user.id])
+  end
+
   def create
     @params['trace']['name'] = @params['trace']['gpx_file'].original_filename.gsub(/[^a-zA-Z0-9.]/, '_') # This makes sure filenames are sane
     @params['trace']['data'] = @params['trace']['gpx_file'].read

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 0c3caa90c8e7bc8b08bc76dbdfda3ea92e9dc254..451067b21fe53255507ebcc1093b7afb74019a39 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -1,7 +1,6 @@
 class Trace < ActiveRecord::Base
   set_table_name 'gpx_files'
 
-  has_many :old_nodes, :foreign_key => :id
   belongs_to :user
 
   def tags=(bleh)

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 1dfeea792cf442dcecf9e7749d07e74bdb37d6a0..42f428a62a85a41c9ebe0ab23dd997738f3079d8 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -7,13 +7,12 @@
     archive="OSMApplet.jar, commons-codec-1.3.jar, core.jar, commons-logging.jar, commons-httpclient-3.0-rc3.jar, MinML2.jar, plugin.jar, thinlet.jar"
     width="700"
     height="500"
-    MAYSCRIPT="true"
-    >
-    <param name="clat" value="51.2571016392693">
-    <param name="clon" value="-0.219934772136611">
-    <param name="zoom" value="15">
+    MAYSCRIPT="true" >
+    <param name="clat" value="<%= params['lat'] %>">
+    <param name="clon" value="<%= params['lon'] %>">
+    <param name="zoom" value="<%= params['zoom'] %>">
     <param name="user" value="token">
-    <param name="pass" value="TntWIq03F8lqCF9JhOrTyZ0Y0lrQ9r">
+    <param name="pass" value="<%= @user.token %>">
     <param name="wmsurl" value="http://www.openstreetmap.org/tile/0.2/gpx?;http://www.openstreetmap.org/api/wms/0.2/landsat/?request=GetMap&layers=modis,global_mosaic&styles=&srs=EPSG:4326&FORMAT=image/jpeg">
     <param name="apiurl" value="http://www.openstreetmap.org/api/0.3/">
     Your browser needs to support Java to edit maps.<br>

diff --git a/app/views/trace/mine.rhtml b/app/views/trace/mine.rhtml
index 41aa0bc1eb09a0b96da419ca01d6fa8d7fece796..d651d1e8b66bf80893ea51ff0ad46c0e1576a720 100644 (file)
--- a/app/views/trace/mine.rhtml
+++ b/app/views/trace/mine.rhtml
@@ -18,5 +18,17 @@
 <br>
 
 <%= end_form_tag %> 
+
+<table id="keyvalue" cellpadding="3">
+  <tr>
+    <th></th>
+    <th></th>
+  </tr>
+  <%= render :partial => 'trace', :collection => @traces %>
+</table>
+
 <% end %>
 
+
+
+

diff --git a/config/routes.rb b/config/routes.rb
index d6ac734682bc61aaa4eb92165a9b60a38c9cef29..3f4b9904efb2f6a8388e6a48414bc3460b3ea54e 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -27,7 +27,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/forgot-password.html', :controller => 'user', :action => 'lost_password'
   
   map.connect '/traces', :controller => 'trace', :action => 'list'
-  map.connect '/traces/mine', :controller => 'trace', :action => 'users'
+  map.connect '/traces/mine', :controller => 'trace', :action => 'mine'
   map.connect '/traces/user/:user/:id', :controller => 'trace', :action => 'list', :id => nil
 
   map.connect ':controller/:action/:id'