Improve MIME type determination for trace files.

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index adf34684f09a6d08e43bf8bac3c54df85319c9fc..77b07ce3d53bd2b038bdae1eb736916b0e4c0c80 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -22,10 +22,11 @@ module OSM
       @clat = lat
       @clon = lon
       @degrees_per_pixel = degrees_per_pixel
       @clat = lat
       @clon = lon
       @degrees_per_pixel = degrees_per_pixel

+      @degrees_per_pixel = 0.0000000001 if @degrees_per_pixel < 0.0000000001

       @width = width
       @height = height
       @width = width
       @height = height

-      @dlon = width / 2 * degrees_per_pixel
-      @dlat = height / 2 * degrees_per_pixel  * cos(@clat * PI / 180)
+      @dlon = width / 2 * @degrees_per_pixel
+      @dlat = height / 2 * @degrees_per_pixel  * cos(@clat * PI / 180)

 
       @tx = xsheet(@clon - @dlon)
       @ty = ysheet(@clat - @dlat)
 
       @tx = xsheet(@clon - @dlon)
       @ty = ysheet(@clat - @dlat)


@@ -69,23 +70,23 @@ module OSM
 
     def initialize(filename)
       @filename = filename
 
     def initialize(filename)
       @filename = filename

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

     end
 
     def points
     end
 
     def points

-      file = File.new(@filename)
-      parser = REXML::Parsers::SAX2Parser.new( file )
+      @possible_points = 0
+      @actual_points = 0
+      @tracksegs = 0

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

-      date = Time.now();
+      date = DateTime.now();

       gotlatlon = false
       gotele = false
       gotdate = false
 
       gotlatlon = 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


@@ -100,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 = Time.parse(text)
-          gotdate = true
+          begin
+            date = DateTime.parse(text)
+            gotdate = true
+          rescue
+          end

         end
       end
 
         end
       end
 


@@ -114,17 +118,19 @@ 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

-            yield 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 get_picture(min_lat, min_lon, max_lat, max_lon, num_points)
       parser.parse
     end
 
     def get_picture(min_lat, min_lon, max_lat, max_lon, num_points)

+      #puts "getting picfor bbox #{min_lat},#{min_lon} - #{max_lat},#{max_lon}"

       frames = 10
       width = 250
       height = 250
       frames = 10
       width = 250
       height = 250


@@ -157,13 +163,14 @@ module OSM
           images[n].stroke_width(1)
           images[n].stroke('#BBBBBB')
           images[n].fill('#BBBBBB')
           images[n].stroke_width(1)
           images[n].stroke('#BBBBBB')
           images[n].fill('#BBBBBB')

+        #  puts "A #{px},#{py} - #{oldpx},#{oldpy}"

           images[n].line(px, py, oldpx, oldpy ) unless first
         end
         images[mm].stroke_width(3)
         images[mm].stroke('#000000')
         images[mm].fill('#000000')
         images[mm].line(px, py, oldpx, oldpy ) unless first
           images[n].line(px, py, oldpx, oldpy ) unless first
         end
         images[mm].stroke_width(3)
         images[mm].stroke('#000000')
         images[mm].fill('#000000')
         images[mm].line(px, py, oldpx, oldpy ) unless first

-
+      #  puts "B #{px},#{py} - #{oldpx},#{oldpy}"

         m +=1
         if m > num_points.to_f / frames.to_f * (mm+1)
           mm += 1
         m +=1
         if m > num_points.to_f / frames.to_f * (mm+1)
           mm += 1


@@ -193,6 +200,7 @@ module OSM
     end
 
     def get_icon(min_lat, min_lon, max_lat, max_lon)
     end
 
     def get_icon(min_lat, min_lon, max_lat, max_lon)

+      #puts "getting icon for bbox #{min_lat},#{min_lon} - #{max_lat},#{max_lon}"

       width = 50
       height = 50
       rat= Math.cos( ((max_lat + min_lat)/2.0) /  180.0 * 3.141592)
       width = 50
       height = 50
       rat= Math.cos( ((max_lat + min_lat)/2.0) /  180.0 * 3.141592)


@@ -216,6 +224,7 @@ module OSM
         px = proj.x(p['longitude'])
         py = proj.y(p['latitude'])
         gc.line(px, py, oldpx, oldpy ) unless first
         px = proj.x(p['longitude'])
         py = proj.y(p['latitude'])
         gc.line(px, py, oldpx, oldpy ) unless first

+       # puts "C #{px},#{py} - #{oldpx},#{oldpy}"

         first = false
         oldpy = py
         oldpx = px
         first = false
         oldpy = py
         oldpx = px


