X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/eada120ffac9f6b6ecb3db1fe1c4397cb6c0bd44..4cce95ffe03658358a65b00b516af7eebe96e137:/lib/osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 57714c68e..ae8e70896 100644
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -22,10 +22,11 @@ module OSM
       @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
-      @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)
@@ -79,7 +80,7 @@ module OSM
       lat = -1
       lon = -1
       ele = -1
-      date = Time.now();
+      date = DateTime.now();
       gotlatlon = false
       gotele = false
       gotdate = false
@@ -98,7 +99,7 @@ module OSM
 
       parser.listen( :characters, %w{ time } ) do |text|
         if text && text != ''
-          date = Time.parse(text)
+          date = DateTime.parse(text)
           gotdate = true
         end
       end
@@ -197,7 +198,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}"
+      #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)
@@ -240,6 +241,34 @@ module OSM
 
   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
     def initialize(feed_title='OpenStreetMap GPS Traces', feed_description='OpenStreetMap GPS Traces', feed_url='http://www.openstreetmap.org/traces/')
       @doc = XML::Document.new
@@ -280,7 +309,7 @@ module OSM
       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'
@@ -290,18 +319,22 @@ module OSM
       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'
-      pubDate << timestamp.xmlschema
+      pubDate << timestamp.to_s(:rfc822)
       item << pubDate
 
       if latitude
         lat_el = XML::Node.new 'geo:lat'
         lat_el << latitude.to_s
-        item << lat_el if lat_el
+        item << lat_el
       end
 
       if longitude