ProMotion-map 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edd818066a99f0ab90ba913a19ea359e555b3b4f
-  data.tar.gz: cffef6478e20af2f336d449acd51385bb9eafdc0
+  metadata.gz: 4fa9190c3b59430b670b821061b1e100bca8a170
+  data.tar.gz: 68afd534d7381b9814866693a00dbd09f39ad65a
 SHA512:
-  metadata.gz: 10066d1c96a8dec11416aefc77d766cf8a484c5bf279f728f0bbe02eede4a57835ebc05f0719d2ddedb7d67ca3d7dfac3aae4ac1cd342ff92bbba7cb3fabe134
-  data.tar.gz: 2451e7c00956b3109b5fd8caa7317b6e9f457fabf1d2f476ad81ce85e2dfaf11fa2aa8d92124d5d7193ae1c0480f6cac78cd66402f2261bc995df8a35b1051b8
+  metadata.gz: 1378133321b46f3bdf9d36aad3c4a07dcc89195a56db40e412a30d9a6f0583c17f3e7dbc4a629821df4265bcb28d99b7272c575f6aed3a4cf5988c44f0b76f65
+  data.tar.gz: 25a582239c97133ac7027dbe71f52f1bb05b50c440c615f667708f706dd090bcbe4fbfacda512a8492162db66e4a2f61ee77dd96387bd99d280084b446a46147

data/README.md

@@ -21,6 +21,7 @@ Easily create a map screen, complete with annotations.
 class MyMapScreen < PM::MapScreen
   title "My Map"
   start_position latitude: 35.090648651123, longitude: -82.965972900391, radius: 4
