From: Stéphane Jacob <sj@m4x.org>
Date: Sun, 12 Dec 2010 14:44:49 +0000 (+0100)
Subject: The first word of the street line should be truncated to 4 letters.
X-Git-Tag: xorg/1.0.2~81
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=9070ff055aa8337e75ca05a909bcfaf17b666d09;p=platal.git

The first word of the street line should be truncated to 4 letters.

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

diff --git a/classes/address.php b/classes/address.php
index 067a505..a17c370 100644
--- a/classes/address.php
+++ b/classes/address.php
@@ -378,12 +378,18 @@ class Address
      * success, modifies the length accordingly and returns either the matching
      * substitution or the needle.
      */
-    private function substitute($needle, $haystack, &$length, &$success)
+    private function substitute($needle, $haystack, &$length, &$success, $trim = false)
     {
         if (array_key_exists($needle, $haystack)) {
             $success = true;
             $length -= (strlen($needle) - strlen($haystack[$needle]));
             return $haystack[$needle];
+        } elseif ($trim) {
+            $success = true;
+            if (strlen($needle) > 4) {
+                $length -= (strlen($needle) - 4);
+                $needle = $needle{4};
+            }
         }
         return $needle;
     }
@@ -500,7 +506,7 @@ class Address
             for ($i = 0; $i < $count && $length > $limit; ++$i) {
                 $success = false;
                 if ($isStreetLine) {
-                    $sub = $this->substitute($words[$i], Address::$streetAbbreviations, $length, $success);
+                    $sub = $this->substitute($words[$i], Address::$streetAbbreviations, $length, $success, ($i == 0));
                 }
                 // Entreprises' substitution are only suitable for the first two lines.
                 if ($lineNumber <= 2 && !$success) {