@@ -234,8 +243,36 @@ module OSM
 
   end
 
 
   end
 

+  class GreatCircle
+    include Math
+
+    # initialise with a base position
+    def initialize(lat, lon)
+      @lat = lat * PI / 180
+      @lon = lon * PI / 180
+    end
+
+    # get the distance from the base position to a given position
+    def distance(lat, lon)
+      lat = lat * PI / 180
+      lon = lon * PI / 180
+      return 6372.795 * 2 * asin(sqrt(sin((lat - @lat) / 2) ** 2 + cos(@lat) * cos(lat) * sin((lon - @lon)/2) ** 2))
+    end
+
+    # get the worst case bounds for a given radius from the base position
+    def bounds(radius)
+      latradius = 2 * asin(sqrt(sin(radius / 6372.795 / 2) ** 2))
+      lonradius = 2 * asin(sqrt(sin(radius / 6372.795 / 2) ** 2 / cos(@lat) ** 2))
+      minlat = (@lat - latradius) * 180 / PI
+      maxlat = (@lat + latradius) * 180 / PI
+      minlon = (@lon - lonradius) * 180 / PI
+      maxlon = (@lon + lonradius) * 180 / PI
+      return { :minlat => minlat, :maxlat => maxlat, :minlon => minlon, :maxlon => maxlon }
+    end
+  end
+

   class GeoRSS
   class GeoRSS

-    def initialize(description='OpenStreetMap GPS Traces')
+    def initialize(feed_title='OpenStreetMap GPS Traces', feed_description='OpenStreetMap GPS Traces', feed_url='http://www.openstreetmap.org/traces/')

       @doc = XML::Document.new
       @doc.encoding = 'UTF-8' 
       
       @doc = XML::Document.new
       @doc.encoding = 'UTF-8' 
       


@@ -246,14 +283,14 @@ module OSM
       @channel = XML::Node.new 'channel'
       rss << @channel
       title = XML::Node.new 'title'
       @channel = XML::Node.new 'channel'
       rss << @channel
       title = XML::Node.new 'title'

-      title <<  'OpenStreetMap GPS Traces'
+      title <<  feed_title

       @channel << title
       description_el = XML::Node.new 'description'
       @channel << description_el
 
       @channel << title
       description_el = XML::Node.new 'description'
       @channel << description_el
 

-      description_el << description
+      description_el << feed_description

       link = XML::Node.new 'link'
       link = XML::Node.new 'link'

-      link << 'http://www.openstreetmap.org/traces/'
+      link << feed_url

       @channel << link
       image = XML::Node.new 'image'
       @channel << image
       @channel << link
       image = XML::Node.new 'image'
       @channel << image


@@ -270,11 +307,11 @@ module OSM
       height << '100'
       image << height
       link = XML::Node.new 'link'
       height << '100'
       image << height
       link = XML::Node.new 'link'

-      link << 'http://www.openstreetmap.org/traces/'
+      link << feed_url

       image << link
     end
 
       image << link
     end
 

-    def add(latitude=0, longitude=0, title_text='dummy title', url='http://www.example.com/', description_text='dummy description', timestamp=Time.now)
+    def add(latitude=0, longitude=0, title_text='dummy title', url='http://www.example.com/', description_text='dummy description', timestamp=DateTime.now)

       item = XML::Node.new 'item'
 
       title = XML::Node.new 'title'
       item = XML::Node.new 'item'
 
       title = XML::Node.new 'title'


@@ -284,21 +321,29 @@ module OSM
       link << url
       item << link
 
       link << url
       item << link
 

+      guid = XML::Node.new 'guid'
+      guid << url
+      item << guid
+

       description = XML::Node.new 'description'
       description << description_text
       item << description
 
       pubDate = XML::Node.new 'pubDate'
       description = XML::Node.new 'description'
       description << description_text
       item << description
 
       pubDate = XML::Node.new 'pubDate'

-      pubDate << timestamp.xmlschema
+      pubDate << timestamp.to_s(:rfc822)

       item << pubDate
 
       item << pubDate
 

-      lat_el = XML::Node.new 'geo:lat'
-      lat_el << latitude.to_s
-      item << lat_el
+      if latitude
+        lat_el = XML::Node.new 'geo:lat'
+        lat_el << latitude.to_s
+        item << lat_el
+      end

 
 

-      lon_el = XML::Node.new 'geo:lon'
-      lon_el << longitude.to_s
-      item << lon_el
+      if longitude
+        lon_el = XML::Node.new 'geo:long'
+        lon_el << longitude.to_s
+        item << lon_el
+      end

 
       @channel << item
     end
 
       @channel << item
     end