osm_tile_grabber 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd3ae72fc77a01e685e0b96d9e6ca458ab013209
-  data.tar.gz: 9b42bf56b6bf72a9222dbf7b39b9eb6ebecf1569
+  metadata.gz: ffd38a298145c0a5a6aec110c0345bb9c17cc16d
+  data.tar.gz: b290bf39421cd4a89c4c643d4216dc0509b5f18a
 SHA512:
-  metadata.gz: d611b13ab9bab88270daecbdd6fc3681f1d02b9581e376f67c30b6df8995964cb7c817789c6dd486a72ffe1527a234d5f4397162e688986873ff8d5ba1d28edd
-  data.tar.gz: e16086a5393ed52d5310399a5a1c576b71a389a9422d639dccc5f65aea92ed6f9810d6107020cf97a1ae341a3b3502b121e92704f7a56f43db83371999169b9a
+  metadata.gz: 9d86297d3c696c0029a5140fed973624660b15a70268a522399dc4f4ff5486d50bdbee704cd2285f3dcc9f584c6fa28269fc88d82658dae5e1f5d6980695960e
+  data.tar.gz: 233ca3a60a29509de0f5b628d1cc658b0060cfcdec03960a2c81ee5312c7e257013580114a2e3ec30c870ea87515081976ea122a0dea2a1dfa495002e2b2ed30

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 
 *.swp
+*.gem

data/lib/osm_tile_grabber/osm_tile_grabber.rb

@@ -1,9 +1,10 @@
 require 'open-uri'
 require 'tempfile'
 require 'rmagick'
-include Magick
 
 class OSMTileGrabber
+	include Magick
+
 	def initialize(lat1, lon1, lat2, lon2, zoom)
 		@lat1 = lat1
 		@lon1 = lon1
@@ -31,7 +32,7 @@ class OSMTileGrabber
 		return tile_matrix
 	end
 
-	def image_dimentions
+	def image_dimensions
 		top_left_tile = get_tile_number(@lat1, @lon1)
 		bottom_right_tile = get_tile_number(@lat2, @lon2)
 		
@@ -40,13 +41,13 @@ class OSMTileGrabber
 		return {x: x + 1, y: y + 1}
 	end
 
-	def get_tile_number(lat_deg, lng_deg)
-		lat_rad = lat_deg/180 * Math::PI
+	def get_tile_number(lat_as_deg, lon_as_deg)
+		lat_as_rad = lat_as_deg/180 * Math::PI
 		n = 2.0 ** @zoom
-		x = ((lng_deg + 180.0) / 360.0 * n).to_i
-		y = ((1.0 - Math::log(Math::tan(lat_rad) + (1 / Math::cos(lat_rad))) / Math::PI) / 2.0 * n).to_i
+		x = ((lon_as_deg + 180.0) / 360.0 * n).to_i
+		y = ((1.0 - Math::log(Math::tan(lat_as_rad) + (1 / Math::cos(lat_as_rad))) / Math::PI) / 2.0 * n).to_i
   
-		{:x => x, :y =>y}
+		return {:x => x, :y =>y}
 	end
 
 	def link_from_tile_number(x,y)
@@ -59,23 +60,23 @@ class OSMTileGrabber
 		tile_numbers_needed.each do |row|
 			row.each do |tn|
 				tile_file = Tempfile.new(["tile-#{@zoom}-#{tn[:x]}-#{tn[:y]}", ".png"])
-				link_from_tile_number(tn[:x], tn[:y])
 				open(link_from_tile_number(tn[:x], tn[:y]), "rb") do |read_file|
 					tile_file.write(read_file.read)
 				end
-				tile_files << tile_file.path
+				tile_files << tile_file
 			end
 		end
 		return tile_files
 	end
 
-	def montage(file_paths, output_path)
-		image_list = ImageList.new *file_paths
-		tile_string = "#{image_dimentions[:x]}x#{image_dimentions[:y]}"
+	def montage(tiles, output_path)
+		image_list = ImageList.new *tiles.map{|t| t.path}
+		tile_string = "#{image_dimensions[:x]}x#{image_dimensions[:y]}"
 		tiled_montage = image_list.montage do
 			self.geometry = "+0+0"
 			self.tile = tile_string
 		end
 		tiled_montage.write(output_path)
+		return output_path
 	end
 end

data/lib/osm_tile_grabber/version.rb

@@ -1,3 +1,3 @@
 module OsmTileGrabber
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm_tile_grabber
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Luke Picciau