Changeset 3206

Timestamp:

07/25/2008 08:29:59 AM (4 months ago)

Author:

alexsancho

Message:

added initial support for custom icons

Location:

trunk/modules/gmaps

Files:

• controllers/gmaps_demo.php (modified) (2 diffs)
• libraries/Gmap.php (modified) (3 diffs)
• libraries/Gmap_Icon.php (added)
• libraries/Gmap_Marker.php (modified) (3 diffs)
• views/gmaps/javascript.php (modified) (1 diff)

trunk/modules/gmaps/controllers/gmaps_demo.php

@@ -26 +26 @@
                 // Set the map center point
                 $map->center(0, 0, 1)->controls('large')->types('G_PHYSICAL_MAP', 'add');
+                
+                // Add a custom marker icon
+            $map->add_icon('tinyIcon', array
+            (
+                        'image' => 'http://labs.google.com/ridefinder/images/mm_20_red.png',
+                        'shadow' => 'http://labs.google.com/ridefinder/images/mm_20_shadow.png',
+                        'iconSize' => array('12', '20'),
+                        'shadowSize' => array('22', '20'),
+                        'iconAnchor' => array('6', '20'),
+                        'infoWindowAnchor' => array('5', '1')
+            ));
 
                 // Add a new marker
-                $map->add_marker(44.9801, -93.2519, '<strong>Minneapolis, MN</strong><p>Hello world!</p>', array('draggable' => true, 'bouncy' => true));
+                $map->add_marker(44.9801, -93.2519, '<strong>Minneapolis, MN</strong><p>Hello world!</p>', array('icon' => 'tinyIcon', 'draggable' => true, 'bouncy' => true));
 
                 View::factory('gmaps/api_demo')->set(array('api_url' => Gmap::api_url(), 'map' => $map->render()))->render(TRUE);
@@ -56 +67 @@
                         // Add a new marker
                         $map->add_marker($location->lat, $location->lon,
-                                // Get the info window HTML
-                                View::factory('gmaps/info_window')->bind('location', $location)->render());
+                        
+                        // Get the info window HTML
+                        View::factory('gmaps/info_window')->bind('location', $location)->render());
                 }
 

trunk/modules/gmaps/libraries/Gmap.php

@@ -179 +179 @@
                 'G_NORMAL_MAP','G_SATELLITE_MAP','G_HYBRID_MAP','G_PHYSICAL_MAP'
         );
+        
+        // Markers icons
+        protected $icons = array();
 
         // Map markers
@@ -269 +272 @@
 
                 return $this;
+        }
+        
+        /**
+         * Create a custom marker icon
+         *
+         * @chainable
+         * @param string $name icon name
+         * @param array $options icon options
+         * @return object
+         */
+        public function add_icon($name, array $options)
+        {
+            // Add a new cusotm icon
+            $this->icons[] = new Gmap_Icon($name, $options);
+            
+            return $this;
         }
 
@@ -330 +349 @@
                                 'controls' => implode("\n", $controls),
                                 'center' => $center,
+                                'icons' => $this->icons,
                                 'markers' => $this->markers,
                         ))

trunk/modules/gmaps/libraries/Gmap_Marker.php

@@ -17 +17 @@
         protected $valid_options = array
         (
+                'icon',
                 'dragCrossMove',
                 'title',
@@ -53 +54 @@
                                 // Set marker options
                                 if (in_array($option, $this->valid_options, true))
-                                        $this->options[$option] = $value;
+                                        $this->options[] = "$option:$value";
                         }
                 }
@@ -66 +67 @@
                 $marker = 'm'.++self::$id;
 
-                $output[] = 'var '.$marker.' = new google.maps.Marker(new google.maps.LatLng('.$this->latitude.', '.$this->longitude.'), '.json_encode($this->options).');';
+                $output[] = 'var '.$marker.' = new google.maps.Marker(new google.maps.LatLng('.$this->latitude.', '.$this->longitude.'), {'.implode(",", $this->options).'});';
                 if ($html = $this->html)
                 {

trunk/modules/gmaps/views/gmaps/javascript.php

@@ -7 +7 @@
         <?php echo $center, "\n" ?>
         <?php echo $options->render(1), "\n" ?>
+        
+        // Build custom marker icons
+        <?php foreach($icons as $icon): ?>
+        <?php echo $icon->render(1), "\n" ?>
+        <?php endforeach ?>
 
         // Show map points
-        <?php foreach ($markers as $marker): ?>
+        <?php foreach($markers as $marker): ?>
         <?php echo $marker->render(1), "\n" ?>
         <?php endforeach ?>