cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

The test train rolls ever onwards...

Browse source
This commit is contained in:
Tom Hughes 2015-03-01 17:04:39 +00:00
parent 66efc5f1ec
commit fd588cd715
25 changed files with 362 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/trace_controller.rb
View file

@ -117,7 +117,6 @@ class TraceController < ApplicationController
end
if @trace.id
logger.info("id is #{@trace.id}")
flash[:notice] = t "trace.create.trace_uploaded"
if @user.traces.where(:inserted => false).count > 4
@ -219,7 +218,7 @@ class TraceController < ApplicationController
def picture
trace = Trace.find(params[:id])
if trace.inserted?
if trace.visible? && trace.inserted?
if trace.public? || (@user && @user == trace.user)
expires_in 7.days, :private => !trace.public?, :public => trace.public?
send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline")
@ -236,7 +235,7 @@ class TraceController < ApplicationController
def icon
trace = Trace.find(params[:id])
if trace.inserted?
if trace.visible? && trace.inserted?
if trace.public? || (@user && @user == trace.user)
expires_in 7.days, :private => !trace.public?, :public => trace.public?
send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline")
@ -295,11 +294,13 @@ class TraceController < ApplicationController
end
def api_data
trace = Trace.find(params[:id])
trace = Trace.visible.find(params[:id])
if trace.public? || trace.user == @user
if request.format == Mime::XML || request.format == Mime::GPX
if request.format == Mime::XML
send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
elsif request.format == Mime::GPX
send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment")
else
send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
end

3
app/models/trace.rb
View file

@ -70,16 +70,13 @@ class Trace < ActiveRecord::Base
def large_picture
f = File.new(large_picture_name, "rb")
logger.info "large picture file: '#{f.path}', bytes: #{File.size(f.path)}"
data = f.sysread(File.size(f.path))
logger.info "have read data, bytes: '#{data.length}'"
f.close
data
end
def icon_picture
f = File.new(icon_picture_name, "rb")
logger.info "icon picture file: '#{f.path}'"
data = f.sysread(File.size(f.path))
f.close
data