ProMotion-map 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730e656d5fad2888c9705a25a3344e086c3db6ff
-  data.tar.gz: d6d4d53d49f436970603a88d2c78110699900119
+  metadata.gz: 70a9a106deb0932c6dc966bca323dee405e063ee
+  data.tar.gz: a4468f012c886d110310f671c8ecccaca1089862
 SHA512:
-  metadata.gz: 6fed3989bcade0436a2ee3d5f72f695de72ba733bf846917ab9c4a76cab8b12805eab9c8754cacd353e4b2596f6f86f988b4446f0a0ec1221b72c3399be820a3
-  data.tar.gz: e583ef3a2a88df469cbc54c8df5a507508698fd6c15151f9023590120c0b890a6d8e29755eda88a57ce8fb2cd4932ca0d82a527af728f7615ad5a6453797b8a5
+  metadata.gz: 403aeea9f5b7aeb3e6cf7c51381399f6fa63a2461486c79dae772e21134c4f3b2733279cde1d761434b5ec9bc267b793180b431ee42035635753da2037688dcc
+  data.tar.gz: 075ebca199dfcfffb645195d474a362339b247fd0a5b346f2fbd34637065b2478b9a11c444adfbe0c77cf623c7a2ec0dd09e139b82bcbb4a5a9ccef7c12e703a

data/README.md

@@ -1,6 +1,8 @@
 # ProMotion-map
 
