Changeset 3199 for trunk/modules

Timestamp:

07/23/2008 11:44:44 AM (4 months ago)

Author:

alexsancho

Message:

added marker options support to Gmap_Marker

Location:

trunk/modules/gmaps

Files:

• controllers/gmaps_demo.php (modified) (1 diff)
• libraries/Gmap.php (modified) (1 diff)
• libraries/Gmap_Marker.php (modified) (4 diffs)

trunk/modules/gmaps/controllers/gmaps_demo.php

@@ -28 +28 @@
 
                 // Add a new marker
-                $map->add_marker(44.9801, -93.2519, '<strong>Minneapolis, MN</strong><p>Hello world!</p>');
+                $map->add_marker(44.9801, -93.2519, '<strong>Minneapolis, MN</strong><p>Hello world!</p>', array('draggable' => true, 'bouncy' => true));
 
                 View::factory('gmaps/api_demo')->set(array('api_url' => Gmap::api_url(), 'map' => $map->render()))->render(TRUE);

trunk/modules/gmaps/libraries/Gmap.php

@@ -280 +280 @@
          * @return object
          */
-        public function add_marker($lat, $lon, $html = '')
+        public function add_marker($lat, $lon, $html = '', $options = array())
         {
                 // Add a new marker
-                $this->markers[] = new Gmap_Marker($lat, $lon, $html);
+                $this->markers[] = new Gmap_Marker($lat, $lon, $html, $options);
 
                 return $this;

trunk/modules/gmaps/libraries/Gmap_Marker.php

@@ -9 +9 @@
         public $latitude;
         public $longitude;
+        
+        // Marker Options
+        protected $options = array();
+        protected $valid_options = array
+        (
+                'dragCrossMove',
+                'title',
+                'clickable',
+                'draggable',
+                'bouncy',
+                'bounceGravity',
+                'autoPan'
+        );
 
         /**
@@ -18 +31 @@
          * @return  void
          */
-        public function __construct($lat, $lon, $html)
+        public function __construct($lat, $lon, $html, $options = array())
         {
                 if ( ! is_numeric($lat) OR ! is_numeric($lon))
@@ -29 +42 @@
                 // Set the info window HTML
                 $this->html = $html;
+                
+                if (count($options) > 0)
+                {
+                        foreach ($options as $option => $value) 
+                        {
+                                if (in_array($option, $this->valid_options, true))
+                                        $this->options[$option] = $value;
+                        }
+                }
         }
 
@@ -37 +59 @@
 
                 $output = array();
-                $output[] = 'var m = new google.maps.Marker(new google.maps.LatLng('.$this->latitude.', '.$this->longitude.'));';
+                $output[] = 'var m = new google.maps.Marker(new google.maps.LatLng('.$this->latitude.', '.$this->longitude.'), '.json_encode($this->options).');';
                 if ($html = $this->html)
                 {