smappy 0.0.2 → 0.0.3

data/Rakefile

@@ -3,6 +3,8 @@ require 'bundler'
 Bundler.setup
 Bundler.require
 
+Bundler::GemHelper.install_tasks
+
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require 'smappy'
 
@@ -22,15 +24,13 @@ namespace :smappy do
     # Google Maps tiles:
     # map.tile_url_template = 'http://mt1.google.com/vt/x=%{x}&y=%{y}&z=%{zoomlevel}'
     
-    canvas  = map.to_image
-    drawing = Magick::Draw.new
+    image = map.to_image
       
     marker   = Smappy::Marker.new(map.center.latitude, map.center.longitude)
     position = marker.position_on_map(map)
-      
-    drawing.composite(position[0], position[1], marker.width, marker.height, marker.marker_image)
-    drawing.draw(canvas)
-      
-    canvas.write 'tmp/map.png'
+    
+    image.compose!(marker.marker_image, position[0], position[1])
+    
+    image.save 'tmp/map.png'
   end
 end

data/lib/smappy.rb

@@ -1,5 +1,5 @@
 module Smappy
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
   
   autoload :Location,  'smappy/location'
   autoload :Marker,    'smappy/marker'

data/lib/smappy/marker.rb

@@ -1,5 +1,5 @@
 require 'open-uri'
-require 'rmagick'
+require 'chunky_png'
 
 module Smappy
   class Marker < Location
@@ -15,11 +15,11 @@ module Smappy
     end
     
     def width
-      marker_image.columns
+      marker_image.width
     end
     
     def height
-      marker_image.rows
+      marker_image.height
     end
     
     def position_on_map(map)
@@ -30,9 +30,8 @@ module Smappy
     
     # UNTESTED:
     def marker_image
-      @marker_image ||= (
-        data = open(image).read
-        Magick::Image.from_blob(data).first
+      @marker_image ||= ChunkyPNG::Image.from_datastream(
+        ChunkyPNG::Datastream.from_io(open(image))
       )
     end
   end

data/lib/smappy/static_map.rb

@@ -1,4 +1,4 @@
-require 'rmagick'
+require 'chunky_png'
 
 module Smappy
   class StaticMap
@@ -67,16 +67,30 @@ module Smappy
     end
     
     def to_image
-      canvas  = Magick::Image.new(width, height)
-      drawing = Magick::Draw.new
+      canvas = ChunkyPNG::Image.new(width, height)
       
       tiles.each do |tile|
-        position = tile.position_on_map(self)
-        drawing.composite(position[0], position[1], Tile::SIZE, Tile::SIZE, tile.to_image)
+        x, y  = tile.position_on_map(self)
+        image = tile.to_image
+        
+        if x < 0 || y < 0
+          crop_x = x < 0 ? -x : 0
+          crop_y = y < 0 ? -y : 0
+          x, y   = [0, x].max, [0, y].max
+          
+          image.crop!(crop_x, crop_y, image.width - crop_x, image.height - crop_y)
+        end
+        
+        if x + image.width > canvas.width || y + image.height > height
+          crop_width  = [image.width, canvas.width - x].min
+          crop_height = [image.height, canvas.height - y].min
+          
+          image.crop!(0, 0, crop_width, crop_height)
+        end
+        
+        canvas.compose!(image, x, y)
       end
       
-      drawing.draw(canvas)
-      
       canvas
     end
   end

data/lib/smappy/tile.rb

@@ -1,5 +1,5 @@
 require 'open-uri'
-require 'rmagick'
+require 'chunky_png'
 
 module Smappy
   class Tile
@@ -33,8 +33,9 @@ module Smappy
     end
     
     def to_image
-      data = open(to_url).read
-      Magick::Image.from_blob(data).first
+      @tile_image ||= ChunkyPNG::Image.from_datastream(
+        ChunkyPNG::Datastream.from_io(open(to_url))
+      )
     end
     
     def x

data/spec/smappy/static_map_spec.rb

@@ -121,7 +121,7 @@ describe Smappy::StaticMap do
     
     it 'returns an image of the specified size' do
       img = map.to_image
-      [img.columns, img.rows].should == [500, 350]
+      [img.width, img.height].should == [500, 350]
     end
   end
 end

data/spec/smappy/tile_spec.rb

@@ -81,7 +81,7 @@ describe Smappy::Tile do
     
     it 'returns the image at the url' do
       img = tile.to_image
-      [img.columns, img.rows].should == [256, 256]
+      [img.width, img.height].should == [256, 256]
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smappy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,8 +12,8 @@ cert_chain: []
 date: 2011-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rmagick
-  requirement: &70193770877180 !ruby/object:Gem::Requirement
+  name: chunky_png
+  requirement: &70314486828360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70193770877180
+  version_requirements: *70314486828360
 description: Generate static maps of map tiles.
 email: tomeric@eet.nu
 executables: []
@@ -57,12 +57,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1242191568019221092
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1242191568019221092
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10