Changeset 3191 for trunk/modules

Timestamp:

07/22/2008 01:31:21 PM (4 months ago)

Author:

alexsancho

Message:

added default map type to center method

Files:

• trunk/modules/gmaps/libraries/Gmap.php (modified) (7 diffs)

trunk/modules/gmaps/libraries/Gmap.php

@@ -75 +75 @@
 
                 // Load Cache
-                ($cache === NULL) and $cache = Cache::instance();
-
+                if ($cache === NULL) 
+                {
+                        $cache = Cache::instance();
+                }
+                
                 // Address cache key
                 $key = 'gmap-address-'.sha1($address);
@@ -119 +122 @@
          * @param mixed $lat latitude or an array of marker points
          * @param float $lon longitude
-         * @param integer $zoom zoom level (1-16)
+         * @param integer $zoom zoom level (1-19)
          * @param string $type map type (roadmap or mobile)
          * @param integer $width map width
@@ -172 +175 @@
         // Map types
         protected $types = array();
+        protected $default_types = array
+        (
+                'G_NORMAL_MAP','G_SATELLITE_MAP','G_HYBRID_MAP','G_PHYSICAL_MAP'
+        );
 
         // Map markers
@@ -196 +203 @@
          * @param float $lat latitude
          * @param float $lon longitude
-         * @param integer $zoom zoom level (1-16)
-         * @return object
-         */
-        public function center($lat, $lon, $zoom = 6)
-        {
-                // Set center location and zoom
-                $this->center = array($lat, $lon, $zoom);
+         * @param integer $zoom zoom level (1-19)
+         * @param string $type default map type
+         * @return object
+         */
+        public function center($lat, $lon, $zoom = 6, $type = 'G_NORMAL_MAP')
+        {
+                $zoom = min(0, max(19, abs($zoom)));
+                $type = ($type != 'G_NORMAL_MAP' AND in_array($type, $this->default_types, true)) ? $type : 'G_NORMAL_MAP';
+
+                // Set center location, zoom and default map type
+                $this->center = array($lat, $lon, $zoom, $type);
 
                 return $this;
@@ -251 +262 @@
                 $this->type_control = TRUE;
 
-                $types = array
-                (
-                        'G_NORMAL_MAP','G_SATELLITE_MAP','G_HYBRID_MAP','G_PHYSICAL_MAP'
-                );
-
-                if ($type !== NULL and in_array($type, $types, true))
+                if ($type !== NULL AND in_array($type, $this->default_types, true))
                 {
                         // Set the map type and action
-                        $this->types[$type] = (strtolower($action) === 'remove') ? 'remove' : 'add';
+                        $this->types[$type] = (strtolower($action) == 'remove') ? 'remove' : 'add';
                 }
 
@@ -290 +296 @@
         public function render($template = 'gmaps/javascript')
         {
-                // Latitude, longitude, and zoom
-                list ($lat, $lon, $zoom) = $this->center;
+                // Latitude, longitude, zoom and default map type
+                list ($lat, $lon, $zoom, $default_type) = $this->center;
 
                 // Map
@@ -315 +321 @@
 
                 // Map centering
-                $center = 'map.setCenter(new google.maps.LatLng('.$lat.', '.$lon.'), '.$zoom.');';
+                $center = 'map.setCenter(new google.maps.LatLng('.$lat.', '.$lon.'), '.$zoom.', '.$default_type.');';
 
                 // Render the Javascript