From: Stéphane Jacob <sj@m4x.org>
Date: Fri, 7 Jan 2011 23:26:45 +0000 (+0100)
Subject: Removes duplicated city and postal code in vcard addresses (Closes #1322).
X-Git-Tag: xorg/1.1.0~213
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e7fb8e061fb7d785b433057c0c1a399c70d4a6e0;hp=fab7a90a7cafbd161ad37707f91a91e21eeffded;p=platal.git

Removes duplicated city and postal code in vcard addresses (Closes #1322).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/include/vcard.inc.php b/include/vcard.inc.php
index d00cf3a..758714e 100644
--- a/include/vcard.inc.php
+++ b/include/vcard.inc.php
@@ -90,8 +90,7 @@ class VCard extends PlVCard
                                 null, $adr->administrativeArea, null,
                                 $adr->hasFlag('current'), $adr->hasFlag('mail'), $adr->hasFlag('mail'));
             } else {
-                // TODO : find a way to fetch only the "street" part of the address
-                $group = $entry->addHome($adr->text, null, null, $adr->postalCode,
+                $group = $entry->addHome(trim(Geocoder::getFirstLines($adr->text, $adr->postalCode, 4)), null, null, $adr->postalCode,
                                 $adr->locality, $adr->administrativeArea, $adr->country,
                                 $adr->hasFlag('current'), $adr->hasFlag('mail'), $adr->hasFlag('mail'));
             }
@@ -115,7 +114,7 @@ class VCard extends PlVCard
             } else {
                 // TODO : link address to company
                 $group = $entry->addWork(null, null, null, null,
-                                         $adr->text, null, null, $adr->postalCode,
+                                         trim(Geocoder::getFirstLines($adr->text, $adr->postalCode, 4)), null, null, $adr->postalCode,
                                          $adr->locality, $adr->administrativeArea, $adr->country);
             }
             foreach ($adr->phones() as $phone) {