ProMotion-map 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8240e335c3b662a901157fbb77f9ebb3e2e687db
-  data.tar.gz: c56b64500694327784914a24deed09373615ccb9
+  metadata.gz: 35f4a8eac3b35aab4e6ce647f13b70067874101f
+  data.tar.gz: a3c5d1fb7fadb59a956ea90d7125ec060071df63
 SHA512:
-  metadata.gz: bfbd94ade841e4def1627d3c54f96e2a81b3d1967d24652efc19e2ee3e0a69e6374d1870d7e0561ec9f8f101a70e1f87de463d7247cb66bc42a7307123939592
-  data.tar.gz: fb25b102018267b8ef5a57081c1e59fcd869f3f5435543546a3f1486ce67b38fa56d67a777bf431b1ef4247a3546afea5c54abef9d39fd4461981f7b6cac3ef1
+  metadata.gz: 1de93a95d1294c9d1a2c6ed575c4f381835746a5674790a0883fd2ad8bc0de53ad6c5986ba1441a4519def05c5bd231c1e5ff7f6641860937ca0bb5a562eb849
+  data.tar.gz: 0cf359ef14f0c4978c45f13545d18db814ab9b1f5440bd55b2b3cb0227c4bd9ed6ba03d3f5119b197a7b6d4b53d4fe81a9d7a802efa5834b1fa31a5b6b8b285a

data/README.md

@@ -218,9 +218,32 @@ end
 
 ---
 
+### CocoaTouch Property Convenience Methods
+
+`MKMapView` contains multiple property setters and getters that can be accessed in a more ruby-like syntax:
+
+```ruby
+type # Returns a MKMapType
+type = (MKMapType)new_type
+
+zoom_enabled?
+zoom_enabled = (bool)enabled
+
+scroll_enabled?
+scroll_enabled = (bool)enabled
+
+pitch_enabled?
+pitch_enabled = (bool)enabled
+
+rotate_enabled?
+rotate_enabled = (bool)enabled
+```
+
+---
+
 ### Accessors
 
-#### mapview
+#### `map` or `mapview`
 
 Reference to the created UIMapView.
 

data/lib/ProMotion/map/map_screen_module.rb

@@ -1,12 +1,10 @@
 module ProMotion
   module MapScreenModule
-    attr_accessor :mapview
 
     def screen_setup
-      self.mapview ||= add MKMapView.new, {
-        frame: CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height),
-        delegate: self
-      }
+      self.view = nil
+      self.view = MKMapView.alloc.initWithFrame(self.view.bounds)
+      self.view.delegate = self
 
       check_annotation_data
       @promotion_annotation_data = []
@@ -28,11 +26,12 @@ module ProMotion
     end
 
     def map
-      self.mapview
+      self.view
     end
+    alias_method :mapview, :map
 
     def center
-      self.mapview.centerCoordinate
+      self.view.centerCoordinate
     end
 
     def center=(params={})
@@ -41,7 +40,7 @@ module ProMotion
       params[:animated] ||= true
 
       # Set the new region
-      self.mapview.setCenterCoordinate(
+      self.view.setCenterCoordinate(
         CLLocationCoordinate2D.new(params[:latitude], params[:longitude]),
         animated:params[:animated]
       )
@@ -56,15 +55,15 @@ module ProMotion
     end
 
     def set_show_user_location(show)
-      self.mapview.showsUserLocation = show
+      self.view.showsUserLocation = show
     end
 
     def showing_user_location?
-      self.mapview.showsUserLocation
+      self.view.showsUserLocation
     end
 
     def user_location
-      self.mapview.userLocation.location.nil? ? nil : self.mapview.userLocation.location.coordinate
+      self.view.userLocation.location.nil? ? nil : self.view.userLocation.location.coordinate
     end
 
     def zoom_to_user(radius = 0.05, animated=true)
@@ -77,7 +76,7 @@ module ProMotion
     end
 
     def select_annotation(annotation, animated=true)
-      self.mapview.selectAnnotation(annotation, animated:animated)
+      self.view.selectAnnotation(annotation, animated:animated)
     end
 
     def select_annotation_at(annotation_index, animated=true)
@@ -85,30 +84,30 @@ module ProMotion
     end
 
     def selected_annotations
-      self.mapview.selectedAnnotations
+      self.view.selectedAnnotations
     end
 
     def deselect_annotations(animated=false)
       unless selected_annotations.nil?
         selected_annotations.each do |annotation|
-          self.mapview.deselectAnnotation(annotation, animated:animated)
+          self.view.deselectAnnotation(annotation, animated:animated)
         end
       end
     end
 
     def add_annotation(annotation)
       @promotion_annotation_data << MapScreenAnnotation.new(annotation)
-      self.mapview.addAnnotation @promotion_annotation_data.last
+      self.view.addAnnotation @promotion_annotation_data.last
     end
 
     def add_annotations(annotations)
       @promotion_annotation_data = Array(annotations).map{|a| MapScreenAnnotation.new(a)}
-      self.mapview.addAnnotations @promotion_annotation_data
+      self.view.addAnnotations @promotion_annotation_data
     end
 
     def clear_annotations
       @promotion_annotation_data.each do |a|
-        self.mapview.removeAnnotation(a)
+        self.view.removeAnnotation(a)
       end
       @promotion_annotation_data = []
     end
@@ -200,13 +199,13 @@ module ProMotion
       )
 
       region = MKCoordinateRegionMake(coord, span)
-      fits = self.mapview.regionThatFits(region);
+      fits = self.view.regionThatFits(region);
 
       set_region(fits, animated:animated)
     end
 
     def set_region(region, animated=true)
-      self.mapview.setRegion(region, animated:animated)
+      self.view.setRegion(region, animated:animated)
     end
 
     def region(params)
@@ -242,6 +241,26 @@ module ProMotion
       end
     end
 
+    ########## Cocoa touch Ruby counterparts #################
+
+    def type
+      map.mapType
+    end
+
+    def type=(type)
+      map.mapType = type
+    end
+
+    %w(zoom scroll pitch rotate).each do |meth|
+      define_method("#{meth}_enabled?") do
+        map.send("is#{meth.capitalize}Enabled")
+      end
+
+      define_method("#{meth}_enabled=") do |argument|
+        map.send("#{meth}Enabled=", argument)
+      end
+    end
+
     module MapClassMethods
       def start_position(params={})
         @start_position_params = params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-map
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mark Rickert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-29 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.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Adds PM::MapScreen support to ProMotion. Extracted from ProMotion.