Changeset 3181 for trunk/modules

Timestamp:

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

Author:

Shadowhand

Message:

More updates to Gmap:

• api_uri renamed to api_url (duh)
  
• address_to_xml now uses api_url
  

Files:

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

trunk/modules/gmaps/libraries/Gmap.php

@@ -19 +19 @@
          * @return  string
          */
-         public static function api_uri($component = 'jsapi', $parameters = NULL)
+         public static function api_url($component = 'jsapi', $parameters = NULL)
          {
-                if (empty($parameters['key']))
-                {
-                        // Set the API key
-                        $parameters['key'] = Kohana::config('gmaps.api_key');
-                }
-
                 if (empty($parameters['ie']))
                 {
@@ -39 +33 @@
                 }
 
-                return html::specialchars('http://www.google.com/'.$component.'?'.http_build_query($parameters), FALSE);
+                if (empty($parameters['key']))
+                {
+                        // Set the API key last
+                        $parameters['key'] = Kohana::config('gmaps.api_key');
+                }
+
+                return 'http://www.google.com/'.$component.'?'.http_build_query($parameters);
          }
 
@@ -87 +87 @@
                 else
                 {
+                        // Set the XML URL
+                        $xml = Gmap::api_url('maps/geo', array('output' => 'xml', 'q' => rawurlencode($address)));
+
                         // Disable error reporting while fetching the feed
                         $ER = error_reporting(~E_NOTICE);
 
                         // Load the XML
-                        $xml = simplexml_load_file
-                        (
-                                'http://maps.google.com/maps/geo?'.
-                                '&output=xml'.
-                                '&oe=utf-8'.
-                                '&key='.Kohana::config('gmaps.api_key'). // Get the API key
-                                '&q='.rawurlencode($address) // Send the address URL encoded
-                        );
+                        $xml = simplexml_load_file($xml);
 
                         if (is_object($xml) AND ($xml instanceof SimpleXMLElement) AND (int) $xml->Response->Status->code === 200)
@@ -163 +159 @@
                 }
 
-        return Gmap::api_uri('staticmap', $parameters);
+        return Gmap::api_url('staticmap', $parameters);
         }