mapkit 0.0.3 → 1.0.0

data/lib/tilekit.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + "/mapkit"
-require "gd2"
+require 'RMagick' unless defined? Magick
 
 # this module helps drawing icons on tile images
 module TileKit
   # this class represents an icon that can be drawn on an Image
   class Icon
     attr_reader :image, :size
-    
+
     # initializes the icon with a path, image size [width, height], the peak#
     # position (where the pointer should be placed) [x, y] and a bounding box
     # that represents a clickable area
@@ -15,21 +15,21 @@ module TileKit
     # peak_position:: the peak position as array [x, y]
     # clickable_area:: the clickable area of the icon as array [top, left, bottom, right]
     def initialize(path, size, peak_position, clickable_area)
-      @image = GD2::Image.import(path)
+      @image = Magick::Image.read(path)[0]
       @size_x, @size_y = size
       @peak_x, @peak_y = peak_position
       @shift_x, @shift_y, @width, @height = clickable_area
     end
-    
+
     # draws the icon on the canvas at passed position (x, y)
     def draw(canvas, x, y)
       # position icon at peak point
       x, y = x - @peak_x, y - @peak_y
-      
+
       # copy image
-      canvas.copy_from(@image, x, y, 0, 0, @size_x, @size_y)
+      canvas.composite!(@image, Magick::ForgetGravity, x, y, Magick::CopyCompositeOp)
     end
-    
+
     # returns a boundingbox (with lat/lng) that contains the bounds of the
     # image for the passed position
     def bounding_box(lat, lng, zoom)
@@ -38,27 +38,22 @@ module TileKit
       MapKit::BoundingBox.new(top, left, bottom, right, zoom)
     end
   end
-  
+
   # this image class represents a tile in the google maps
   class Image
     attr_reader :canvas, :bounding_box
-    
+
     # initialize the image with a (lat/lng) bounding box of the tile it
     # represents
     def initialize(bounding_box)
       @bounding_box = bounding_box
-      
-      # create image canvas
-      @canvas = GD2::Image.new(MapKit::TILE_SIZE, MapKit::TILE_SIZE)
 
-      # make image transparent
-      @canvas.save_alpha = true
-      @canvas.draw do |context|
-        context.color = GD2::Color::TRANSPARENT
-        context.fill
+      # create transparent image canvas
+      @canvas = Magick::Image.new(MapKit::TILE_SIZE, MapKit::TILE_SIZE) do |c|
+        c.background_color= "Transparent"
       end
     end
-    
+
     # draws passed icon at passed position
     def draw_icon(point, icon)
       x, y = point.pixel(@bounding_box)
@@ -67,7 +62,7 @@ module TileKit
 
     # returns the png binary string of the image
     def png
-      @canvas.png
+      @canvas.to_blob { |attrs| attrs.format = 'PNG' }
     end
   end
-end
+end

data/mapkit.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'mapkit'
+
+Gem::Specification.new do |s|
+  s.name 					= %q{mapkit}
+  s.version 			= MapKit::VERSION
+  s.authors 			= ["Vincent Landgraf", "Paul Trippett"]
+  s.email 				= ["vilandgr@googlemail.com"]
+  s.description 	= %q{
+		MapKit is an set of helpers to assist building tiles for
+		the google maps web client using rmagick
+	}
+  s.summary 			= 'MapKit helps rendering tiles for google maps'
+  s.homepage 		  = 'http://github.com/threez/mapkit'
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec')
+  s.add_dependency('httparty', ">= 0.5.2")
+  s.add_dependency('rmagick', ">= 2.13.3")
+end

data/spec/mapkit_spec.rb

