ProMotion-map 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64053c678871e7edbe5731c9627fdb527b71ab54
-  data.tar.gz: 3aef92fbedc6f4f9fb4a4adf459184ffb060d593
+  metadata.gz: edd818066a99f0ab90ba913a19ea359e555b3b4f
+  data.tar.gz: cffef6478e20af2f336d449acd51385bb9eafdc0
 SHA512:
-  metadata.gz: 55bfb725bcbba98691a3848fb92fed298813560c9d773ebe2f58903bd3e723d856e922415346a5e2a1663180ce5fb882f198396052b081eeb6ac06badb7e80a7
-  data.tar.gz: 1e3aec7ee94d35c82c216f8abcd1ba0cd05b881c0b449df2632481fa87753dc10f6c17f318f7fa6f845abbad2bb09c8ecd102ad1ea8b6546ac0032d2dc3e48b9
+  metadata.gz: 10066d1c96a8dec11416aefc77d766cf8a484c5bf279f728f0bbe02eede4a57835ebc05f0719d2ddedb7d67ca3d7dfac3aae4ac1cd342ff92bbba7cb3fabe134
+  data.tar.gz: 2451e7c00956b3109b5fd8caa7317b6e9f457fabf1d2f476ad81ce85e2dfaf11fa2aa8d92124d5d7193ae1c0480f6cac78cd66402f2261bc995df8a35b1051b8

data/README.md

@@ -177,9 +177,9 @@ Adds more than one annotation at a time to the map.
 
 Removes all annotations from the `MapScreen`.
 
-#### zoom_to_fit_annotations(animated=true)
+#### zoom_to_fit_annotations({animated:true, include_user:false})
 
-Changes the zoom and center point of the `MapScreen` to fit all the annotations.
+Changes the zoom and center point of the `MapScreen` to fit all the annotations. Passing `include_user` as `true` will cause the zoom to not only include the annotations from `annotation_data` but also the user pin in the zoom region calculation.
 
 #### set_region(region, animated=true)
 

data/lib/ProMotion/map/map_screen_module.rb

@@ -67,7 +67,11 @@ module ProMotion
     end
 
     def user_location
-      self.view.userLocation.location.nil? ? nil : self.view.userLocation.location.coordinate
+      user_annotation.nil? ? nil : user_annotation.coordinate
+    end
+
+    def user_annotation
+      self.view.userLocation.location.nil? ? nil : self.view.userLocation.location
     end
 
     def zoom_to_user(radius = 0.05, animated=true)
@@ -174,16 +178,22 @@ module ProMotion
     end
 
     # TODO: Why is this so complex?
-    def zoom_to_fit_annotations(animated=true)
+    def zoom_to_fit_annotations(args={})
+      # Preserve backwards compatibility
+      args = {animated: args} if args == true || args == false
+      args = {animated: true, include_user: false}.merge(args)
+
+      ann = args[:include_user] ? (annotations + [user_annotation]).compact : annotations
+
       #Don't attempt the rezoom of there are no pins
-      return if annotations.count == 0
+      return if ann.count == 0
 
       #Set some crazy boundaries
       topLeft = CLLocationCoordinate2D.new(-90, 180)
       bottomRight = CLLocationCoordinate2D.new(90, -180)
 
       #Find the bounds of the pins
-      annotations.each do |a|
+      ann.each do |a|
         topLeft.longitude = [topLeft.longitude, a.coordinate.longitude].min
         topLeft.latitude = [topLeft.latitude, a.coordinate.latitude].max
         bottomRight.longitude = [bottomRight.longitude, a.coordinate.longitude].max
@@ -203,9 +213,9 @@ module ProMotion
       )
 
       region = MKCoordinateRegionMake(coord, span)
-      fits = self.view.regionThatFits(region);
+      fits = self.view.regionThatFits(region)
 
-      set_region(fits, animated:animated)
+      set_region(fits, animated: args[:animated])
     end
 
     def set_region(region, animated=true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-map
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Mark Rickert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Adds PM::MapScreen support to ProMotion. Extracted from ProMotion.