ProMotion-mapbox 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a6c7b1a09e8296b378386a2508ff9803ffee0a3
-  data.tar.gz: 4f9f1e7093bb2981aeffe516cb783f033cfab280
+  metadata.gz: 363c3abe1d5611fd12f9d6dfab3bcc661b4742bc
+  data.tar.gz: 010e35765a425db7ad9ac6ce929a36c639a2d9d7
 SHA512:
-  metadata.gz: 16b2612226da961d263dc65d83f1f060238cb18d646c9fcd992961d5516534f13ab7e3c549569c23b469777ebf7bc22587835077f55eea0776bbbe43dcf11af2
-  data.tar.gz: ab5d5c5075abb292a91a3fb85650136fd9c2893fc017f9dfb2094120fedfe16e5a1fe95aa1d1ee6663d22fe361dc386980db74c6faf087a96f859ef06385e0c7
+  metadata.gz: cabba145deb2d8d12d55b946bcb5b003411e361b6e86e7dca609f6a2a3448c79815202cab1bf79d30f4643d92763109d76105a23cf19a0f132a261ff1ae4630d
+  data.tar.gz: 28df81f73618e7d0d90f3d62b4009ebdddd743daaa9509d7e66a12c800fc08a81e3263c2e76c39d9836d43b5886e9f857a46713fcdecbc1a6915e00356b8719b

data/lib/ProMotion/map/map_screen_annotation.rb

@@ -6,7 +6,6 @@ module ProMotion
       @params = params
       @map_view = map_view
       set_defaults
-
       if @params[:coordinate]
         @params[:latitude] = @params[:coordinate].latitude
         @params[:longitude] = @params[:coordinate].longitude
@@ -19,17 +18,30 @@ module ProMotion
         PM.logger.error("You are required to specify :latitude and :longitude or :coordinate for annotations.")
         nil
       end
+      self.userInfo = @params
     end
     
     def set_defaults
-      @params = {
-        title: "Title",
-        pin_color: :red,
-        identifier: "Annotation-#{@params[:pin_color]}-#{@params[:image]}",
-        show_callout: true,
-        animates_drop: false,
-        maki_icon: nil,
-      }.merge(@params)
+      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
     end
 
     def title
@@ -60,7 +72,17 @@ module ProMotion
         @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]

data/lib/ProMotion/map/map_screen_module.rb

@@ -12,7 +12,6 @@ module ProMotion
       self.view = nil
       self.view = RMMapView.alloc.initWithFrame(self.view.bounds, andTilesource:@tileSource)
       self.view.delegate = self
-
       check_annotation_data
       @promotion_annotation_data = []
       set_up_tap_to_add
@@ -31,11 +30,12 @@ module ProMotion
     def view_will_appear(animated)
       super
       update_annotation_data
+      set_up_start_center
     end
 
     def view_did_appear(animated)
       super
-      set_up_start_position
+      set_up_start_region
     end
     
     def check_annotation_data
@@ -185,9 +185,21 @@ module ProMotion
       set_region(region, animated:false)
     end
 
-    def set_up_start_position
+    def set_up_start_region
+      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
-        self.set_start_position self.class.get_start_position_params
+        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
+        )
       end
     end
 
@@ -337,8 +349,15 @@ module ProMotion
       end
     end
 
+    def empty_cache
+      map.removeAllCachedImages
+    end
+
     ########## Mapbox methods #################
     def mapView(map_view, layerForAnnotation: annotation)
+      if annotation.is_a?(RMAnnotation)
+        annotation = MapScreenAnnotation.new_with_rmannotation(annotation,self.view)
+      end
       annotation_view(map_view, annotation)
     end
 
@@ -367,6 +386,9 @@ module ProMotion
       end
     end
 
+    def tapOnCalloutAccessoryControl(control, forAnnotation: annotation, onMap: map)
+      control.sendActionsForControlEvents(UIControlEventTouchUpInside)
+    end
     ########## Cocoa touch Ruby counterparts #################
 
     def deceleration_mode

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-mapbox
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Diogo Andre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion