map-kit-wrapper 0.0.3 → 0.0.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Kasper Weibel Nielsen-Refs
+Copyright (c) 2012-2013 Kasper Weibel Nielsen-Refs
 
 MIT License
 

data/README.md

@@ -1,7 +1,7 @@
 MapKitWrapper
 =============
 
-This is a MapKit wrapper for RubyMotion. It's purpose is to make make dealing with MapKit less painful.
+This is a MapKit wrapper for RubyMotion. It's purpose is to make dealing with MapKit less painful.
 
 MapKitWrapper is work in progress. Right now there are wrappers for the Map Kit Data Types and the Core Location Data Types. Those will save you a lot of typing.
 
@@ -21,20 +21,26 @@ require 'map-kit-wrapper'
 
 ## Example
 ```ruby
-
-def loadView
-  self.view = UIView.alloc.initWithFrame(tabBarController.view.bounds)
-  map = MapView.new
-  map.frame = self.view.frame
-  map.delegate = self
-  region = CoordinateRegion.new([56, 10.6], [3.1, 3.1])
-  map.region = region
-  # Alternatively use set_region
-  # map.set_region(region, :animated => true)
-  map.showsUserLocation = true
-  self.view.addSubview(map)
-  map.set_zoom_level = 3
+class FooViewController < UIViewController
+	include MapKit
+	def viewDidLoad
+      super
+
+	  map = MapView.new
+	  map.frame = self.view.frame
+	  map.delegate = self
+	  region = CoordinateRegion.new([56, 10.6], [3.1, 3.1])
+	  map.region = region
+	  # Alternatively use set_region
+	  # map.set_region(region, :animated => true)
+	  map.showsUserLocation = true
+	  view.addSubview(map)
+	end
+	
+	#...
 end
+  
+
 ```
 
 ## MapView: Convenient subclass of MKMapView
@@ -110,6 +116,7 @@ It's a Ruby adaption of http://troybrant.net/blog/2010/01/set-the-zoom-level-of-
 ## Wrappers for the CoreLocation data types
 
 Include the module
+
 ```ruby
 include CoreLocation::DataTypes
 ```
@@ -117,14 +124,17 @@ include CoreLocation::DataTypes
 ### LocationCoordinate: The wrapper for CLLocationCoordinate2D
 
 The `LocationCoordinate` initializer takes a variety of argument types
+
 ```ruby
 LocationCoordinate.new(1,2)
 LocationCoordinate.new([1,2])
+LocationCoordinate.new({:latitude => 1, :longitude => 2})
 LocationCoordinate.new(LocationCoordinate)
 LocationCoordinate.new(CLLocationCoordinate2D)
 ```
 
 Methods on `LocationCoordinate`
+
 ```ruby
 >> lc = LocationCoordinate.new(1, 2)
 => [1, 2]
@@ -136,8 +146,10 @@ Methods on `LocationCoordinate`
 => 2
 >> lc.longitude = 15
 => 15
->> lc.to_array
+>> lc.to_a
 => [10, 15]
+>> lc.to_h
+=> {:latitude => 10, :longitude => 15}
 >> lc.sdk
 => CLLocationCoordinate2D
 ```
@@ -157,6 +169,8 @@ The `CoordinateSpan` initializer takes a variety of argument types
 ```ruby
 CoordinateSpan.new(1, 2)
 CoordinateSpan.new([1, 2])
+CoordinateSpan.new({:latitude_delta => 1, :longitude_delta => 2})
+CoordinateSpan.new(CoordinateSpan)
 CoordinateSpan.new(MKCoordinateSpan)
 ```
 
@@ -169,8 +183,10 @@ Methods on `CoordinateSpan`
 => 1
 >> cs.longitude_delta
 => 2
->> cs.to_array
+>> cs.to_a
 => [1, 2]
+>> cs.to_h
+=> {:latitude_delta => 1, :longitude_delta => 2}
 >> cs.sdk
 => MKCoordinateSpan
 ```
@@ -183,8 +199,9 @@ The `CoordinateRegion` initializer takes a variety of argument types
 CoordinateRegion.new(CoordinateRegion)
 CoordinateRegion.new(MKCoordinateRegion)
 CoordinateRegion.new([56, 10.6], [3.1, 3.1])
-CoordinateRegion.new(LocationCoordinate, CoordinateSpan)
+CoordinateRegion.new({:center => {:latitude => 56, :longitude => 10.6}, :span => {:latitude_delta => 3.1, :longitude_delta => 5.1}})
 CoordinateRegion.new(CLLocationCoordinate2D, MKCoordinateSpan)
+CoordinateRegion.new(LocationCoordinate, CoordinateSpan)
 ```
 
 Methods on `CoordinateRegion`
@@ -196,8 +213,8 @@ Methods on `CoordinateRegion`
 => LocationCoordinate([56, 10.6])
 >> cs.region
 => CoordinateSpan([3.1, 5.1])
->> cs.to_hash
-=> {:center => [56, 10.6], :span => [3.1, 5.1]}
+>> cs.to_h
+=> {:center => {:latitude => 56, :longitude => 10.6}, :span => {:latitude_delta => 3.1, :longitude_delta => 5.1}}
 >> cs.sdk
 => MKCoordinateRegion
 ```
@@ -209,7 +226,9 @@ The `MapPoint` initializer takes a variety of argument types
 ```ruby
 MapPoint.new(50, 45)
 MapPoint.new([50, 45])
+MapPoint.new({:x => 50, :y => 45})
 MapPoint.new(MKMapPoint)
+MapPoint.new(MapPoint)
 ```
 
 Methods on `MapPoint`
@@ -221,8 +240,10 @@ Methods on `MapPoint`
 => 50
 >> mp.y
 => 45
->> mp.to_array
+>> mp.to_a
 => [50, 45]
+>> mp.to_h
+=> {:x => 50, :y => 45}
 >> mp.sdk
 => MKMapPoint
 ```
@@ -234,7 +255,9 @@ The `MapSize` initializer takes a variety of argument types
 ```ruby
 MapSize.new(10, 12)
 MapSize.new([10, 12])
+MapSize.new({:width => 50, :height => 45})
 MapSize.new(MKMapSize)
+MapSize.new(MapSize)
 ```
 
 Methods on `MapSize`
@@ -246,8 +269,10 @@ Methods on `MapSize`
 => 10
 >> ms.height
 => 12
->> ms.to_array
+>> ms.to_a
 => [50, 45]
+>> ms.to_h
+=> {:width => 50, :height => 45}
 >> ms.sdk
 => MKMapSize
 ```
@@ -259,8 +284,11 @@ The `MapRect` initializer takes a variety of argument types
 ```ruby
 MapRect.new(x, y, width, height)
 MapRect.new([x, y], [width, height])
+MapRect.new({:origin => {:x => 2, :y => 3}, :size => {:width => 10, :height => 12}})
 MapRect.new(MapPoint, MapSize)
 MapRect.new(MKMapPoint, MKMapSize)
+MapRect.new(MapRect)
+MapRect.new(MKMapRect)
 ```
 
 Methods on `MapRect`
@@ -272,8 +300,8 @@ Methods on `MapRect`
 => MapRect([2, 3])
 >> mr.size
 => MapSize([10, 12])
->> mr.to_hash
-=> {:origin => [2, 3], :size => [10, 12]}
+>> mr.to_h
+=> {:origin => {:x => 2, :y => 3}, :size => {:width => 10, :height => 12}}
 >> mr.sdk
 => MKMapRect
 ```

data/Rakefile

@@ -1,12 +1,12 @@
 $:.unshift("/Library/RubyMotion/lib")
 require 'motion/project'
-require 'lib/map-kit-wrapper'
+require 'map-kit-wrapper'
 
 require "bundler/gem_tasks"
 Bundler.require
 
 Motion::Project::App.setup do |app|
-  app.name = 'testSuite'
-  app.identifier = 'com.rubymotion.testSuite'
+  app.name = 'MapKitWrapperTestSuite'
+  app.identifier = 'com.rubymotion.MapKitWrapperTestSuite'
   app.delegate_class = 'TestSuiteDelegate'
 end

data/lib/map-kit-wrapper.rb

@@ -1,6 +1,7 @@
 require 'codependency'
+
 unless defined?(Motion::Project::Config)
