switched to google maps v3

.gitignore

@@ -0,0 +1 @@
+/app/config/config.php

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/lib/pillow"]
+	path = app/lib/pillow
+	url = git://github.com/robap/pillow.git

app/config/config.template.php

@@ -5,7 +5,6 @@
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  */
 $config = array(
-    'google_api_key'        => '',
     'google_tracker_key'    => '',
     'zillow_api_key'        => '',
     'pillow_install'        => '../pillow/'

app/lib/Geocoder.php

@@ -6,13 +6,11 @@
  */
 class Google_Geocoder
 {
-    private $_key;
-
     private $_addresses = array();
 
-    public function __construct( $key )
+    public function __construct()
     {
-        $this->_key = $key;
+
     }
 
     /**
@@ -43,13 +41,9 @@ public function geocode( $address )
      */
     private function _getUri( $address )
     {
-        $uri  = "http://maps.google.com/maps/geo?";
-        $uri .= "q=" . urlencode($address);
-        $uri .= "&key=" . $this->_key;
+        $uri  = "http://maps.googleapis.com/maps/api/geocode/json?";
+        $uri .= "address=" . urlencode($address);
         $uri .= "&sensor=false";
-        $uri .= "&output=json";
         return $uri;
     }
-}
-
-?>
+}

app/lib/Placemark.php

@@ -6,8 +6,6 @@
  */
 class Google_Placemark
 {
-    public $id;
-
     public $fullAddress;
 
     public $accuracy;
@@ -19,6 +17,8 @@ class Google_Placemark
     public $county;
 
     public $zip;
+
+    public $streetNumber;
 
     public $street;
 
@@ -39,27 +39,50 @@ public function __construct( $raw_json )
         //The returned string may not be decode-able
         if( NULL === $pm ) return;
 
-        if( $pm->Status->code != '200') return;
-
-        if( FALSE === array_key_exists(0,$pm->Placemark) ) return;
-
-        if( $pm->Placemark[0]->AddressDetails->Accuracy < 8 ) return;
+        if( $pm->status != 'OK') return;
+
+        $results = $pm->results;
+        if(count($results) < 1) return;
+
+        $result = $results[0];
+
+        if(isset($result->partial_match)) {
+          return;
+        }
 
-        if( TRUE === array_key_exists(0, $pm->Placemark) )
+        $this->fullAddress = $result->formatted_address;
+
+        foreach($result->address_components as $address_component)
         {
-            $this->id = $pm->Placemark[0]->id;
-            $this->fullAddress = $pm->Placemark[0]->address;
-            $this->accuracy = $pm->Placemark[0]->AddressDetails->Accuracy;
-            $this->state = $pm->Placemark[0]->AddressDetails->Country->AdministrativeArea->AdministrativeAreaName;
-            $this->city = $pm->Placemark[0]->AddressDetails->Country->AdministrativeArea->SubAdministrativeArea->Locality->LocalityName;
-            $this->county = $pm->Placemark[0]->AddressDetails->Country->AdministrativeArea->SubAdministrativeArea->SubAdministrativeAreaName;
-            $this->zip = $pm->Placemark[0]->AddressDetails->Country->AdministrativeArea->SubAdministrativeArea->Locality->PostalCode->PostalCodeNumber;
-            $this->street = $pm->Placemark[0]->AddressDetails->Country->AdministrativeArea->SubAdministrativeArea->Locality->Thoroughfare->ThoroughfareName;
-            $this->x = $pm->Placemark[0]->Point->coordinates[0];
-            $this->y = $pm->Placemark[0]->Point->coordinates[1];
-
-            $this->_isValid = TRUE;
+          if(in_array('street_number', $address_component->types)) {
+            $this->streetNumber = $address_component->long_name;
+          }
+
+          if(in_array('route', $address_component->types)) {
+            $this->street = $address_component->long_name;
+          }
+
+          if(in_array('administrative_area_level_3', $address_component->types)) {
+            $this->city = $address_component->long_name;
+          }
+
+          if(in_array('administrative_area_level_2', $address_component->types)) {
+            $this->county = $address_component->long_name;
+          }
+
+          if(in_array('administrative_area_level_1', $address_component->types)) {
+            $this->state = $address_component->long_name;
+          }
+
+          if(in_array('postal_code', $address_component->types)) {
+            $this->zip = $address_component->long_name;
+          }
         }
+
+        $this->x = $result->geometry->location->lat;
+        $this->y = $result->geometry->location->lng;
+
+        $this->_isValid = TRUE;
     }
 
     /**
@@ -79,6 +102,4 @@ public function isValid()
     {
         return $this->_isValid;
     }
-}
-
-?>
+}

app/lib/functions.php

@@ -20,5 +20,4 @@ function dump( $var )
     echo "<xmp>";
     print_r($var);
     echo "</xmp>";
-}
-?>
+}

app/views/property_begin.php

@@ -12,14 +12,12 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <title>Zillow-Google Masher</title>
-        <link href="css/custom-theme/jquery-ui-1.7.2.custom.css" rel="stylesheet" type="text/css" />
         <link href="css/style.css" rel="stylesheet" type="text/css" />
         <!--[if lte IE 7]>
         <link rel="stylesheet" type="text/css" href="css/style_ie.css" />
         <![endif]-->
 
         <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
         <script type="text/javascript" src="js/jquery.watermark.min.js"></script>
         <script type="text/javascript">
             $(document).ready(function(){
@@ -112,12 +110,6 @@
                                     here
                                 </a>
                             </li>
-                            <li>
-                                Get your Google maps api key
-                                <a href="http://code.google.com/apis/maps/signup.html">
-                                    here
-                                </a>
-                            </li>
                             <li>
                                 In the extracted source, copy the file:
                                 app/config/config.template.php
@@ -129,13 +121,12 @@
                                 </pre>
                             </li>
                             <li>
-                                Add your Zillow and Google keys to app/config/config.php and
+                                Add your Zillow key to app/config/config.php and
                                 add the path to the pillow library.
                             </li>
                             <li class="no_style">
                                 <pre>
 $config = array(
-    'google_api_key'        => 'place your google api key here',
     'zillow_api_key'        => 'place your zillow api key here',
     'pillow_install'        => '/path/to/pillow/'
 );

app/views/property_no_results.php

@@ -11,14 +11,12 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <title>Zillow-Google Masher</title>
-        <link href="css/custom-theme/jquery-ui-1.7.2.custom.css" rel="stylesheet" type="text/css" />
         <link href="css/style.css" rel="stylesheet" type="text/css" />
         <!--[if lte IE 7]>
         <link rel="stylesheet" type="text/css" href="css/style_ie.css" />
         <![endif]-->
 
         <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
         <script type="text/javascript" src="js/jquery.watermark.min.js"></script>
         <script type="text/javascript">
             $(document).ready(function(){

app/views/property_results.php

@@ -11,18 +11,16 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <title>Zillow-Google Masher</title>
-        <link href="css/custom-theme/jquery-ui-1.7.2.custom.css" rel="stylesheet" type="text/css" />
         <link href="css/style.css" rel="stylesheet" type="text/css" />
         <!--[if lte IE 7]>
         <link rel="stylesheet" type="text/css" href="css/style_ie.css" />
         <![endif]-->
 
         <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
         <script type="text/javascript" src="js/jquery.watermark.min.js"></script>
         <script type="text/javascript" src="js/latnlng.js"></script>
         <script type="text/javascript" src="js/zillgoog.js"></script>
-        <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;sensor=false&amp;key=<?php echo $google_api_key ?>" type="text/javascript"></script>
+        <script src="http://maps.google.com/maps/api/js?sensor=false" type="text/javascript"></script>
         <script type="text/javascript">
             $(document).ready(function(){
                 $('#address').watermark('Enter Address and Press Enter');
@@ -33,7 +31,6 @@
                 //map_initialize( pm );
                 zg = new zillgoog.map(pm);
                 zg.addComparables( comps );
-                zg.enableStreetView( 'dia', 'street_view' );
 
                 //Apply a row click effect
                 $('#comps table tbody tr').each(function(){
@@ -50,12 +47,7 @@
                     });
                 });
 
-            })
-
-            $(document).unload(function(){
-                GUnload();
             });
-
         </script>
     </head>
     <body>