Latest Potlatch, plus TomH's GPX fix

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 0e5b2e44247de6c16c857cd249621bc14a66d23f..4c4392b4e733751fc61035aec253574a7176a4fb 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -18,10 +18,10 @@ class SwfController < ApplicationController
                basey           =params['basey'].to_f
                masterscale     =params['masterscale'].to_f
        
                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
        
        
                # -     Begin movie
        


@@ -45,20 +45,22 @@ class SwfController < ApplicationController
        
                if params['token']
                        token=sqlescape(params['token'])
        
                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}) "+
                                 " 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
                                 "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}) "+
                                 " 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
                                 "ORDER BY fileid DESC,ts "+
                                 "LIMIT 10000"
                end

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 0307b5f653eac11a6563c7b21b5fa7ceae23a36a..de9bda661f10c0034bd3444e99465064c5cf9a1d 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -110,6 +110,7 @@ class Trace < ActiveRecord::Base
         tp.lat = point['latitude'].to_f
         tp.lng = point['longitude'].to_f
         tp.altitude = point['altitude'].to_f
         tp.lat = point['latitude'].to_f
         tp.lng = point['longitude'].to_f
         tp.altitude = point['altitude'].to_f

+        tp.timestamp = point['timestamp']

         tp.user_id = user.id
         tp.gpx_id = id
         tp.trackid = point['segment'].to_i
         tp.user_id = user.id
         tp.gpx_id = id
         tp.trackid = point['segment'].to_i

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index c93927ae300430535886626e57f4df1094524b7d..f6145d67656e3531257667e2476c3ddd49138edd 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -1,8 +1,3 @@
-<!-- <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>.
 
 <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>.
 

diff --git a/app/views/trace/list.rhtml b/app/views/trace/list.rhtml
index 48d5e21c7d70772978df9b98b89fa3b030247cf8..327c68ed6a5c397c49f95a8e0cfc3a8bd77fbc14 100644 (file)
--- a/app/views/trace/list.rhtml
+++ b/app/views/trace/list.rhtml
@@ -6,9 +6,9 @@
 <% end %>
 <span class="rsssmall"><a href="<%= url_for :controller => 'trace', :action => 'georss' %>"><img src="/images/RSS.gif" border="0"></a></span> | 
 <% if @user %>
 <% 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 %>
 <% 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'} %>
 <% end %>
 <% if @tag %>
  | <%= link_to 'See all traces', {:controller => 'trace', :action => 'list'} %>

diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 0e003a7654fbbd2f866166c3302b8af382688afd..603aec4633a64abd21d7ef96a1813cd22fddfdc5 100755 (executable)
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