GPX trace rails stuff
This commit is contained in:
parent
f98e6aac0a
commit
fb1467a944
9 changed files with 70 additions and 6 deletions
|
@ -1,2 +1,24 @@
|
|||
class TraceController < ApplicationController
|
||||
before_filter :authorize_web
|
||||
layout 'site'
|
||||
|
||||
def list
|
||||
@traces = Trace.find(:all)
|
||||
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
|
||||
@params['trace']['mime_type'] = @params['trace']['gpx_file'].content_type.chomp
|
||||
@params['trace'].delete('gpx_file') # let's remove the field from the hash, because there's no such field in the DB anyway.
|
||||
@trace = Trace.new(@params['trace'])
|
||||
@trace.inserted = false
|
||||
@trace.user_id = @user.id
|
||||
@trace.timestamp = Time.now
|
||||
if @trace.save
|
||||
flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
|
||||
end
|
||||
|
||||
redirect_to :action => 'mine'
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,4 +1,10 @@
|
|||
class Trace < ActiveRecord::Base
|
||||
set_table_name 'gpx_files'
|
||||
has_many :trace_points, :foreign_key => 'gpx_id'
|
||||
|
||||
has_many :old_nodes, :foreign_key => :id
|
||||
belongs_to :user
|
||||
|
||||
def tags=(bleh)
|
||||
|
||||
end
|
||||
end
|
||||
|
|
|
@ -35,11 +35,11 @@
|
|||
<% if @user %>
|
||||
<li><%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps' } %></li>
|
||||
<li><%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps' } %></li>
|
||||
<li><%= link_to 'GPS traces', {:controller => 'trace', :action => 'index'}, {:id => 'traceanchor', :title => 'manage traces' } %></li>
|
||||
<li><%= link_to 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces' } %></li>
|
||||
<% else %>
|
||||
<li><a id="viewanchor" href="/index.html" title="view maps">View</a></li>
|
||||
<li><a style="font-style:italic" href="/login.html" title="edit maps">Edit</a></li>
|
||||
<li><a href="/traces" title="manage traces">GPS traces</a></li>
|
||||
<li><%= link_to 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces'} %></li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -63,9 +63,6 @@
|
|||
</script>
|
||||
|
||||
</head>
|
||||
|
||||
|
||||
|
||||
|
||||
<% unless @user %>
|
||||
<div id="gads">
|
||||
|
|
1
app/views/trace/_trace.rhtml
Normal file
1
app/views/trace/_trace.rhtml
Normal file
|
@ -0,0 +1 @@
|
|||
bleh
|
6
app/views/trace/list.rhtml
Normal file
6
app/views/trace/list.rhtml
Normal file
|
@ -0,0 +1,6 @@
|
|||
<h1>Public GPS Traces</h1>
|
||||
<% if @user %>
|
||||
<%= link_to 'See just your traces', {:controller => 'trace', :action => 'mine'} %>
|
||||
<% end %>
|
||||
|
||||
<%= render :partial => 'trace', :collection => @traces %>
|
22
app/views/trace/mine.rhtml
Normal file
22
app/views/trace/mine.rhtml
Normal file
|
@ -0,0 +1,22 @@
|
|||
<h1>Your GPS Traces</h1>
|
||||
|
||||
<%= link_to 'see all traces', {:controller => 'trace', :action => 'list'} %><br /><br />
|
||||
|
||||
<% if @user %>
|
||||
<%= start_form_tag({:action => 'create'}, :multipart => true) %>
|
||||
<table>
|
||||
<table>
|
||||
<tr><td align="right">upload GPX file:</td><td><%= file_field('trace', 'gpx_file', {:size => 50, :maxlength => 255}) %></td></tr>
|
||||
<tr><td align="right">description:</td><td><%= text_field('trace', 'description', {:size => 50, :maxlength => 255}) %></td></tr>
|
||||
<tr><td align="right">tags:</td><td><%= text_field('trace', 'tags', {:size => 50, :maxlength => 255}) %></td></tr>
|
||||
<tr><td align="right">public?</td><td><%= check_box('trace', 'public', {:checked => 'checked'}) %></td></tr>
|
||||
<tr><td></td><td>
|
||||
<%= submit_tag 'Upload' %> | <a href="http://wiki.openstreetmap.org/index.php/Upload">help</a>
|
||||
</td></tr>
|
||||
</table>
|
||||
|
||||
<br>
|
||||
|
||||
<%= end_form_tag %>
|
||||
<% end %>
|
||||
|
|
@ -25,6 +25,10 @@ ActionController::Routing::Routes.draw do |map|
|
|||
map.connect '/logout.html', :controller => 'user', :action => 'logout'
|
||||
map.connect '/create-account.html', :controller => 'user', :action => 'new'
|
||||
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/user/:user_login/:id', :controller => 'trace', :action => 'user'
|
||||
|
||||
map.connect ':controller/:action/:id'
|
||||
end
|
||||
|
|
|
@ -15,3 +15,9 @@ alter table current_ways modify id bigint(64) not null auto_increment, add prima
|
|||
alter table current_way_tags change k k varchar(255) not null default '';
|
||||
alter table current_way_tags change v v varchar(255) not null default '';
|
||||
|
||||
alter table gpx_files add column data longblob;
|
||||
alter table gpx_files add column mime_type varchar(255);
|
||||
alter table gpx_files change private public boolean default 1 not null;
|
||||
update gpx_files set public = !public;
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue