Merge commit 'origin/master' into fusionax

[platal.git] / modules / profile / addresses.inc.php

diff --git a/modules/profile/addresses.inc.php b/modules/profile/addresses.inc.php
index 6eca8bd..d073956 100644 (file)
--- a/modules/profile/addresses.inc.php
+++ b/modules/profile/addresses.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileAddress extends ProfileGeoloc
+class ProfileAddress extends ProfileGeocoding
 {
     private $bool;
     private $pub;
@@ -75,7 +75,7 @@ class ProfileAddress extends ProfileGeoloc
             if (!trim($address['text'])) {
                 unset($value[$key]);
             } elseif (!$init) {
-                $this->geolocAddress($address, $s);
+                $this->geocodeAddress($address, $s);
                 $success = $success && $s;
             }
             $this->cleanAddress($page, $key, $address);
@@ -95,7 +95,7 @@ class ProfileAddress extends ProfileGeoloc
 
     private function saveAddress($addrid, array &$address)
     {
-        require_once "geoloc.inc.php";
+        require_once "geocoding.inc.php";
 
         $flags = new PlFlagSet();
         if ($address['current']) {
@@ -115,9 +115,9 @@ class ProfileAddress extends ProfileGeoloc
                                             array("", "\n"), $address['text'])), 'CEDEX')) !== false) {
             $flags->addFlag('cedex');
         }
-        getAreaId($address, "administrativeArea");
-        getAreaId($address, "subAdministrativeArea");
-        getAreaId($address, "locality");
+        Geocoder::getAreaId($address, "administrativeArea");
+        Geocoder::getAreaId($address, "subAdministrativeArea");
+        Geocoder::getAreaId($address, "locality");
         XDB::execute("INSERT INTO  profile_addresses (pid, type, id, flags, accuracy,
                                                       text, postalText, postalCode, localityId,
                                                       subAdministrativeAreaId, administrativeAreaId,
@@ -126,7 +126,7 @@ class ProfileAddress extends ProfileGeoloc
                            VALUES  ({?}, 'home', {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?},
                                     {?}, {?}, FROM_UNIXTIME({?}), {?}, {?}, {?}, {?}, {?}, {?})",
                      S::i('uid'), $addrid, $flags, $address['accuracy'],
-                     $address['text'], 'postalText'/*$address['postalText']*/, $address['postalCode'], $address['localityId'],
+                     $address['text'], $address['postalText'], $address['postalCode'], $address['localityId'],
                      $address['subAdministrativeAreaId'], $address['administrativeAreaId'],
                      $address['countryId'], $address['latitude'], $address['longitude'],
                      $address['updateTime'], $address['pub'], $address['comment'],