From: Steve Coast <steve@asklater.com>
Date: Fri, 1 Dec 2006 14:10:02 +0000 (+0000)
Subject: various gpx bits
X-Git-Tag: live~8567
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ece8999dcdfa84f146aa7ad39071b48260b0d7fe?hp=fcd37587f2a1343e59139926ef6c00d3fb04002c

various gpx bits
---

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 0b39d52ce..337f27e0e 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -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
 
diff --git a/app/controllers/trace_points_controller.rb b/app/controllers/trace_points_controller.rb
deleted file mode 100644
index be34cd282..000000000
--- a/app/controllers/trace_points_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class TracePointsController < ApplicationController
-end
diff --git a/app/models/trace.rb b/app/models/trace.rb
index 451067b21..014db4ae2 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -4,6 +4,8 @@ class Trace < ActiveRecord::Base
   belongs_to :user
 
   def tags=(bleh)
+  end
 
+  def mime_type=(bleh)
   end
 end
diff --git a/app/models/trace_points.rb b/app/models/trace_points.rb
deleted file mode 100644
index 56703a29e..000000000
--- a/app/models/trace_points.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class TracePoints < ActiveRecord::Base
-  set_table_name 'gps_points'
-  belongs_to :trace, :foreign_key => 'gpx_id'
-end
diff --git a/db/migrate.sql b/db/migrate.sql
index 4638ba5a1..0bf3c3a90 100644
--- a/db/migrate.sql
+++ b/db/migrate.sql
@@ -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;
 
-