Improve handling of login/logout some more to improve the chances of

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index f9f77d1b53afc9d3afee19115148a4ff5c2b8f71..7f1f4d101b5072e40502573b79a8a68dbc0f8f6b 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -11,6 +11,7 @@ module OSM
   require 'time'
   require 'rexml/parsers/sax2parser'
   require 'rexml/text'
+  require 'xml/libxml'
   require 'RMagick'
 
   class Mercator
@@ -61,19 +62,18 @@ module OSM
 
 
   class GPXImporter
+    # FIXME swap REXML for libXML
     attr_reader :possible_points
     attr_reader :actual_points
     attr_reader :tracksegs
 
     def initialize(filename)
-      @filename = filename
       @possible_points = 0
       @actual_points = 0
       @tracksegs = 0
-    end
+      @points = []
 
-    def points
-      file = File.new(@filename)
+      file = File.new(filename)
       parser = REXML::Parsers::SAX2Parser.new( file )
 
       lat = -1
@@ -112,7 +112,7 @@ module OSM
           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]
+            @points.push(Hash['latitude' => lat,'longitude' => lon,'timestamp' => date,'altitude' => ele,'segment' => @tracksegs])
           end
         end
         gotlatlon = false
@@ -122,7 +122,12 @@ module OSM
       parser.parse
     end
 
+    def points
+      @points.each { |p| yield p }
+    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
@@ -155,13 +160,14 @@ module OSM
           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
-
+      #  puts "B #{px},#{py} - #{oldpx},#{oldpy}"
         m +=1
         if m > num_points.to_f / frames.to_f * (mm+1)
           mm += 1
@@ -191,6 +197,7 @@ module OSM
     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)
@@ -214,6 +221,7 @@ module OSM
         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
@@ -231,4 +239,94 @@ module OSM
     end
 
   end
+
+  class GeoRSS
+    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' 
+      
+      rss = XML::Node.new 'rss'
+      @doc.root = rss
+      rss['version'] = "2.0"
+      rss['xmlns:geo'] = "http://www.w3.org/2003/01/geo/wgs84_pos#"
+      @channel = XML::Node.new 'channel'
+      rss << @channel
+      title = XML::Node.new 'title'
+      title <<  feed_title
+      @channel << title
+      description_el = XML::Node.new 'description'
+      @channel << description_el
+
+      description_el << feed_description
+      link = XML::Node.new 'link'
+      link << feed_url
+      @channel << link
+      image = XML::Node.new 'image'
+      @channel << image
+      url = XML::Node.new 'url'
+      url << 'http://www.openstreetmap.org/feeds/mag_map-rss2.0.png'
+      image << url
+      title = XML::Node.new 'title'
+      title << "OpenStreetMap"
+      image << title
+      width = XML::Node.new 'width'
+      width << '100'
+      image << width
+      height = XML::Node.new 'height'
+      height << '100'
+      image << height
+      link = XML::Node.new 'link'
+      link << feed_url
+      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)
+      item = XML::Node.new 'item'
+
+      title = XML::Node.new 'title'
+      item << title
+      title << title_text
+      link = XML::Node.new 'link'
+      link << url
+      item << link
+
+      description = XML::Node.new 'description'
+      description << description_text
+      item << description
+
+      pubDate = XML::Node.new 'pubDate'
+      pubDate << timestamp.xmlschema
+      item << pubDate
+
+      if latitude
+        lat_el = XML::Node.new 'geo:lat'
+        lat_el << latitude.to_s
+        item << lat_el
+      end
+
+      if longitude
+        lon_el = XML::Node.new 'geo:long'
+        lon_el << longitude.to_s
+        item << lon_el
+      end
+
+      @channel << item
+    end
+
+    def to_s
+      return @doc.to_s
+    end
+  end
+
+  class API
+    def get_xml_doc
+      doc = XML::Document.new
+      doc.encoding = 'UTF-8' 
+      root = XML::Node.new 'osm'
+      root['version'] = API_VERSION
+      root['generator'] = 'OpenStreetMap server'
+      doc.root = root
+      return doc
+    end
+  end
 end