+  tap_to_add
 
   def annotation_data
     [{
@@ -54,8 +55,7 @@ class MyMapScreen < PM::MapScreen
       your_param: "CustomWhatever",
       action: :show_forest
     }, {
-      longitude: -82.965972900391,
-      latitude: 35.090648651123,
+      coordinate: CLLocationCoordinate2DMake(35.090648651123, -82.965972900391)
       title: "Rainbow Falls",
       subtitle: "Nantahala National Forest",
       image: UIImage.imageNamed("custom-pin"),
@@ -91,8 +91,13 @@ All possible properties:
 
 ```ruby
 {
-    longitude: -82.956244328014, # REQUIRED
-    latitude: 35.085548421623, # REQUIRED
+    # REQUIRED -or- use :coordinate
+    longitude: -82.956244328014,
+    latitude: 35.085548421623,
+
+    # REQUIRED -or- use :longitude & :latitude
+    coordinate: CLLocationCoordinate2DMake(35.085548421623, -82.956244328014)
+
     title: "Stairway Falls", # REQUIRED
     subtitle: "Gorges State Park",
     image: "my_custom_image",
@@ -103,7 +108,7 @@ All possible properties:
 }
 ```
 
-You may pass whatever properties you want in the annotation hash, but `:longitude`, `:latitude`, and `:title` are required.
+You may pass whatever properties you want in the annotation hash, but (`:longitude` && `:latitude` || `:coordinate`), and `:title` are required.
 
 Use `:image` to specify a custom image. Pass in a string to conserve memory and it will be converted using `UIImage.imageNamed(your_string)`. If you pass in a `UIImage`, we'll use that, but keep in mind that there will be another unnecessary copy of the UIImage in memory.
 
@@ -131,7 +136,22 @@ Sets the center of the map. `animated` property defaults to `true`.
 
 #### show_user_location
 
-Shows the user's location on the map.
+Shows the user's location on the map. Must be called in the view initialization sequence on `will_appear` or _after_.
+
+#### look_up_location(CLLocation) { |placemark, error| }
+
+This method takes a CLLocation object and will return one to many CLPlacemark to represent nearby data.
+
+##### iOS 8 Location Requirements
+
+iOS 8 introduced stricter location services requirements. You are now required to add a few key/value pairs to the `Info.plist`. Add these two lines to your `Rakefile` (with your descriptions, obviously):
+
+```ruby
+app.info_plist['NSLocationAlwaysUsageDescription'] = 'Description'
+app.info_plist['NSLocationWhenInUseUsageDescription'] = 'Description'
+```
+
+*Note: you need both keys to use `get_once`, so it's probably best to just include both no matter what.* See [Apple's documentation](https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html#//apple_ref/doc/uid/TP40009251-SW18) on iOS 8 location services requirements for more information.
 
 #### hide_user_location
 
@@ -216,6 +236,75 @@ end
 
 `radius` is the zoom level of the map in miles (default: 10).
 
+#### tap_to_add(length: Float, target: Object, action: Selector, annotation: Hash)
+
+Lets a user long press the map to drop an annotation where they pressed.
+
+##### Default values:
+
+You can override any of these values. The `annotation` parameter can take any options specified in the annotation documentation above except `:latitude`, `:longitude`, and `:coordinate`.
+
+```ruby
+length: 2.0,
+target: self,
+action: "gesture_drop_pin:",
+annotation: {
+  title: "Dropped Pin",
+  animates_drop: true
+}
+```
+
+##### Notifications
+
+This feature posts two different `NSNotificationCenter` notifications:
+
+**ProMotionMapWillAddPin:** Fired the moment the long press gesture is recognized, before the pin is added.
+
+**ProMotionMapAddedPin:** Fired after the pin has been added to the map.
+
+##### Example:
+
+```ruby
+# Simple Example
+class MyMapScreen < PM::MapScreen
+  title "My Map Screen"
+  tap_to_add length: 1.5
+  def annotations
+    []
+  end
+end
+```
+
+```ruby
+# A More Complex Example
+class MyMapScreen < PM::MapScreen
+  title "My Map Screen"
+  tap_to_add length: 1.5, annotation: {animates_drop: true, title: "A Cool New Pin"}
+  def annotations
+    []
+  end
+
+  def will_appear
+    NSNotificationCenter.defaultCenter.addObserver(self, selector:"pin_adding:") , name:"ProMotionMapWillAddPin", object:nil)
+    NSNotificationCenter.defaultCenter.addObserver(self, selector:"pin_added:") , name:"ProMotionMapAddedPin", object:nil)
+  end
+
+  def will_disappear
+    NSNotificationCenter.defaultCenter.removeObserver(self)
+  end
+
+  def pin_adding(notification)
+    # We only want one pin on the map at a time
+    clear_annotations
+  end
+
+  def pin_added(notification)
+    # Once the pin is dropped we want to select it
+    select_annotation_at(0)
+  end
+end
+```
+
 ---
 
 ### CocoaTouch Property Convenience Methods

data/lib/ProMotion/map/map_screen_annotation.rb

@@ -7,11 +7,16 @@ module ProMotion
       @params = params
       set_defaults
 
-      unless @params[:latitude] && @params[:longitude]
-        PM.logger.error("You are required to specify :latitude and :longitude for annotations.")
-        return nil
+      if @params[:coordinate]
+        @params[:latitude] = @params[:coordinate].latitude
+        @params[:longitude] = @params[:coordinate].longitude
+        @coordinate = @params[:coordinate]
+      elsif @params[:latitude] && @params[:longitude]
+        @coordinate = CLLocationCoordinate2D.new(@params[:latitude], @params[:longitude])
+      else
+        PM.logger.error("You are required to specify :latitude and :longitude or :coordinate for annotations.")
+        nil
       end
-      @coordinate = CLLocationCoordinate2D.new(@params[:latitude], @params[:longitude])
     end
 
     def set_defaults

data/lib/ProMotion/map/map_screen_module.rb

@@ -9,6 +9,7 @@ module ProMotion
       check_annotation_data
       @promotion_annotation_data = []
       set_up_start_position
+      set_up_tap_to_add
     end
 
     def view_will_appear(animated)
@@ -160,9 +161,11 @@ module ProMotion
     end
 
     def set_start_position(params={})
-      params[:latitude] ||= 37.331789
-      params[:longitude] ||= -122.029620
-      params[:radius] ||= 10
+      params = {
+        latitude: 37.331789,
+        longitude: -122.029620,
+        radius: 10
+      }.merge(params)
 
       meters_per_mile = 1609.344
 
@@ -177,6 +180,42 @@ module ProMotion
       end
     end
 
+    def set_tap_to_add(params={})
+      params = {
+        length: 2.0,
+        target: self,
+        action: "gesture_drop_pin:",
+        annotation: {
+          title: "Dropped Pin",
+          animates_drop: true
+        }
+      }.merge(params)
+      @tap_to_add_annotation_params = params[:annotation]
+
+      lpgr = UILongPressGestureRecognizer.alloc.initWithTarget(params[:target], action:params[:action])
+      lpgr.minimumPressDuration = params[:length]
+      self.view.addGestureRecognizer(lpgr)
+    end
+
+    def gesture_drop_pin(gesture_recognizer)
+      if gesture_recognizer.state == UIGestureRecognizerStateBegan
+        NSNotificationCenter.defaultCenter.postNotificationName("ProMotionMapWillAddPin", object:nil)
+        touch_point = gesture_recognizer.locationInView(self.view)
+        touch_map_coordinate = self.view.convertPoint(touch_point, toCoordinateFromView:self.view)
+
+        add_annotation({
+          coordinate: touch_map_coordinate
+        }.merge(@tap_to_add_annotation_params))
+        NSNotificationCenter.defaultCenter.postNotificationName("ProMotionMapAddedPin", object:@promotion_annotation_data.last)
+      end
+    end
+
+    def set_up_tap_to_add
+      if self.class.respond_to?(:get_tap_to_add) && self.class.get_tap_to_add
+        self.set_tap_to_add self.class.get_tap_to_add_params
+      end
+    end
+
     # TODO: Why is this so complex?
     def zoom_to_fit_annotations(args={})
       # Preserve backwards compatibility
@@ -242,6 +281,18 @@ module ProMotion
       return geocoder.geocodeAddressString(args[:address].to_s, inRegion:args[:region].to_s, completionHandler: callback) if args[:region]
     end
 
+    def look_up_location(location, &callback)
+      location = CLLocation.alloc.initWithLatitude(location.latitude, longitude:location.longitude) if location.is_a?(CLLocationCoordinate2D)
+
+      if location.kind_of?(CLLocation)
+        geocoder = CLGeocoder.new
+        geocoder.reverseGeocodeLocation(location, completionHandler: callback)
+      else
+        PM.logger.info("You're trying to reverse geocode something that isn't a CLLocation")
+        callback.call nil, nil
+      end
+    end
+
     ########## Cocoa touch methods #################
     def mapView(map_view, viewForAnnotation:annotation)
       annotation_view(map_view, annotation)
@@ -276,6 +327,7 @@ module ProMotion
     end
 
     module MapClassMethods
+      # Start Position
       def start_position(params={})
         @start_position_params = params
         @start_position = true
@@ -288,6 +340,22 @@ module ProMotion
       def get_start_position
         @start_position ||= false
       end
+
+      # Tap to drop pin
+      def tap_to_add(params={})
+        @tap_to_add_params = params
+        @tap_to_add = true
+      end
+
+      def get_tap_to_add_params
+        @tap_to_add_params ||= nil
+      end
+
+      def get_tap_to_add
+        @tap_to_add ||= false
+      end
+
+
     end
     def self.included(base)
       base.extend(MapClassMethods)
@@ -301,6 +369,5 @@ module ProMotion
       @location_manager
     end
 
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-map
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Mark Rickert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion