Show an edit link on the trace details page, and use the same zoom level

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index ae8e70896a7d3c7a775a05cc7b637527b9ca17b9..77b07ce3d53bd2b038bdae1eb736916b0e4c0c80 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -69,13 +69,13 @@ module OSM
     attr_reader :tracksegs
 
     def initialize(filename)
     attr_reader :tracksegs
 
     def initialize(filename)

+      @filename = filename
+    end
+
+    def points

       @possible_points = 0
       @actual_points = 0
       @tracksegs = 0
       @possible_points = 0
       @actual_points = 0
       @tracksegs = 0

-      @points = []
-
-      file = File.new(filename)
-      parser = REXML::Parsers::SAX2Parser.new( file )

 
       lat = -1
       lon = -1
 
       lat = -1
       lon = -1


@@ -85,6 +85,8 @@ module OSM
       gotele = false
       gotdate = false
 
       gotele = false
       gotdate = false
 

+      parser = REXML::Parsers::SAX2Parser.new(File.new(@filename))
+

       parser.listen( :start_element,  %w{ trkpt }) do |uri,localname,qname,attributes| 
         lat = attributes['lat'].to_f
         lon = attributes['lon'].to_f
       parser.listen( :start_element,  %w{ trkpt }) do |uri,localname,qname,attributes| 
         lat = attributes['lat'].to_f
         lon = attributes['lon'].to_f


@@ -99,8 +101,11 @@ module OSM
 
       parser.listen( :characters, %w{ time } ) do |text|
         if text && text != ''
 
       parser.listen( :characters, %w{ time } ) do |text|
         if text && text != ''

-          date = DateTime.parse(text)
-          gotdate = true
+          begin
+            date = DateTime.parse(text)
+            gotdate = true
+          rescue
+          end

         end
       end
 
         end
       end
 


@@ -113,18 +118,15 @@ module OSM
           ele = '0' unless gotele
           if lat < 90 && lat > -90 && lon > -180 && lon < 180
             @actual_points += 1
           ele = '0' unless gotele
           if lat < 90 && lat > -90 && lon > -180 && lon < 180
             @actual_points += 1

-            @points.push(Hash['latitude' => lat,'longitude' => lon,'timestamp' => date,'altitude' => ele,'segment' => @tracksegs])
+            yield Hash['latitude' => lat, 'longitude' => lon, 'timestamp' => date, 'altitude' => ele, 'segment' => @tracksegs]

           end
         end
         gotlatlon = false
         gotele = false
         gotdate = false
       end
           end
         end
         gotlatlon = false
         gotele = false
         gotdate = false
       end

-      parser.parse
-    end

 
 

-    def points
-      @points.each { |p| yield p }
+      parser.parse

     end
 
     def get_picture(min_lat, min_lon, max_lat, max_lon, num_points)
     end
 
     def get_picture(min_lat, min_lon, max_lat, max_lon, num_points)