basey =params['basey'].to_f
masterscale =params['masterscale'].to_f
- xmin=params['xmin'].to_f/0.0000001
- xmax=params['xmax'].to_f/0.0000001
- ymin=params['ymin'].to_f/0.0000001
- ymax=params['ymax'].to_f/0.0000001
+ xmin=params['xmin'].to_f/0.000001
+ xmax=params['xmax'].to_f/0.000001
+ ymin=params['ymin'].to_f/0.000001
+ ymax=params['ymax'].to_f/0.000001
# - Begin movie
if params['token']
token=sqlescape(params['token'])
- sql="SELECT gps_points.latitude*0.0000001 AS lat,gps_points.longitude*0.0000001 AS lon,gpx_files.id AS fileid,UNIX_TIMESTAMP(gps_points.timestamp) AS ts "+
+ sql="SELECT gps_points.latitude*0.000001 AS lat,gps_points.longitude*0.000001 AS lon,gpx_files.id AS fileid,UNIX_TIMESTAMP(gps_points.timestamp) AS ts "+
" FROM gpx_files,gps_points,users "+
"WHERE gpx_files.id=gpx_id "+
" AND gpx_files.user_id=users.id "+
" AND token='#{token}' "+
" AND (gps_points.longitude BETWEEN #{xmin} AND #{xmax}) "+
" AND (gps_points.latitude BETWEEN #{ymin} AND #{ymax}) "+
+ " AND (gps_points.timestamp IS NOT NULL) "+
"ORDER BY fileid DESC,ts "+
"LIMIT 10000"
else
- sql="SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,gpx_id AS fileid,UNIX_TIMESTAMP(timestamp) AS ts "+
+ sql="SELECT latitude*0.000001 AS lat,longitude*0.000001 AS lon,gpx_id AS fileid,UNIX_TIMESTAMP(timestamp) AS ts "+
" FROM gps_points "+
"WHERE (longitude BETWEEN #{xmin} AND #{xmax}) "+
" AND (latitude BETWEEN #{ymin} AND #{ymax}) "+
+ " AND (gps_points.timestamp IS NOT NULL) "+
"ORDER BY fileid DESC,ts "+
"LIMIT 10000"
end
-<!-- <p>This editor isn't working yet - currently you can only browse the aerial photos.
-See <a href="http://trac.openstreetmap.org/ticket/402">Trac #402</a> for more details.
-You may also want to look at <a href="http://josm.eigenheimstrasse.de/">JOSM</a> for a
-fully functional desktop client editor for OpenStreetMap.</p> -->
-
<div id="mapcontent">You need a Flash player to use Potlatch, the
OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>.
<% end %>
<span class="rsssmall"><a href="<%= url_for :controller => 'trace', :action => 'georss' %>"><img src="/images/RSS.gif" border="0"></a></span> |
<% if @user %>
- <%= link_to 'See just your traces', {:controller => 'trace', :action => 'mine'} %>
+ <%= link_to 'See just your traces, or upload a trace', {:controller => 'trace', :action => 'mine'} %>
<% else %>
- <%= link_to 'login', {:controller => 'user', :action => 'login', :next_controller => 'traces', :next_action => 'mine'} %> to see just your traces
+ <%= link_to 'login', {:controller => 'user', :action => 'login', :next_controller => 'traces', :next_action => 'mine'} %> to upload a trace or see yours alone
<% end %>
<% if @tag %>
| <%= link_to 'See all traces', {:controller => 'trace', :action => 'list'} %>