Index: supported/location.ca.inc =================================================================== --- supported/location.ca.inc (revision 2424) +++ supported/location.ca.inc (working copy) @@ -37,40 +37,6 @@ function location_province_list_numeric_ ); } - - -/** - * 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 - * '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 - * - */ -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 * @@ -102,21 +68,6 @@ function location_get_postalcode_data_ca } } -/** - * 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 = '?'; if (isset($location['street'])) {