Index: supported/location.ca.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/location/supported/location.ca.inc,v retrieving revision 1.4.4.2 diff -u -p -r1.4.4.2 location.ca.inc --- supported/location.ca.inc 12 Mar 2007 22:08:07 -0000 1.4.4.2 +++ supported/location.ca.inc 3 May 2007 21:26:49 -0000 @@ -1,6 +1,83 @@ the street portion of the location + * 'supplemental' => additional street portion of the location + * 'province' => the province, state, or territory + * 'country' => lower-cased two-letter ISO code (REQUIRED) + * 'postal_code' => the international postal code for this location (REQUIRED) + * + * @return + * An associative array where + * 'lat' => approximate latitude of the center of the postal code's area + * 'lon' => approximate longitude of the center of the postal code's area + * + */ +function location_latlon_rough_ca($location = array()) { + if (!isset($location['postal_code'])) { + return NULL; + } + + $result = db_query("SELECT latitude, longitude FROM {zipcodes} WHERE country = '%s' AND zip = '%s'", $location['country'], $location['postal_code']); + + if ($row = db_fetch_object($result)) { + return array('lat' => $row->latitude, 'lon' => $row->longitude); + } + else { + return NULL; + } +} + +/** + * Returns a lat/lon pair of the approximate center of the given postal code in the given country + * + * @param $location + * An associative array $location where only postal code and country are necessary, but can have the keys: + * 'street' => the street portion of the location + * 'supplemental' => additional street portion of the location + * 'province' => the province, state, or territory + * 'country' => lower-cased two-letter ISO code (REQUIRED) + * 'postal_code' => the international postal code for this location (REQUIRED) + * + * @return + * An associative array where + * 'lat' => approximate latitude of the center of the postal code's area + * 'lon' => approximate longitude of the center of the postal code's area + * 'city' => the city + * 'province' => the province, state, or territory + * 'country' => lower-cased two-letter ISO code + * + */ +function location_get_postalcode_data_ca($location = array()) { + // Now we pad the thing and query. + $res = db_query("SELECT * FROM {zipcodes} where country = '%s' AND zip = '%s'", $location['country'], $location['postal_code']); + if ($row = db_fetch_object($res)) { + return array('lat' => $row->latitude, 'lon' => $row->longitude, 'city' => $row->city, 'province' => $row->state, 'country' => $row->country); + } + else { + return NULL; + } +} + +/** + * Parameters: + * An associative array $location where + * 'street' => the street portion of the location + * 'supplemental' => additional street portion of the location + * 'province' => the province, state, or territory + * 'country' => lower-cased two-letter ISO code (REQUIRED) + * 'postal_code' => the international postal code for this location (REQUIRED) + * + * + */ +function location_latlon_exact_ca($location = array()) { + // return location_geocode_ca_geocoder($location); +} function location_map_link_ca_yahoo($location = array()) { $get_query = '?'; @@ -206,21 +283,6 @@ function location_geocode_ca_providers() ); } -function location_geocode_ca_google_settings(){ - $form = array(); - - $form['location_geocode_ca_google_apikey'] = array( - '#type' => 'textfield', - '#title' => t('Google Maps API Key'), - '#size' => 64, - '#maxlength' => 128, - '#default_value' => variable_get('location_geocode_ca_google_apikey', ''), - '#description' => t('In order to use the Google Maps API geocoding web-service, you will need a Google Maps API Key. You can obtain one at the !sign_up_link for the !google_maps_api.', array('!sign_up_link' => 'sign-up page', '!google_maps_api' => 'Google Maps API')) - ); - - return $form; -} - function location_geocode_ca_google($location = array()) { $service_url = 'http://maps.google.com/maps/geo?output=xml&key='. variable_get('location_geocode_ca_google_apikey', '') .'&q='; @@ -250,15 +312,54 @@ function location_geocode_ca_google($loc return array('lat' => $latlon_exploded[1], 'lon' => $latlon_exploded[0]); } +function location_geocode_ca_geocoder_settings(){ + $form = array(); + + $form['location_geocode_ca_geocoder_apikey'] = array( + '#type' => 'textfield', + '#title' => t('Geocoder API Key'), + '#size' => 64, + '#maxlength' => 128, + '#default_value' => variable_get('location_geocode_ca_geocoder_apikey', ''), + '#description' => t('In order to use the Geocoder.ca API geocoding web-service, you for a commercial entity or without attribution you will need a Geocoder API Key. You can obtain one at the !sign_up_link for the !geocoder_api.', array('!sign_up_link' => 'sign-up page', '!geocoder_api' => 'Geocoder API')) + ); + + return $form; +} + +function location_geocode_ca_google_settings(){ + $form = array(); + + $form['location_geocode_ca_google_apikey'] = array( + '#type' => 'textfield', + '#title' => t('Google Maps API Key'), + '#size' => 64, + '#maxlength' => 128, + '#default_value' => variable_get('location_geocode_ca_google_apikey', ''), + '#description' => t('In order to use the Google Maps API geocoding web-service, you will need a Google Maps API Key. You can obtain one at the !sign_up_link for the !google_maps_api.', array('!sign_up_link' => 'sign-up page', '!google_maps_api' => 'Google Maps API')) + ); + + return $form; +} + /** * This needs some more work to cover errors and such. I think showing a proper * Drupal error is a good idea. If an incorrect address is given to geocoder.ca * it offers a suggestion. If this happens the drupal user should be told. */ function location_geocode_ca_geocoder($location = array()) { - $service_url = "http://geocoder.ca/?geoit=XML&locate="; + $service_url = "http://geocoder.ca/?geoit=XML"; - $address = location_address2singleline($location); + if (variable_get('location_geocode_ca_geocoder_apikey', NULL)) { + $service_url .= '&auth='. variable_get('location_geocode_ca_geocoder_apikey', NULL) .'&locate='; + } + else { + $service_url .= '&locate='; + } + + // geocoder gives better results when not usong postal code, country and , + unset($location['postal_code'], $location['country']); + $address = strtr(location_address2singleline($location), array(', ' => ' ')); $http_reply = drupal_http_request($service_url . urlencode($address)); @@ -271,6 +372,10 @@ function location_geocode_ca_geocoder($l $lon_match = array(); $latlon = array(); + if (preg_match('/(.*)<\/error>/', $http_reply->data, $lat_match)) { + return NULL; + } + if (preg_match('/(.*)<\/latt>/', $http_reply->data, $lat_match)) { $latlon['lat'] = $lat_match[1]; }