various gpx bits
This commit is contained in:
parent
fcd37587f2
commit
ece8999dcd
5 changed files with 9 additions and 11 deletions
|
@ -11,15 +11,20 @@ class TraceController < ApplicationController
|
|||
end
|
||||
|
||||
def create
|
||||
filename = "/tmp/#{rand}"
|
||||
|
||||
File.open(filename, "w") { |f| f.write(@params['trace']['gpx_file'].read) }
|
||||
@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']['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
|
||||
logger.info("id is #{@trace.id}")
|
||||
`mv #{filename} /tmp/#{@trace.id}.gpx`
|
||||
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
|
||||
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
class TracePointsController < ApplicationController
|
||||
end
|
|
@ -4,6 +4,8 @@ class Trace < ActiveRecord::Base
|
|||
belongs_to :user
|
||||
|
||||
def tags=(bleh)
|
||||
end
|
||||
|
||||
def mime_type=(bleh)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
class TracePoints < ActiveRecord::Base
|
||||
set_table_name 'gps_points'
|
||||
belongs_to :trace, :foreign_key => 'gpx_id'
|
||||
end
|
|
@ -15,9 +15,6 @@ 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
Add a link
Reference in a new issue