X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/349413a520d05cf9c55fe6870de6ea2f933a3248..691aab02fcd76cde87e0f55ddf61b3a288ab5a36:/lib/osm.rb?ds=sidebyside

diff --git a/lib/osm.rb b/lib/osm.rb
index 300d9fa7a..aca4031eb 100644
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -18,33 +18,32 @@ module OSM
   class Mercator
     include Math
 
-    def initialize(lat, lon, degrees_per_pixel, width, height)
-      #init me with your centre lat/lon, the number of degrees per pixel and the size of your image
-      @clat = lat
-      @clon = lon
-      @degrees_per_pixel = degrees_per_pixel
-      @degrees_per_pixel = 0.0000000001 if @degrees_per_pixel < 0.0000000001
+    #init me with your bounding box and the size of your image
+
+    def initialize(min_lat, min_lon, max_lat, max_lon, width, height)
+      xsize = xsheet(max_lon) - xsheet(min_lon)
+      ysize = ysheet(max_lat) - ysheet(min_lat)
+      xscale = xsize / width
+      yscale = ysize / height
+      scale = [xscale, yscale].max
+
+      xpad = width * scale - xsize
+      ypad = height * scale - ysize
+
       @width = width
       @height = height
-      @dlon = width / 2 * @degrees_per_pixel
-      @dlat = height / 2 * @degrees_per_pixel  * cos(@clat * PI / 180)
 
-      @tx = xsheet(@clon - @dlon)
-      @ty = ysheet(@clat - @dlat)
-
-      @bx = xsheet(@clon + @dlon)
-      @by = ysheet(@clat + @dlat)
+      @tx = xsheet(min_lon) - xpad / 2
+      @ty = ysheet(min_lat) - ypad / 2
 
+      @bx = xsheet(max_lon) + xpad / 2
+      @by = ysheet(max_lat) + ypad / 2
     end
 
     #the following two functions will give you the x/y on the entire sheet
 
-    def kilometerinpixels
-      return 40008.0  / 360.0 * @degrees_per_pixel
-    end
-
     def ysheet(lat)
-      log(tan(PI / 4 +  (lat  * PI / 180 / 2)))
+      log(tan(PI / 4 + (lat * PI / 180 / 2))) / (PI / 180)
     end
 
     def xsheet(lon)
@@ -92,6 +91,8 @@ module OSM
         lat = attributes['lat'].to_f
         lon = attributes['lon'].to_f
         gotlatlon = true
+        gotele = false
+        gotdate = false
         @possible_points += 1
       end
 
@@ -135,19 +136,29 @@ module OSM
       frames = 10
       width = 250
       height = 250
-      rat= Math.cos( ((max_lat + min_lat)/2.0) /  180.0 * 3.141592)
-      proj = OSM::Mercator.new((min_lat + max_lat) / 2, (max_lon + min_lon) / 2, (max_lat - min_lat) / width / rat, width, height)
+      proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
+
+      linegc = Magick::Draw.new
+      linegc.stroke_linejoin('miter')
+      linegc.stroke_width(1)
+      linegc.stroke('#BBBBBB')
+      linegc.fill('#BBBBBB')
+
+      highlightgc = Magick::Draw.new
+      highlightgc.stroke_linejoin('miter')
+      highlightgc.stroke_width(3)
+      highlightgc.stroke('#000000')
+      highlightgc.fill('#000000')
 
       images = []
 
       frames.times do
-        gc =  Magick::Draw.new
-        gc.stroke_linejoin('miter')
-        gc.stroke('#FFFFFF')
-        gc.fill('#FFFFFF')
-        gc.rectangle(0,0,width,height)
-        gc.stroke_width(1)
-        images << gc
+        image = Magick::Image.new(width, height) do |image|
+          image.background_color = 'white'
+          image.format = 'GIF'
+        end
+
+        images << image
       end
 
       oldpx = 0.0
@@ -160,43 +171,39 @@ module OSM
       points do |p|
         px = proj.x(p['longitude'])
         py = proj.y(p['latitude'])
-        frames.times do |n|
-          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
+
+        if m > 0
+          frames.times do |n|
+            if n == mm
+              gc = highlightgc.dup
+            else
+              gc = linegc.dup
+            end
+
+            gc.line(px, py, oldpx, oldpy)
+
+            gc.draw(images[n])
+          end
         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
+
+        m += 1
         if m > num_points.to_f / frames.to_f * (mm+1)
           mm += 1
         end
-        first = false
+
         oldpy = py
         oldpx = px
       end
 
       il = Magick::ImageList.new
 
-      frames.times do |n|
-        canvas = Magick::Image.new(width, height) {
-          self.background_color = 'white'
-        }
-        begin
-          images[n].draw(canvas)
-        rescue ArgumentError
-        end
-        canvas.format = 'GIF'
-        il << canvas
+      images.each do |f|
+        il << f
       end
 
       il.delay = 50
       il.format = 'GIF'
+
       return il.to_blob
     end
 
@@ -204,42 +211,36 @@ module OSM
       #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)
-      proj = OSM::Mercator.new((min_lat + max_lat) / 2, (max_lon + min_lon) / 2, (max_lat - min_lat) / width / rat, width, height)
-
-      images = []
+      proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
-      gc =  Magick::Draw.new
+      gc = Magick::Draw.new
       gc.stroke_linejoin('miter')
+      gc.stroke_width(1)
+      gc.stroke('#000000')
+      gc.fill('#000000')
+
+      image = Magick::Image.new(width, height) do |image|
+        image.background_color = 'white'
+        image.format = 'GIF'
+      end
 
       oldpx = 0.0
       oldpy = 0.0
 
       first = true
 
-      gc.stroke_width(1)
-      gc.stroke('#000000')
-      gc.fill('#000000')
-
       points do |p|
         px = proj.x(p['longitude'])
         py = proj.y(p['latitude'])
-        gc.line(px, py, oldpx, oldpy ) unless first
-       # puts "C #{px},#{py} - #{oldpx},#{oldpy}"
+
+        gc.dup.line(px, py, oldpx, oldpy).draw(image) unless first
+
         first = false
         oldpy = py
         oldpx = px
       end
 
-      canvas = Magick::Image.new(width, height) {
-        self.background_color = 'white'
-      }
-      begin
-        gc.draw(canvas)
-      rescue ArgumentError
-      end
-      canvas.format = 'GIF'
-      return canvas.to_blob
+      return image.to_blob
     end
 
   end
@@ -374,7 +375,7 @@ module OSM
     Timeout::timeout(4) do
       Net::HTTP.start('api.hostip.info') do |http|
         country = http.get("/country.php?ip=#{ip_address}").body
-        country = "GB" if country = "UK"
+        country = "GB" if country == "UK"
         Net::HTTP.start('ws.geonames.org') do |http|
           xml = REXML::Document.new(http.get("/countryInfo?country=#{country}").body)
           xml.elements.each("geonames/country") do |ele|
@@ -414,10 +415,10 @@ module OSM
   # Return an SQL fragment to select a given area of the globe
   def self.sql_for_area(minlat, minlon, maxlat, maxlon, prefix = nil)
     tilesql = QuadTile.sql_for_area(minlat, minlon, maxlat, maxlon, prefix)
-    minlat = (minlat * 1000000).round
-    minlon = (minlon * 1000000).round
-    maxlat = (maxlat * 1000000).round
-    maxlon = (maxlon * 1000000).round
+    minlat = (minlat * 10000000).round
+    minlon = (minlon * 10000000).round
+    maxlat = (maxlat * 10000000).round
+    maxlon = (maxlon * 10000000).round
 
     return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}"
   end