@@ -0,0 +1,154 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe MapKit::Point do
+  it "should save and restore lat/lng" do
+    point = MapKit::Point.new(45, 45)
+    point.lat.should == 45
+    point.lng.should == 45
+    point.lat = 10
+    point.lng = 15
+    point.lat.should == 10
+    point.lng.should == 15
+  end
+
+  it "should be able to check if it is in a bounding box" do
+    point0 = MapKit::Point.new(45, 45)
+    point1 = MapKit::Point.new(60, 45)
+    point2 = MapKit::Point.new(60, 60)
+    box = MapKit::BoundingBox.new(40, 40, 50, 50)
+    point0.in?(box).should == true
+    point1.in?(box).should == false
+    point2.in?(box).should == false
+  end
+
+  it "should be able to calc relative positions based on the bounding box" do
+    point = MapKit::Point.new(45, 45)
+    box = MapKit::BoundingBox.new(50.0, 40.0, 40.0, 50.0)
+    point.pixel(box).should == [4, 5]
+    point = MapKit::Point.new(-45, -45)
+    box = MapKit::BoundingBox.new(-40.0, -50.0, -50.0, -40.0)
+    point.pixel(box).should == [4, 5]
+    point = MapKit::Point.new(0, 0)
+    box = MapKit::BoundingBox.new(10.0, -10.0, -10.0, 10.0)
+    point.pixel(box).should == [7, 7]
+    point = MapKit::Point.new(-20, 0)
+    box = MapKit::BoundingBox.new(-10.0, -10.0, -30.0, 10.0)
+    point.pixel(box).should == [7, 8]
+  end
+end
+
+describe MapKit::BoundingBox do
+  it "should initialize correctly" do
+    box = MapKit::BoundingBox.new(1, 2, 3, 4)
+    box.coords.should == [1, 2, 3, 4]
+    box.top.should == 1
+    box.left.should == 2
+    box.bottom.should == 3
+    box.right.should == 4
+  end
+
+  it "should calculate the span" do
+    box = MapKit::BoundingBox.new(3.0, 0, 0, 3.0)
+    box.sspn.should == [1.5, 1.5]
+  end
+
+  it "should calculate the releative center position" do
+    box = MapKit::BoundingBox.new(2, 0, 0, 2)
+    box.center.should == [1, 1]
+    box = MapKit::BoundingBox.new(15, 5, 5, 15)
+    box.center.should == [10, 10]
+  end
+
+  it "should grow the box by percent correctly" do
+    box = MapKit::BoundingBox.new(4.0, 2.0, 2.0, 4.0)
+    box.grow!(100)
+    box.coords.should == [5.0, 1.0, 1.0, 5.0]
+    new_box = box.grow(100)
+    new_box.coords.should == [7.0, -1.0, -1.0, 7.0]
+    box.coords.should == [5.0, 1.0, 1.0, 5.0]
+  end
+end
+
+class Float
+  def round(precition)
+    precition = 10.0 ** (precition)
+    (self * precition).floor / precition
+  end
+end
+
+describe MapKit do
+  it "should calculate the zoom levels" do
+    MapKit.resolution(0).round(4).should == 156543.0339.round(4)
+    MapKit.resolution(1).round(4).should == 78271.5169.round(4)
+    MapKit.resolution(2).round(4).should == 39135.7584.round(4)
+    MapKit.resolution(3).round(4).should == 19567.8792.round(4)
+    MapKit.resolution(4).round(4).should == 9783.9396.round(4)
+    MapKit.resolution(5).round(4).should == 4891.9698.round(4)
+    MapKit.resolution(6).round(4).should == 2445.9849.round(4)
+    MapKit.resolution(7).round(4).should == 1222.9924.round(4)
+    MapKit.resolution(8).round(4).should == 611.4962.round(4)
+    MapKit.resolution(9).round(4).should == 305.7481.round(4)
+    MapKit.resolution(10).round(4).should == 152.8740.round(4)
+    MapKit.resolution(11).round(4).should == 76.4370.round(4)
+    MapKit.resolution(12).round(4).should == 38.2185.round(4)
+    MapKit.resolution(13).round(4).should == 19.1092.round(4)
+    MapKit.resolution(14).round(4).should == 9.5546.round(4)
+    MapKit.resolution(15).round(4).should == 4.7773.round(4)
+    MapKit.resolution(16).round(4).should == 2.3886.round(4)
+    MapKit.resolution(17).round(4).should == 1.1943.round(4)
+    MapKit.resolution(18).round(4).should == 0.5972.round(4)
+    MapKit.resolution(19).round(4).should == 0.2986.round(4)
+    MapKit.resolution(20).round(4).should == 0.1493.round(4)
+    MapKit.resolution(21).round(4).should == 0.0746.round(4)
+  end
+
+  it "should calculate the map size" do
+    MapKit.map_size(0).should == [256, 256]
+    MapKit.map_size(10).should == [4 ** 9, 4 ** 9]
+    MapKit.map_size(20).should == [4 ** 14, 4 ** 14]
+  end
+
+  it "should calculate the tile xy to pixel xy and vice versa" do
+    MapKit.pixel2tile(1024, 1024).should == [4, 4]
+    MapKit.pixel2tile(0, 0).should == [0, 0]
+    MapKit.tile2pixel(4, 4).should == [1024, 1024]
+    MapKit.tile2pixel(0, 0).should == [0, 0]
+  end
+
+  it "should clip correctly as defined by boundings" do
+    MapKit.clip(45, 40, 50).should == 45
+    MapKit.clip(45, 45, 50).should == 45
+    MapKit.clip(45, 50, 55).should == 50
+    MapKit.clip(45, 30, 40).should == 40
+    MapKit.clip(45, 40, 45).should == 45
+  end
+
+  it "should calculate the shift correctly" do
+    lat, lng = MapKit.shift_latlng(47.99997, 8.00002, 20, 20, 14)
+    lat.round(5).should == 47.99882
+    lng.round(5).should == 8.00173
+  end
+
+  it "should calc pixel to lat/lng and vice versa" do
+    px, py = MapKit.latlng2pixel(47.99997, 8.00002, 14)
+    px.should == 2_190_359
+    py.should == 1_458_001
+    lat, lng = MapKit.pixel2latlng(px, py, 14)
+    lat.round(5).should == 47.99997
+    lng.round(5).should == 8.00002
+  end
+
+  it "should return bounding boxes for tile coordinates" do
+    bb = MapKit.bounding_box(0, 0, 0)
+    bb.top.round(8).should == MapKit::MAX_LATITUDE
+    bb.left.round(8).should == MapKit::MIN_LONGITUDE
+    bb.bottom.round(8).should == -84.92832093
+    bb.right.round(8).should == 178.59375
+
+    bb = MapKit.bounding_box(1024, 1024, 14)
+    bb.top.round(8).should == 82.67628497
+    bb.left.round(8).should == -157.5
+    bb.bottom.round(8).should == 82.67348347
+    bb.right.round(8).should == -157.47802735
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,24 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+$:.unshift(File.expand_path("../lib", __FILE__))
+require 'mapkit'
+
+def travis?
+  ENV['TRAVIS'] == 'true'
+end
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,101 +1,127 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mapkit
-version: !ruby/object:Gem::Version 
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Vincent Landgraf
+- Paul Trippett
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-02-11 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-12-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: httparty
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.5.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gd2
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
+      - !ruby/object:Gem::Version
+        version: 2.13.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: |-
-  MapKit is an set of helpers to assist building tiles for
-    the google maps web client
-email: 
-- vincent.landgraf@inovex.de
+      - !ruby/object:Gem::Version
+        version: 2.13.3
+description: "\n\t\tMapKit is an set of helpers to assist building tiles for\n\t\tthe
+  google maps web client using rmagick\n\t"
+email:
+- vilandgr@googlemail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- Rakefile
+- Readme.markdown
+- example/database.sql
+- example/db.rb
+- example/images/empty.png
+- example/images/gas.png
+- example/public/appication.js
+- example/public/images/gradient.jpg
+- example/public/jquery.js
+- example/start.rb
+- example/views/index.erb
 - lib/google_local.rb
 - lib/mapkit.rb
 - lib/tilekit.rb
-- LICENSE
-- README.markdown
-has_rdoc: true
+- mapkit.gemspec
+- spec/mapkit_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/threez/mapkit
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.3.5
-  version: 
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MapKit helps rendering tiles for google maps
-test_files: []
-
+test_files:
+- spec/mapkit_spec.rb
+- spec/spec_helper.rb