ProMotion-mapbox 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26efa825778c8d404ae1b130789880090096ad49
-  data.tar.gz: 60f111c8d989685b78ebd3aae625b3d26ce3f566
+  metadata.gz: 5c26888901adec0750d41242b2120fb1c6d2e73c
+  data.tar.gz: 7340940dd5deb688654f3f3b47cd0124e5932f81
 SHA512:
-  metadata.gz: 3055a5af508968019dea7844bb218e8bf73136698a18999d81d02cc40adb7b6b4e25d131c975a8c302758c1b0aa1f5ebbc8babba3661249dfd6562c3c74c3f63
-  data.tar.gz: b56900cc7a9d02c5e45f8992d9a6682297c56fdc17881a1901cbdfd6ab906e4996e534095291b900a26ccd0eae9814594ab5e87d05a74037c6e7c708cf4f0166
+  metadata.gz: 79a7d189d2a8a1cd8d2c8f68a56c432139ab83e386e33e67b4134fe084f6f52400a7b8564bfe9a32d41c86f39eb5742c6ccfe5c4ae097bf8afdccf53e16e8d18
+  data.tar.gz: b0eb414d8389ebaf6fd139dfc88765fc729a4c488424f6f8ece6c27e8a7516939db93be252e6d4c772c17b390b38a80f39796d4a5ef94145840be7237b008107

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/ProMotion-mapbox.svg)](http://badge.fury.io/rb/ProMotion-mapbox)
 
-ProMotion-mapbox provides a PM::MapScreen, forked from the
+ProMotion-mapbox provides a PM::MapScreen that users [Mapbox](https://www.mapbox.com) as the map provider. Forked from the
 popular RubyMotion gem [ProMotion-map](https://github.com/clearsightstudio/ProMotion-map).
 
 ## Installation
@@ -23,9 +23,6 @@ Easily create a map screen, complete with annotations.
 
 ```ruby
 class MyMapScreen < PM::MapScreen
-    mapbox_setup access_token: "YOU_MAPBOX_ACCESS_TOKEN",
-    tile_source: "mylogin.map"
-
   title "My Map"
   start_position latitude: 35.090648651123, longitude: -82.965972900391, radius: 4
   tap_to_add
@@ -36,39 +33,40 @@ class MyMapScreen < PM::MapScreen
       latitude: 35.090648651123,
       title: "Rainbow Falls",
       subtitle: "Nantahala National Forest",
-      action: :show_forest,
+      left_action: :show_forest,
       pin_color: :green
     },{
       longitude: -82.966093558105,
       latitude: 35.092520895652,
       title: "Turtleback Falls",
       subtitle: "Nantahala National Forest",
-      action: :show_forest,
-      pin_color: :purple]
+      left_action: :show_forest,
+      left_action_button_type: UIButtonTypeContactAdd,
+      pin_color: :red
     },{
       longitude: -82.95916,
       latitude: 35.07496,
       title: "Windy Falls",
-      action: :show_forest
+      left_action: :show_forest
     },{
       longitude: -82.943031505056,
       latitude: 35.102516828489,
       title: "Upper Bearwallow Falls",
       subtitle: "Gorges State Park",
-      action: :show_forest
+      left_action: :show_forest
     },{
       longitude: -82.956244328014,
       latitude: 35.085548421623,
       title: "Stairway Falls",
       subtitle: "Gorges State Park",
       your_param: "CustomWhatever",
-      action: :show_forest
-    }, {
-      coordinate: CLLocationCoordinate2DMake(35.090648651123, -82.965972900391)
+      right_action: :show_forest
+    },{
+      coordinate: CLLocationCoordinate2DMake(35.090648651123, -82.965972900391),
       title: "Rainbow Falls",
       subtitle: "Nantahala National Forest",
       image: UIImage.imageNamed("custom-pin"),
-      action: :show_forest
+      left_action: :show_forest
     }]
   end
 
@@ -83,7 +81,7 @@ Here's a neat way to zoom into a specific marker in an animated fashion and then
 
 ```ruby
 def zoom_to_marker(marker)
-  set_region region(coordinate: marker.coordinate, radius: 5) # Radius are specified in nautical miles.
+    set_region region(coordinate: marker.coordinate, radius: 5) # Radius are specified in nautical miles.
   select_annotation marker
 end
 ```
@@ -110,7 +108,7 @@ All possible properties:
     title: "Stairway Falls", # REQUIRED
     subtitle: "Gorges State Park",
     image: "my_custom_image",
-    pin_color: :red, # Defaults to :red. Other options are :green or :purple or any UIColor
+    pin_color: :red, # Defaults to :red. Other options are :green or :purple. Here as a placeholder only. Modifying a marker color is not yet supported by the Mapbox GL SDK.
     left_accessory: my_button,
     right_accessory: my_other_button,
     action: :my_action, # Overrides :right_accessory
@@ -124,6 +122,8 @@ Use `:image` to specify a custom image. Pass in a string to conserve memory and
 
 Use `:left_accessory` and `:right_accessory` to specify a custom accessory, like a button.
 
+Use `:left_action` and `:right_action` to specify an action for the left or right accessory view. These properties will create a button for you, and should not be used in conjunction with `:left_accessory` or `:right_accessory`. The type of the button can be specified with the optional parameter `:right_action_button_type`, and defaults to UIButtonTypeDetailDisclosure if not specified.
+
 You can access annotation data you've arbitrarily stored in the hash by calling `annotation_instance.params[:your_param]`.
 
 The `:action` parameter specifies a method that should be run when the detail button is tapped on the annotation. It automatically adds a `UIButtonTypeDetailDisclosure` button to the `:left_accessory`. In your method you can find out which annotation's accessory was tapped by calling `selected_annotations.first`.
@@ -187,13 +187,13 @@ Selects a single annotation.
 
 Selects a single annotation using the annotation at the index of your `annotation_data` array.
 
-#### selected_annotation
+#### selected_annotations
 
-Returns the annotation that is selected. If no annotation is selected, returns `nil`.
+Returns an array of annotations that are selected. If no annotations are selected, returns `nil`.
 
-#### deselect_annotation(animated=false)
+#### deselect_annotations(animated=false)
 
-Deselects any selected annotation.
+Deselects all selected annotations.
 
 #### add_annotation(annotation)
 
@@ -217,7 +217,7 @@ Sets the region of the `MapScreen`. `region` should be an instance of `MKCoordin
 
 #### region(center_location,radius=10)
 
-Mapbox API doesn't have the concept of a region. Instead, we can zoom to a virtual bounding box defined by its Sourthwest and Northeast
+Mapbox doesn't use the concept of regions. Instead, we can zoom to a virtual bounding box defined by its Sourthwest and Northeast
 corners.
 The ```region``` methods takes a ```center_location``` and a radius. The distance from the center to the corners (and thus the zoom level) will be the ```radius``` times 1820 meters (1 Nautical mile)
 
@@ -226,7 +226,6 @@ my_region = region({
   CLLocationCoordinate2D.new(35.0906,-82.965),
   radius: 11
 })
-```
 
 ---
 
@@ -293,8 +292,8 @@ class MyMapScreen < PM::MapScreen
   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)
+    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
@@ -364,7 +363,7 @@ rotate_enabled = (bool)enabled
 
 #### `map` or `mapview`
 
-Reference to the created RMMapView.
+Reference to the created MLGMapView.
 
 ## Contributing
 

data/lib/ProMotion-mapbox.rb

@@ -3,18 +3,14 @@ unless defined?(Motion::Project::Config)
   raise "ProMotion-mapbox must be required within a RubyMotion project."
 end
 
-require 'motion-cocoapods'
-
 Motion::Project::App.setup do |app|
   lib_dir_path = File.dirname(File.expand_path(__FILE__))
   app.files << File.join(lib_dir_path, "ProMotion/map/map_screen_annotation.rb")
   app.files << File.join(lib_dir_path, "ProMotion/map/map_screen_module.rb")
   app.files << File.join(lib_dir_path, "ProMotion/map/map_screen.rb")
 
-  app.frameworks += %w(CoreLocation)
-
+  app.frameworks += %w(CoreLocation QuartzCore)
   app.pods do
-    pod "Mapbox-iOS-SDK"
+    pod 'Mapbox-iOS-SDK'
   end
-
 end

data/lib/ProMotion/map/map_screen_annotation.rb

@@ -1,47 +1,35 @@
 module ProMotion
-  class MapScreenAnnotation < RMAnnotation
+  class MapScreenAnnotation
     attr_reader :params
 
-    def initialize(params = {},map_view)
+    # Creates the new annotation object
+    def initialize(params = {})
       @params = params
-      @map_view = map_view
       set_defaults
+
       if @params[:coordinate]
         @params[:latitude] = @params[:coordinate].latitude
         @params[:longitude] = @params[:coordinate].longitude
         @coordinate = @params[:coordinate]
-        initWithMapView(map_view, coordinate: @coordinate, andTitle: @params[:title])
       elsif @params[:latitude] && @params[:longitude]
         @coordinate = CLLocationCoordinate2D.new(@params[:latitude], @params[:longitude])
-        initWithMapView(map_view, coordinate: @coordinate, andTitle: @params[:title])
       else
         PM.logger.error("You are required to specify :latitude and :longitude or :coordinate for annotations.")
         nil
       end
-      self.userInfo = @params
     end
-    
+
     def set_defaults
-      if @params.class == Hash
-        @params = {
-          title: "Title",
-          pin_color: :red,
-          identifier: "Annotation-#{@params[:pin_color]}-#{@params[:image]}",
-          show_callout: true,
-          animates_drop: false,
-          maki_icon: nil,
-        }.merge(@params)
-      elsif  @params.class == RMQuadTreeNode # Clustered pins 
-        @params = {
-          title: @params.annotations.count,
-          coordinate: @params.clusterAnnotation.coordinate,
-          pin_color: :purple,
-          identifier: "Annotation-cluster",
-          show_callout: true,
-          animates_drop: false,
-          maki_icon: nil,
-        }
-      end
+      @params = {
+        title: "Title",
+        pin_color: :red,
+        identifier: "Annotation-#{@params[:pin_color]}-#{@params[:image]}",
+        show_callout: true,
+        animates_drop: false,
+        image: nil,
+        left_accessory: nil,
+        right_accessory: nil,
+      }.merge(@params)
     end
 
     def title
@@ -55,34 +43,27 @@ module ProMotion
     def coordinate
       @coordinate
     end
-    
-    def pin_color
-      @params[:pin_color]
+
+    def left_accessory
+      @params[:left_accessory]
+    end
+
+    def right_accessory
+      @params[:right_accessory]
     end
 
     def cllocation
       CLLocation.alloc.initWithLatitude(@params[:latitude], longitude:@params[:longitude])
     end
 
-    def setCoordinate(new_coordinate)
-      super
+    def setCoordinate(new_coordinate);
       if new_coordinate.is_a? Hash
         @coordinate = CLLocationCoordinate2D.new(new_coordinate[:latitude], new_coordinate[:longitude])
       else
         @coordinate = new_coordinate
       end
     end
-    
-    def self.new_with_rmannotation(rmannotation,map_view)
-      annotation = self.new(rmannotation.userInfo, map_view)
-      %w(coordinate title subtitle userInfo annotationType annotationIcon 
-      position layer clusteringEnabled 
-      isClusterAnnotation isUserLocationAnnotation).each do |meth|
-        annotation.send("#{meth}=", rmannotation.send(meth))
-      end
-      annotation
-    end
-    
+
     def method_missing(meth, *args)
       if @params[meth.to_sym]
         @params[meth.to_sym]
@@ -92,5 +73,11 @@ module ProMotion
       end
     end
 
+    # Deprecated
+    def annotation_params
+      PM.logger.warn("annotation.annotation_params is deprecated and will be removed soon. Please use annotation.params instead.")
+      @params
+    end
+
   end
 end

data/lib/ProMotion/map/map_screen_module.rb

@@ -6,38 +6,22 @@ module ProMotion
       green: UIColor.greenColor,
       purple: UIColor.purpleColor
     }
-        
+
     def screen_setup
-      mapbox_setup
       self.view = nil
-      self.view = RMMapView.alloc.initWithFrame(self.view.bounds, andTilesource:@tileSource)
+      self.view = MGLMapView.alloc.initWithFrame(self.view.bounds, styleURL: self.class.get_map_style)
       self.view.delegate = self
+
       check_annotation_data
       @promotion_annotation_data = []
+      set_up_start_position
       set_up_tap_to_add
     end
-    
-    def mapbox_setup
-      if self.class.respond_to?(:get_mapbox_setup) && self.class.get_mapbox_setup
-        setup_params = self.class.get_mapbox_setup_params
-      else
-        PM.logger.error "Missing Mapbox setup data."
-      end
-      RMConfiguration.sharedInstance.setAccessToken(setup_params[:access_token]) if RMConfiguration.sharedInstance.accessToken.nil?
-      @tileSource = RMMapboxSource.alloc.initWithMapID(setup_params[:tile_source])
-    end
-    
-    def view_will_appear(animated)
-      super
+
+    def on_appear
       update_annotation_data
-      set_up_start_center
     end
 
-    def view_did_appear(animated)
-      super
-      set_up_start_region
-    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
@@ -46,7 +30,7 @@ module ProMotion
       clear_annotations
       add_annotations annotation_data
     end
-    
+
     def map
       self.view
     end
@@ -80,8 +64,9 @@ module ProMotion
       set_show_user_location false
     end
 
-    def set_show_user_location(show)
+    def set_show_user_location(show,mode=MGLUserTrackingModeFollow)
       self.view.showsUserLocation = show
+      self.view.userTrackingMode = mode
     end
 
     def showing_user_location?
@@ -93,7 +78,7 @@ module ProMotion
     end
 
     def user_annotation
-      self.view.userLocation.nil? ? nil : self.view.userLocation.location
+      self.view.userLocation.location.nil? ? nil : self.view.userLocation.location
     end
 
     def zoom_to_user(radius = 0.05, animated=true)
@@ -113,65 +98,36 @@ module ProMotion
       select_annotation(annotations[annotation_index], animated:animated)
     end
 
-    def selected_annotation
-      self.view.selectedAnnotation
+    def selected_annotations
+      self.view.selectedAnnotations
     end
 
-    def deselect_annotation(animated=false)
-      unless selected_annotation.nil?
-        self.view.deselectAnnotation(selected_annotation, animated:animated)
+    def deselect_annotations(animated=false)
+      unless selected_annotations.nil?
+        selected_annotations.each do |annotation|
+          self.view.deselectAnnotation(annotation, animated:animated)
+        end
       end
     end
 
     def add_annotation(annotation)
-      @promotion_annotation_data << MapScreenAnnotation.new(annotation,self.view)
+      @promotion_annotation_data << MapScreenAnnotation.new(annotation)
       self.view.addAnnotation @promotion_annotation_data.last
     end
 
     def add_annotations(annotations)
-      @promotion_annotation_data = Array(annotations).map{|a| MapScreenAnnotation.new(a,self.view)}
+      @promotion_annotation_data = Array(annotations).map{|a| MapScreenAnnotation.new(a)}
       self.view.addAnnotations @promotion_annotation_data
     end
 
-    def clear_annotations
-      @promotion_annotation_data.each do |a|
-        self.view.removeAnnotation(a)
-      end
-      @promotion_annotation_data = []
+    def clear_annotation(annotation)
+      self.view.removeAnnotation(annotation)
+      @promotion_annotation_data.delete(annotation)
     end
 
-    def annotation_view(map_view, annotation)
-      return if annotation.is_a? RMUserLocation
-
-      params = annotation.params
-
-      identifier = params[:identifier]
-      # Set the pin properties
-      if params[:image]
-        view = RMMarker.alloc.initWithUIImage(params[:image])
-      else
-        pinColor = (PIN_COLORS[params[:pin_color]] || params[:pin_color])
-        view = RMMarker.alloc.initWithMapboxMarkerImage(params[:maki_icon], tintColor: pinColor)
-      end
-      view.annotation = annotation
-      view.canShowCallout = params[:show_callout] if view.respond_to?("canShowCallout=")
-
-      if params[:left_accessory]
-        view.leftCalloutAccessoryView = params[:left_accessory]
-      end
-      if params[:right_accessory]
-        view.rightCalloutAccessoryView = params[:right_accessory]
-      end
-
-      if params[:action]
-        button_type = params[:action_button_type] || UIButtonTypeDetailDisclosure
-
-        action_button = UIButton.buttonWithType(button_type)
-        action_button.addTarget(self, action: params[:action], forControlEvents:UIControlEventTouchUpInside)
-
-        view.rightCalloutAccessoryView = action_button
-      end
-      view
+    def clear_annotations
+      self.view.removeAnnotations(@promotion_annotation_data)
+      @promotion_annotation_data = []
     end
 
     def set_start_position(params={})
@@ -180,26 +136,15 @@ module ProMotion
         longitude: -122.029620,
         radius: 10
       }.merge(params)
+
       initialLocation = CLLocationCoordinate2D.new(params[:latitude], params[:longitude])
       region = create_region(initialLocation,params[:radius])
       set_region(region, animated:false)
     end
 
-    def set_up_start_region
+    def set_up_start_position
       if self.class.respond_to?(:get_start_position) && self.class.get_start_position
-        start_params = self.class.get_start_position_params
-        self.set_start_position start_params unless start_params[:radius].nil?
-      end
-    end
-    
-    def set_up_start_center
-      if self.class.respond_to?(:get_start_position) && self.class.get_start_position
-        start_params = self.class.get_start_position_params
-        start_params[:zoom] ||= 5
-        self.view.setZoom(start_params[:zoom], atCoordinate: 
-          CLLocationCoordinate2D.new(start_params[:latitude], start_params[:longitude]), 
-          animated: false
-        )
+        self.set_start_position self.class.get_start_position_params
       end
     end
 
@@ -281,13 +226,13 @@ module ProMotion
     end
 
     def set_region(region, animated=true)
-      self.view.zoomWithLatitudeLongitudeBoundsSouthWest(
-        region[:southWest],
-        northEast: region[:northEast], 
+      self.view.setVisibleCoordinateBounds(
+        [region[:southWest], region[:northEast]],
         animated: animated
       )
     end
-        
+
+    ###### REGION SETTINGS #######
     def deg_to_rad(angle)
       angle*Math::PI/180
     end
@@ -308,17 +253,17 @@ module ProMotion
                           Math.cos(input_latitude) * Math.sin(distance) * 
                           Math.cos(bearing)
                         )
-      
+
       dlon = input_longitude + Math.atan2(
                                 Math.sin(bearing) * Math.sin(distance) * 
                                 Math.cos(input_longitude), Math.cos(distance) - 
                                 Math.sin(input_longitude) * Math.sin(output_latitude)
                               )
-      
+
       output_longitude = (dlon + 3*Math::PI) % (2*Math::PI) - Math::PI  
       CLLocationCoordinate2DMake(rad_to_deg(output_latitude), rad_to_deg(output_longitude))
     end
-    
+
     def create_region(initialLocation,radius=10)
       return nil unless initialLocation.is_a? CLLocationCoordinate2D
       radius = radius * 1.820 # Meters equivalent to 1 Nautical Mile
@@ -327,7 +272,17 @@ module ProMotion
       {:southWest => southWest, :northEast => northEast}
     end
     alias_method :region, :create_region
-    
+
+    ##### END REGION SETTINGS ######
+    ##### MAP STYLE SETTINGS  ######
+    def set_map_style
+      if self.class.respond_to?(:get_map_style)
+          self.view.styleURL = self.class.get_map_style
+      end
+    end
+    ##### END MAP STYLE SETTINGS  ######
+
+
     def look_up_address(args={}, &callback)
       args[:address] = args if args.is_a? String # Assume if a string is passed that they want an address
 
@@ -349,16 +304,52 @@ module ProMotion
       end
     end
 
-    def empty_cache
-      map.removeAllCachedImages
+    ########## Mapbox GL methods #################
+    def mapView(mapView, annotationCanShowCallout: annotation)
+      return nil if annotation.is_a? MGLUserLocation
+      annotation.params[:show_callout]
     end
 
-    ########## Mapbox methods #################
-    def mapView(map_view, layerForAnnotation: annotation)
-      if annotation.is_a?(RMAnnotation)
-        annotation = MapScreenAnnotation.new_with_rmannotation(annotation,self.view)
+    def mapView(mapView, imageForAnnotation: annotation)
+      return nil unless annotation.params[:image]
+      annotationImage = mapView.dequeueReusableAnnotationImageWithIdentifier(annotation.params[:image])
+      if !annotationImage
+        image = UIImage.imageNamed(annotation.params[:image])
+        annotationImage = MGLAnnotationImage.annotationImageWithImage(image, reuseIdentifier: annotation.params[:image])
+        return annotationImage
+      end
+    end
+
+    def mapView(mapview, leftCalloutAccessoryViewForAnnotation: annotation)
+      if annotation.params[:left_action]
+        button_type = annotation.params[:left_action_button_type] || UIButtonTypeDetailDisclosure
+        action_button = UIButton.buttonWithType(button_type)
+
+        action_button
+      else
+        annotation.left_accessory
+      end
+    end
+
+    def mapView(mapview, rightCalloutAccessoryViewForAnnotation: annotation)
+      if annotation.params[:right_action]
+        button_type = annotation.params[:right_action_button_type] || UIButtonTypeDetailDisclosure
+        action_button = UIButton.buttonWithType(button_type)
+        action_button.tag = 1
+
+        action_button
+      else
+        annotation.right_accessory
+      end
+    end
+
+    def mapView(mapView, annotation: annotation, calloutAccessoryControlTapped: accessory)
+      return nil unless annotation.params[:left_action] || annotation.params[:right_action]
+      if accessory.tag == 1
+        self.send(annotation.params[:right_action])
+      else
+        self.send(annotation.params[:left_action])
       end
-      annotation_view(map_view, annotation)
     end
 
     ########## Cocoa touch methods #################
@@ -386,22 +377,19 @@ module ProMotion
       end
     end
 
-    def tapOnCalloutAccessoryControl(control, forAnnotation: annotation, onMap: map)
-      control.sendActionsForControlEvents(UIControlEventTouchUpInside)
-    end
     ########## Cocoa touch Ruby counterparts #################
 
-    def deceleration_mode
-      map.decelerationMode
+    def type
+      map.mapType
     end
 
-    def deceleration_mode=(mode)
-      map.decelerationMode = mode
+    def type=(type)
+      map.mapType = type
     end
 
-    %w(dragging bouncing clustering).each do |meth|
+    %w(zoom scroll pitch rotate).each do |meth|
       define_method("#{meth}_enabled?") do
-        map.send("#{meth}Enabled")
+        map.send("is#{meth.capitalize}Enabled")
       end
 
       define_method("#{meth}_enabled=") do |argument|
@@ -437,21 +425,15 @@ module ProMotion
       def get_tap_to_add
         @tap_to_add ||= false
       end
-      
-      # Mapbox setup
-      def mapbox_setup(params={})
-        @mapbox_setup_params = params
-        @mapbox_setup = true
-      end
-      
-      def get_mapbox_setup_params
-        @mapbox_setup_params ||= nil
+
+      def map_style(style)
+        @map_style_url = NSURL.URLWithString("asset://styles/#{style}.json")
       end
-      
-      def get_mapbox_setup
-        @mapbox_setup ||= false
+
+      def get_map_style
+        @map_style_url ||= map_style(:light)
       end
-      
+
 
     end
     def self.included(base)

metadata

@@ -1,83 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-mapbox
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Diogo Andre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-stump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: motion-redgreen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: motion_print
+  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: 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'
 description: Adds PM::MapScreen support to ProMotion, using Mapbox as map provider.
@@ -88,10 +102,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- lib/ProMotion-mapbox.rb
 - lib/ProMotion/map/map_screen.rb
 - lib/ProMotion/map/map_screen_annotation.rb
 - lib/ProMotion/map/map_screen_module.rb
-- lib/ProMotion-mapbox.rb
 homepage: https://github.com/diogoandre/ProMotion-mapbox
 licenses:
 - MIT
@@ -102,17 +116,17 @@ require_paths:
 - lib
 required_ruby_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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Adds PM::MapScreen support to ProMotion, using Mapbox as map provider. Forked