-  raise "This file must be required within a RubyMotion project Rakefile."
+  raise 'This file must be required within a RubyMotion project Rakefile.'
 end
 
 Motion::Project::App.setup do |app|

data/lib/map-kit-wrapper/core_location_data_types.rb

@@ -6,47 +6,53 @@ module CoreLocation
     ##
     # Ruby wrapper for CLLocationCoordinate2D
     class LocationCoordinate
-      attr_reader :sdk
+      attr_reader :latitude, :longitude
 
       ##
       # LocationCoordinate.new(1,2)
       # LocationCoordinate.new([1,2])
+      # LocationCoordinate.new({:latitude => 1, :longitude => 2})
       # LocationCoordinate.new(LocationCoordinate)
       # LocationCoordinate.new(CLLocationCoordinate2D)
       def initialize(*args)
-        latitude, longitude = nil, nil
         args.flatten!
-        if args.size == 1
-          arg = args.first
-          if arg.is_a?(CLLocationCoordinate2D)
-            latitude, longitude = arg.latitude, arg.longitude
-          elsif arg.is_a?(LocationCoordinate)
-            latitude, longitude = arg.sdk.latitude, arg.sdk.longitude
-          end
-        elsif args.size == 2
-          latitude, longitude = args[0], args[1]
-        end
-        @sdk = CLLocationCoordinate2DMake(latitude, longitude)
+        self.latitude, self.longitude =
+            case args.size
+              when 1
+                arg = args.first
+                if arg.is_a? Hash
+                  [arg[:latitude], arg[:longitude]]
+                else
+                  # For LocationCoordinate, CLLocationCoordinate2D
+                  [arg.latitude, arg.longitude]
+                end
+              when 2
+                [args[0], args[1]]
+            end
       end
 
-      def latitude
-        @sdk.latitude
+      def sdk
+        CLLocationCoordinate2DMake(@latitude, @longitude)
       end
 
       def latitude=(latitude)
-        @sdk.latitude = latitude
+        @latitude = latitude.to_f
       end
 
-      def longitude
-        @sdk.longitude
+      def longitude=(longitude)
+        @longitude = longitude.to_f
       end
 
-      def longitude=(longitude)
-        @sdk.longitude = longitude
+      def to_a
+        [@latitude, @longitude]
+      end
+
+      def to_h
+        {:latitude => @latitude, :longitude => @longitude}
       end
 
-      def to_array
-        [latitude, longitude]
+      def to_s
+        to_h.to_s
       end
     end
   end

data/lib/map-kit-wrapper/map_kit_data_types.rb

@@ -1,4 +1,4 @@
-# require core_location_data_types
+#= require core_location_data_types
 
 module MapKit
   ##
@@ -8,157 +8,253 @@ module MapKit
     ##
     # Wrapper for MKCoordinateSpan
     class CoordinateSpan
-      attr_reader :sdk
+      attr_reader :latitude_delta, :longitude_delta
       ##
       # CoordinateSpan.new(1,2)
       # CoordinateSpan.new([1,2])
+      # CoordinateSpan.new({:latitude_delta => 1, :longitude_delta => 2})
+      # CoordinateSpan.new(CoordinateSpan)
       # CoordinateSpan.new(MKCoordinateSpan)
       def initialize(*args)
         args.flatten!
-        if args.first.is_a?(MKCoordinateSpan)
-          @sdk = args.first
-        else
-          @sdk = MKCoordinateSpanMake(args[0], args[1])
-        end
+        self.latitude_delta, self.longitude_delta =
+            case args.size
+              when 1
+                arg = args.first
+                case arg
+                  when MKCoordinateSpan
+                    [arg.latitudeDelta, arg.longitudeDelta]
+                  when CoordinateSpan
+                    [arg.latitude_delta, arg.longitude_delta]
+                  when Hash
+                    [arg[:latitude_delta], arg[:longitude_delta]]
+                end
+              when 2
+                [args[0], args[1]]
+            end
       end
 
-      def latitude_delta
-        @sdk.latitudeDelta
+      def sdk
+        MKCoordinateSpanMake(@latitude_delta, @longitude_delta)
       end
 
-      def longitude_delta
-        @sdk.longitudeDelta
+      def latitude_delta=(delta)
+        @latitude_delta = delta.to_f
       end
 
-      def to_array
-        [latitude_delta, longitude_delta]
+      def longitude_delta=(delta)
+        @longitude_delta = delta.to_f
+      end
+
+      def to_a
+        [@latitude_delta, @longitude_delta]
+      end
+
+      def to_h
+        {:latitude_delta => @latitude_delta, :longitude_delta => @longitude_delta}
+      end
+
+      def to_s
+        to_h.to_s
       end
     end
     ##
     # Wrapper for MKCoordinateRegion
     class CoordinateRegion
       include CoreLocation::DataTypes
-      attr_reader :sdk
+      attr_reader :center, :span
       ##
       # CoordinateRegion.new(CoordinateRegion)
       # CoordinateRegion.new(MKCoordinateRegion)
       # CoordinateRegion.new([56, 10.6], [3.1, 3.1])
+      # CoordinateRegion.new({:center => {:latitude => 56, :longitude => 10.6}, :span => {:latitude_delta => 3.1, :longitude_delta => 3.1}}
       # CoordinateRegion.new(LocationCoordinate, CoordinateSpan)
       # CoordinateRegion.new(CLLocationCoordinate2D, MKCoordinateSpan)
       def initialize(*args)
-        if args.size == 1
-          if args[0].is_a?(CoordinateRegion)
-            center, span = args[0].center.sdk, args[0].span.sdk
-          else
-            center, span = args[0].center, args[0].span
-          end
-        else
-          center = args[0].is_a?(LocationCoordinate) ? args[0].sdk : args[0]
-          span = args[1].is_a?(CoordinateSpan) ? args[1].sdk : args[1]
-        end
-        @sdk = MKCoordinateRegionMake(center, span)
+        self.center, self.span =
+            case args.size
+              when 1
+                arg = args[0]
+                case arg
+                  when Hash
+                    [arg[:center], arg[:span]]
+                  else
+                    [arg.center, arg.span]
+                end
+              when 2
+                [args[0], args[1]]
+            end
+      end
+
+      def sdk
+        MKCoordinateRegionMake(@center.sdk, @span.sdk)
+      end
+
+      def center=(center)
+        @center = LocationCoordinate.new(center)
       end
 
-      def center
-        LocationCoordinate.new(@sdk.center)
+      def span=(span)
+        @span = CoordinateSpan.new(span)
       end
 
-      def span
-        CoordinateSpan.new(@sdk.span)
+      def to_h
+        {:center => @center.to_h, :span => @span.to_h}
       end
 
-      def to_hash
-        {:center => center.to_array, :span => span.to_array}
+      def to_s
+        to_h.to_s
       end
     end
     ##
     # Wrapper for MKMapPoint
     class MapPoint
-      attr_reader :sdk
+      attr_reader :x, :y
       ##
       # MapPoint.new(50,45)
       # MapPoint.new([50,45])
+      # MapPoint.new({:x => 50, :y => 45})
       # MapPoint.new(MKMapPoint)
       def initialize(*args)
         args.flatten!
-        if args.first.is_a?(MKMapPoint)
-          @sdk = args.first
-        else
-          @sdk = MKMapPointMake(args[0], args[1])
-        end
+        self.x, self.y =
+            case args.size
+              when 1
+                arg = args[0]
+                case arg
+                  when Hash
+                    [arg[:x], arg[:y]]
+                  else
+                    [arg.x, arg.y]
+                end
+              when 2
+                [args[0], args[1]]
+            end
+      end
+
+      def sdk
+        MKMapPointMake(@x, @y)
+      end
+
+      def x=(x)
+        @x = x.to_f
       end
 
-      def x
-        @sdk.x
+      def y=(y)
+        @y = y.to_f
       end
 
-      def y
-        @sdk.y
+      def to_a
+        [@x, @y]
       end
 
-      def to_array
-        [x, y]
+      def to_h
+        {:x => @x, :y => @y}
+      end
+
+      def to_s
+        to_h.to_s
       end
     end
     ##
     # Wrapper for MKMapSize
     class MapSize
-      attr_reader :sdk
+      attr_reader :width, :height
       ##
       # MapSize.new(10,12)
       # MapSize.new([10,12])
+      # MapSize.new({:width => 10, :height => 12})
       # MapSize.new(MKMapSize)
+      # MapSize.new(MapSize)
       def initialize(*args)
         args.flatten!
-        if args.first.is_a?(MKMapSize)
-          @sdk = args.first
-        else
-          @sdk = MKMapSizeMake(args[0], args[1])
-        end
+        self.width, self.height =
+            case args.size
+              when 1
+                arg = args[0]
+                case arg
+                  when Hash
+                    [arg[:width], arg[:height]]
+                  else
+                    [arg.width, arg.height]
+                end
+              when 2
+                [args[0], args[1]]
+            end
+      end
+
+      def sdk
+        MKMapSizeMake(@width, @height)
       end
 
-      def width
-        @sdk.width
+      def width=(width)
+        @width = width.to_f
       end
 
-      def height
-        @sdk.height
+      def height=(height)
+        @height = height.to_f
       end
 
-      def to_array
-        [width, height]
+      def to_a
+        [@width, @height]
+      end
+
+      def to_h
+        {:width => @width, :height => @height}
+      end
+
+      def to_s
+        to_h.to_s
       end
     end
     ##
     # Wrapper for MKMapRect
     class MapRect
-      attr_reader :sdk
+      attr_reader :origin, :size
       ##
       # MapRect.new(x, y, width, height)
       # MapRect.new([x, y], [width, height])
+      # MapRect.new({:origin => {:x => 5.0, :y => 8.0}, :size => {:width => 6.0, :height => 9.0}})
       # MapRect.new(MapPoint, MapSize)
       # MapRect.new(MKMapPoint, MKMapSize)
+      # MapRect.new(MapRect)
+      # MapRect.new(MKMapRect)
       def initialize(*args)
-        args.flatten!
-        if args.size == 2
-          origin = args[0].is_a?(MapPoint) ? args[0] : MapPoint.new(args[0])
-          size = args[1].is_a?(MapSize) ? args[1] : MapSize.new(args[1])
-          @sdk = MKMapRectMake(origin.sdk.x, origin.sdk.y, size.sdk.width, size.sdk.height)
-        elsif args.size == 4
-          @sdk = MKMapRectMake(args[0], args[1], args[2], args[3])
-        end
+        self.origin, self.size =
+            case args.size
+              when 1
+                arg = args[0]
+                case arg
+                  when Hash
+                    [arg[:origin], arg[:size]]
+                  else
+                    [arg.origin, arg.size]
+                end
+              when 2
+                [args[0], args[1]]
+              when 4
+                [[args[0], args[1]], [args[2], args[3]]]
+            end
+      end
+
+      def sdk
+        MKMapRectMake(@origin.x, @origin.y, @size.width, @size.height)
+      end
+
+      def origin=(origin)
+        @origin = MapPoint.new(origin)
       end
 
-      def origin
-        MapPoint.new(@sdk.origin)
+      def size=(size)
+        @size = MapSize.new(size)
       end
 
-      def size
-        MapSize.new(@sdk.size)
+      def to_h
+        {:origin => @origin.to_h, :size => @size.to_h}
       end
 
-      def to_hash
-        {:origin => origin.to_array, :size => size.to_array}
+      def to_s
+        to_h.to_s
       end
     end
   end

data/lib/map-kit-wrapper/map_view.rb

@@ -1,6 +1,6 @@
-# require core_location_data_types
-# require map_kit_data_types
-# require zoom_level
+#= require core_location_data_types
+#= require map_kit_data_types
+#= require zoom_level
 
 module MapKit
   include CoreLocation::DataTypes

data/lib/map-kit-wrapper/version.rb

@@ -1,3 +1,3 @@
 module MapKit
-  VERSION = "0.0.3"
+  VERSION = '0.0.4'
 end

data/lib/map-kit-wrapper/zoom_level.rb

@@ -1,10 +1,11 @@
 module MapKit
   ##
   # Ruby adaption of http://troybrant.net/blog/2010/01/set-the-zoom-level-of-an-mkmapview/
+  # More here http://troybrant.net/blog/2010/01/mkmapview-and-zoom-levels-a-visual-guide/
   module ZoomLevel
     include Math
     MERCATOR_OFFSET = 268435456.0
-    MERCATOR_RADIUS = 85445659.44705395
+    MERCATOR_RADIUS = MERCATOR_OFFSET / PI
 
     ##
     # Map conversion methods

data/map_kit_wrapper.gemspec

@@ -2,18 +2,19 @@
 require File.expand_path('../lib/map-kit-wrapper/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Kasper Weibel Nielsen-Refs"]
-  gem.email         = ["weibel@gmail.com"]
+  gem.authors       = ['Kasper Weibel Nielsen-Refs']
+  gem.email         = ['weibel@gmail.com']
   gem.summary       = %q{This is a MapKit wrapper for RubyMotion. It's purpose is to make make dealing with MapKit less painful}
-  gem.homepage      = "https://github.com/weibel/MapKitWrapper"
+  gem.homepage      = 'https://github.com/weibel/MapKitWrapper'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "map-kit-wrapper"
-  gem.require_paths = ["lib"]
+  gem.name          = 'map-kit-wrapper'
+  gem.require_paths = ['lib']
   gem.version       = MapKit::VERSION
 
-  gem.add_dependency 'codependency', '0.2.0'
+  #gem.add_dependency 'bundler', '1.1.4'
+  gem.add_dependency 'codependency', '2.0.0'
   gem.add_dependency 'rake'
 end

data/spec/lib/core_location_data_types_spec.rb

@@ -4,7 +4,8 @@ describe 'LocationCoordinate' do
     lc_2 = CoreLocation::DataTypes::LocationCoordinate.new([5, 8])
     lc_3 = CoreLocation::DataTypes::LocationCoordinate.new(CLLocationCoordinate2DMake(5, 8))
     lc_4 = CoreLocation::DataTypes::LocationCoordinate.new(lc_3)
-    @array = [lc_1, lc_2, lc_3, lc_4]
+    lc_5 = CoreLocation::DataTypes::LocationCoordinate.new({:latitude => 5, :longitude => 8})
+    @array = [lc_1, lc_2, lc_3, lc_4, lc_5]
   end
 
   it 'should return the latitude' do
@@ -35,7 +36,19 @@ describe 'LocationCoordinate' do
 
   it 'should return an array' do
     @array.each do |lc|
-      lc.to_array.should.equal [5, 8]
+      lc.to_a.should.equal [5, 8]
+    end
+  end
+
+  it 'should return a hash' do
+    @array.each do |lc|
+      lc.to_h.should.equal({:latitude => 5, :longitude => 8})
+    end
+  end
+
+  it 'should return a string' do
+    @array.each do |lc|
+      lc.to_s.should.equal '{:latitude=>5.0, :longitude=>8.0}'
     end
   end
 

data/spec/lib/map_kit_data_types_spec.rb

@@ -4,7 +4,9 @@ describe 'MapKitDataTypes' do
       o_1 = MapKit::DataTypes::CoordinateSpan.new(5, 8)
       o_2 = MapKit::DataTypes::CoordinateSpan.new([5, 8])
       o_3 = MapKit::DataTypes::CoordinateSpan.new(MKCoordinateSpanMake(5, 8))
-      @array = [o_1, o_2, o_3]
+      o_4 = MapKit::DataTypes::CoordinateSpan.new(o_1)
+      o_5 = MapKit::DataTypes::CoordinateSpan.new({:latitude_delta => 5, :longitude_delta => 8})
+      @array = [o_1, o_2, o_3, o_4, o_5]
     end
 
     it 'should return the latitude delta' do
@@ -21,7 +23,13 @@ describe 'MapKitDataTypes' do
 
     it 'should return an array' do
       @array.each do |o|
-        o.to_array.should.equal [5, 8]
+        o.to_a.should.equal [5, 8]
+      end
+    end
+
+    it 'should return a hash' do
+      @array.each do |o|
+        o.to_h.should.equal({:latitude_delta => 5.0, :longitude_delta => 8.0})
       end
     end
 
@@ -42,7 +50,8 @@ describe 'MapKitDataTypes' do
       o_3 = MapKit::DataTypes::CoordinateRegion.new(CLLocationCoordinate2DMake(5, 8), MKCoordinateSpanMake(6, 9))
       o_4 = MapKit::DataTypes::CoordinateRegion.new(mkcr)
       o_5 = MapKit::DataTypes::CoordinateRegion.new(o_1)
-      @array = [o_1, o_2, o_3, o_4, o_5]
+      o_6 = MapKit::DataTypes::CoordinateRegion.new({:center => {:latitude => 5.0, :longitude => 8.0}, :span => {:latitude_delta => 6.0, :longitude_delta => 9.0}})
+      @array = [o_1, o_2, o_3, o_4, o_5, o_6]
     end
 
     it 'should return the center' do
@@ -63,7 +72,7 @@ describe 'MapKitDataTypes' do
 
     it 'should return a hash' do
       @array.each do |o|
-        o.to_hash.should.equal({:center => [5, 8], :span => [6, 9]})
+        o.to_h.should.equal({:center => {:latitude => 5.0, :longitude => 8.0}, :span => {:latitude_delta => 6.0, :longitude_delta => 9.0}})
       end
     end
 
@@ -79,7 +88,8 @@ describe 'MapKitDataTypes' do
       o_1 = MapKit::DataTypes::MapPoint.new(5, 8)
       o_2 = MapKit::DataTypes::MapPoint.new([5, 8])
       o_3 = MapKit::DataTypes::MapPoint.new(MKMapPointMake(5, 8))
-      @array = [o_1, o_2, o_3]
+      o_4 = MapKit::DataTypes::MapPoint.new({:x => 5.0, :y => 8.0})
+      @array = [o_1, o_2, o_3, o_4]
     end
 
     it 'should return the x' do
@@ -96,7 +106,13 @@ describe 'MapKitDataTypes' do
 
     it 'should return an array' do
       @array.each do |o|
-        o.to_array.should.equal [5, 8]
+        o.to_a.should.equal [5, 8]
+      end
+    end
+
+    it 'should return a hash' do
+      @array.each do |o|
+        o.to_h.should.equal({:x => 5.0, :y => 8.0})
       end
     end
 
@@ -112,7 +128,8 @@ describe 'MapKitDataTypes' do
       o_1 = MapKit::DataTypes::MapSize.new(5, 8)
       o_2 = MapKit::DataTypes::MapSize.new([5, 8])
       o_3 = MapKit::DataTypes::MapSize.new(MKMapSizeMake(5, 8))
-      @array = [o_1, o_2, o_3]
+      o_4 = MapKit::DataTypes::MapSize.new({:width => 5.0, :height => 8.0})
+      @array = [o_1, o_2, o_3, o_4]
     end
 
     it 'should return the width' do
@@ -129,7 +146,13 @@ describe 'MapKitDataTypes' do
 
     it 'should return an array' do
       @array.each do |o|
-        o.to_array.should.equal [5, 8]
+        o.to_a.should.equal [5, 8]
+      end
+    end
+
+    it 'should return a hash' do
+      @array.each do |o|
+        o.to_h.should.equal({:width => 5.0, :height => 8.0})
       end
     end
 
@@ -148,7 +171,10 @@ describe 'MapKitDataTypes' do
       o_2 = MapKit::DataTypes::MapRect.new([5, 8], [6, 9])
       o_3 = MapKit::DataTypes::MapRect.new(mp, ms)
       o_4 = MapKit::DataTypes::MapRect.new(MKMapPointMake(5, 8), MKMapSizeMake(6, 9))
-      @array = [o_1, o_2, o_3, o_4]
+      o_5 = MapKit::DataTypes::MapRect.new({:origin => {:x => 5.0, :y => 8.0}, :size => {:width => 6.0, :height => 9.0}})
+      o_6 = MapKit::DataTypes::MapRect.new(o_5)
+      o_7 = MapKit::DataTypes::MapRect.new(o_5.sdk)
+      @array = [o_1, o_2, o_3, o_4, o_5, o_6, o_7]
     end
 
     it 'should return the origin' do
@@ -169,7 +195,7 @@ describe 'MapKitDataTypes' do
 
     it 'should return a hash' do
       @array.each do |o|
-        o.to_hash.should.equal({:origin => [5, 8], :size => [6, 9]})
+        o.to_h.should.equal({:origin => {:x => 5.0, :y => 8.0}, :size => {:width => 6.0, :height => 9.0}})
       end
     end
 

data/spec/lib/zoom_level_spec.rb

@@ -7,7 +7,7 @@ describe 'ZoomLevel' do
   end
 
   it 'should return longitude_to_pixel_space_x' do
-    MapKit::MapView.longitude_to_pixel_space_x(30).should.equal 313174656
+    MapKit::MapView.longitude_to_pixel_space_x(30).should.equal 313174699
   end
 
   it 'should return latitude_to_pixel_space_y' do
@@ -17,7 +17,7 @@ describe 'ZoomLevel' do
   end
 
   it 'should return pixel_space_x_to_longitude' do
-    MapKit::MapView.pixel_space_x_to_longitude(313174656).should.equal 29.999984741210 # 30
+    MapKit::MapView.pixel_space_x_to_longitude(313174699).should.equal 29.9999923706055 # 30
   end
 
   it 'should return pixel_space_y_to_latitude' do
@@ -28,18 +28,18 @@ describe 'ZoomLevel' do
 
   it 'should return coordinate_span_with_map_view' do
     span = MapKit::MapView.coordinate_span_with_map_view(@map, CLLocationCoordinate2DMake(56, 10), 2)
-    span.latitudeDelta.should.equal 48.452224731445
-    span.longitudeDelta.should.equal 56.25
+    span.latitudeDelta.should.equal 48.4522247314453
+    span.longitudeDelta.should.equal 56.2499694824219
   end
 
   it 'should return set_center_coordinates' do
     @map.set_center_coordinates(CLLocationCoordinate2DMake(56, 10), 2, false)
     center = CoreLocation::DataTypes::LocationCoordinate.new(@map.region.center)
     span = MapKit::DataTypes::CoordinateSpan.new(@map.region.span)
-    span.latitude_delta.should.equal 48.4812927246094
+    span.latitude_delta.should.equal 48.4522247314453
     span.longitude_delta.should.equal 56.25
-    center.latitude.should.equal 55.9737854003906
-    center.longitude.should.equal 10.01953125
+    center.latitude.should.equal 56.0
+    center.longitude.should.equal 10.0
     @map.set_center_coordinates(CLLocationCoordinate2DMake(0, 0), 50, false)
     @map.zoom_level.should.equal 18
   end
@@ -48,10 +48,10 @@ describe 'ZoomLevel' do
     @map.set_map_lat_lon(56, 10, 2, false)
     center = CoreLocation::DataTypes::LocationCoordinate.new(@map.region.center)
     span = MapKit::DataTypes::CoordinateSpan.new(@map.region.span)
-    span.latitude_delta.should.equal 48.4812927246094
+    span.latitude_delta.should.equal 48.4522247314453
     span.longitude_delta.should.equal 56.25
-    center.latitude.should.equal 55.9737854003906
-    center.longitude.should.equal 10.01953125
+    center.latitude.should.equal 56.0
+    center.longitude.should.equal 10.0
   end
 
   it 'should return coordinate_region_with_map_view' do
@@ -62,7 +62,7 @@ describe 'ZoomLevel' do
     center = CoreLocation::DataTypes::LocationCoordinate.new(region.center)
     span = MapKit::DataTypes::CoordinateSpan.new(region.span)
     span.latitude_delta.should.equal 48.4522247314453
-    span.longitude_delta.should.equal 56.25
+    span.longitude_delta.should.equal 56.2499694824219
     center.latitude.should.equal 56.0
     center.longitude.should.equal 10.0
   end

metadata

@@ -1,62 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: map-kit-wrapper
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Kasper Weibel Nielsen-Refs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: codependency
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 
+email:
 - weibel@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -78,38 +71,30 @@ files:
 - spec/main_spec.rb
 homepage: https://github.com/weibel/MapKitWrapper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: This is a MapKit wrapper for RubyMotion. It's purpose is to make make dealing with MapKit less painful
-test_files: 
+summary: This is a MapKit wrapper for RubyMotion. It's purpose is to make make dealing
+  with MapKit less painful
+test_files:
 - spec/lib/core_location_data_types_spec.rb
 - spec/lib/map_kit_data_types_spec.rb
 - spec/lib/map_view_spec.rb