-ProMotion-map is push notification support, extracted from the 
+[![Gem Version](https://badge.fury.io/rb/ProMotion-map.svg)](http://badge.fury.io/rb/ProMotion-map) [![Build Status](https://travis-ci.org/clearsightstudio/ProMotion-map.svg)](https://travis-ci.org/clearsightstudio/ProMotion-map) [![Code Climate](https://codeclimate.com/github/clearsightstudio/ProMotion-map.png)](https://codeclimate.com/github/clearsightstudio/ProMotion-map)
+
+ProMotion-map provides a PM::MapScreen, extracted from the
 popular RubyMotion gem [ProMotion](https://github.com/clearsightstudio/ProMotion).
 
 ## Installation
@@ -19,11 +21,11 @@ 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
-  
+
   def on_appear
     update_annotation_data
   end
-  
+
   def annotation_data
     [{
       longitude: -82.965972900391,
@@ -59,7 +61,7 @@ class MyMapScreen < PM::MapScreen
     }]
   end
 
-  
+
 end
 ```
 
@@ -77,7 +79,7 @@ end
 ### Methods
 
 #### annotation_data
-      
+
 Method that is called to get the map's annotation data and build the map. If you do not want any annotations, simply return an empty array.
 
 ```ruby
@@ -117,10 +119,26 @@ def annotation_data
 end
 ```
 
+All possible properties:
+
+```ruby
+{
+    longitude: -82.956244328014,
+    latitude: 35.085548421623,
+    title: "Stairway Falls",
+    subtitle: "Gorges State Park",
+    image: "my_custom_image",
+    left_accessory: my_button,
+    right_accessory: my_other_button
+}
+```
+
 You may pass whatever properties you want in the annotation hash, but `:longitude`, `:latitude`, 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.
 
+Use `:left_accessory` and `:right_accessory` to specify a custom accessory, like a button.
+
 You can access annotation data you've arbitrarily stored in the hash by calling `annotation_instance.annotation_params[:your_param]`.
 
 #### update_annotation_data
@@ -182,7 +200,7 @@ Helper method to create an `MKCoordinateRegion`. Expects a hash in the form of:
 ```ruby
 my_region = region({
   coordinate:{
-    latitude: 35.0906, 
+    latitude: 35.0906,
     longitude: -82.965
   },
   # span is the latitude and longitude delta
@@ -195,7 +213,7 @@ my_region = region({
 ### Class Methods
 
 #### start_position(latitude: Float, longitude: Float, radius: Float)
-    
+
 Class method to set the initial starting position of the `MapScreen`.
 
 ```ruby

data/lib/ProMotion-map.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 unless defined?(Motion::Project::Config)
   raise "ProMotion-map must be required within a RubyMotion project."
 end

data/lib/ProMotion/map/map_screen_annotation.rb

@@ -17,7 +17,7 @@ module ProMotion
       @params = {
         title: "Title",
         pin_color: MKPinAnnotationColorRed,
-        identifier: "Annotation-#{@params[:pin_color] || @params[:image]}",
+        identifier: "Annotation-#{@params[:pin_color]}-#{@params[:image]}",
         show_callout: true,
         animates_drop: false
       }.merge(@params)

data/lib/ProMotion/map/map_screen_module.rb

@@ -3,10 +3,8 @@ module ProMotion
     attr_accessor :mapview
 
     def screen_setup
-      check_mapkit_included
       self.mapview ||= add MKMapView.new, {
         frame: CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height),
-        resize: [ :width, :height ],
         delegate: self
       }
 
@@ -20,10 +18,6 @@ module ProMotion
       update_annotation_data
     end
 
-    def check_mapkit_included
-      PM.logger.error "You must add MapKit and CoreLocation to your project's frameworks in the Rakefile." unless defined?(CLLocationCoordinate2D)
-    end
-
     def check_annotation_data
       PM.logger.error "Missing #annotation_data method in MapScreen #{self.class.to_s}." unless self.respond_to?(:annotation_data)
     end
@@ -119,23 +113,29 @@ module ProMotion
       @promotion_annotation_data = []
     end
 
-    def mapView(mapView, viewForAnnotation:annotation)
+    def annotation_view(map_view, annotation)
       return if annotation.is_a? MKUserLocation
 
       identifier = annotation.annotation_params[:identifier]
-      if view = mapView.dequeueReusableAnnotationViewWithIdentifier(identifier)
+      if view = map_view.dequeueReusableAnnotationViewWithIdentifier(identifier)
         view.annotation = annotation
       else
-        #Set the pin properties
+        # Set the pin properties
         if annotation.annotation_params[:image]
           view = MKAnnotationView.alloc.initWithAnnotation(annotation, reuseIdentifier:identifier)
-          view.image =  annotation.annotation_params[:image]
         else
           view = MKPinAnnotationView.alloc.initWithAnnotation(annotation, reuseIdentifier:identifier)
-          view.animatesDrop = annotation.annotation_params[:animates_drop]
-          view.pinColor = annotation.annotation_params[:pin_color]
         end
-        view.canShowCallout = annotation.annotation_params[:show_callout]
+      end
+      view.image = annotation.annotation_params[:image] if view.respond_to?("image=") && annotation.annotation_params[:image]
+      view.animatesDrop = annotation.annotation_params[:animates_drop] if view.respond_to?("animatesDrop=")
+      view.pinColor = annotation.annotation_params[:pin_color] if view.respond_to?("pinColor=")
+      view.canShowCallout = annotation.annotation_params[:show_callout] if view.respond_to?("canShowCallout=")
+      if annotation.annotation_params[:left_accessory]
+        view.leftCalloutAccessoryView = annotation.annotation_params[:left_accessory]
+      end
+      if annotation.annotation_params[:right_accessory]
+        view.rightCalloutAccessoryView = annotation.annotation_params[:right_accessory]
       end
       view
     end
@@ -175,7 +175,7 @@ module ProMotion
         bottomRight.latitude = [bottomRight.latitude, a.coordinate.latitude].min
       end
 
-      #Find the bounds of all the pins and set the mapView
+      #Find the bounds of all the pins and set the map_view
       coord = CLLocationCoordinate2D.new(
         topLeft.latitude - (topLeft.latitude - bottomRight.latitude) * 0.5,
         topLeft.longitude + (bottomRight.longitude - topLeft.longitude) * 0.5
@@ -218,7 +218,11 @@ module ProMotion
     end
 
     ########## Cocoa touch methods #################
-    def mapView(mapView, didUpdateUserLocation:userLocation)
+    def mapView(map_view, viewForAnnotation:annotation)
+      annotation_view(map_view, annotation)
+    end
+
+    def mapView(map_view, didUpdateUserLocation:userLocation)
       if self.respond_to?(:on_user_location)
         on_user_location(userLocation)
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-map
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mark Rickert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion