}
}
-abstract class ProfileGeoloc implements ProfileSetting
+abstract class ProfileGeocoding implements ProfileSetting
{
- protected function geolocAddress(array &$address, &$success)
+ protected function geocodeAddress(array &$address, &$success)
{
- require_once 'geoloc.inc.php';
+ require_once 'geocoding.inc.php';
$success = true;
if ($address['changed'] == 1) {
- cleanText($address['text']);
- geolocGoogle($address);
- $address['updateTime'] = time();
- // postalAddress
+ $gmapsGeocoder = new GMapsGeocoder();
+ $address = $gmapsGeocoder->getGeocodedAddress($address);
if (isset($address['geoloc'])) {
$success = false;
}
- unset($address['changed']);
}
- if (isset($address['geoloc_choice']) && $address['geoloc_choice'] == 0) {
+ if (isset($address['geoloc_choice']) && ($address['geoloc_choice'] == 0)) {
$mailer = new PlMailer('geoloc/geoloc.mail.tpl');
$mailer->assign('text', $address['text']);
$mailer->assign('geoloc', $address['geoloc']);
$mailer->send();
+ $gmapsGeocoder = new GMapsGeocoder();
+ $address = $gmapsGeocoder->stripGeocodingFromAddress($address);
}
}
}