X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fgeocoding.inc.php;h=cb2763598bc8fc7f0bbdd576d471bc32fc0abe58;hb=e0ee31204dbb8e43870716190e4549257416fcb8;hp=c888a8552bc9507917d1d8aa63ad194da5aa73db;hpb=2aa2c77aef77e0bfba275dfcb3b257a8f8d66ef1;p=platal.git

diff --git a/include/geocoding.inc.php b/include/geocoding.inc.php
index c888a85..cb27635 100644
--- a/include/geocoding.inc.php
+++ b/include/geocoding.inc.php
@@ -95,7 +95,7 @@ class GMapsGeocoder extends Geocoder {
 
     public function getGeocodedAddress(array $address) {
         $address = $this->prepareAddress($address);
-        $textAddress = $address['text'];
+        $textAddress = $this->getTextToGeocode($address);
 
         // Try to geocode the full address.
         if (($geocodedData = $this->getPlacemarkForAddress($textAddress))) {
@@ -121,14 +121,14 @@ class GMapsGeocoder extends Geocoder {
     }
 
     public function stripGeocodingFromAddress(array $address) {
-        unset($address['geoloc'], $address['geoloc_choice'], $address['countryId'],
-              $address['country'], $address['administrativeAreaName'],
+        unset($address['geoloc'], $address['geoloc_choice'], $address['geocodedPostalText'],
+              $address['countryId'], $address['country'], $address['administrativeAreaName'],
               $address['subAdministrativeAreaName'], $address['localityName'],
               $address['thoroughfareName'], $address['postalCode']);
         $address['accuracy'] = 0;
         return $address;
     }
- 
+
     // Updates the address with the geocoded information from Google Maps. Also
     // cleans up the final informations.
     private function getUpdatedAddress(array $address, array $geocodedData, $extraLines) {
@@ -143,10 +143,6 @@ class GMapsGeocoder extends Geocoder {
         // We can now format the address.
         $this->formatAddress($address, $extraLines);
 
-        // Some entities in ISO 3166 are not countries, thus they have to be replaced
-        // by the country they belong to.
-        // TODO: fixCountry($address);
-
         return $address;
     }
 
@@ -163,7 +159,7 @@ class GMapsGeocoder extends Geocoder {
     // Prepares address to be geocoded
     private function prepareAddress($address) {
         $address['text'] = preg_replace('/\s*\n\s*/m', "\n", trim($address['text']));
-        // TODO: $address['postalAddress'] = getPostalAddress($address['text']);
+        $address['postalText'] = $this->getPostalAddress($address['text']);
         $address['updateTime'] = time();
         unset($address['changed']);
         return $address;
@@ -316,6 +312,7 @@ class GMapsGeocoder extends Geocoder {
         if ($extraLines) {
             $address['geoloc'] = $extraLines . "\n" . $address['geoloc'];
         }
+        $address['geocodedPostalText'] = $this->getPostalAddress($address['geoloc']);
         $geoloc = strtoupper(preg_replace(array("/[0-9,\"'#~:;_\- ]/", "/\r\n/"),
                                           array("", "\n"), $address['geoloc']));
         $text   = strtoupper(preg_replace(array("/[0-9,\"'#~:;_\- ]/", "/\r\n/"),
@@ -338,10 +335,85 @@ class GMapsGeocoder extends Geocoder {
         }
         if ($same) {
             $address['text'] = $address['geoloc'];
-            unset($address['geoloc']);
+            $address['postalText'] = $address['geocodedPostalText'];
+            unset($address['geoloc'], $address['geocodedPostalText']);
         }
     }
  
+    // Returns the address formated for postal use.
+    // The main rules are (cf AFNOR XPZ 10-011):
+    // -everything in upper case;
+    // -if there are more then than 38 characters in a lign, split it;
+    // -if there are more then than 32 characters in the description of the "street", use abbreviations.
+    private function getPostalAddress($text) {
+         static $abbreviations = array(
+             "IMPASSE"   => "IMP",
+             "RUE"       => "R",
+             "AVENUE"    => "AV",
+             "BOULEVARD" => "BVD",
+             "ROUTE"     => "R",
+             "STREET"    => "ST",
+             "ROAD"      => "RD",
+             );
+
+        $text = strtoupper($text);
+        $arrayText = explode("\n", $text);
+        $postalText = "";
+
+        foreach ($arrayText as $i => $lign) {
+            $postalText .= (($i == 0) ? "" : "\n");
+            if (($length = strlen($lign)) > 32) {
+                $words = explode(" ", $lign);
+                $count = 0;
+                foreach ($words as $word) {
+                    if (isset($abbreviations[$word])) {
+                        $word = $abbreviations[$word];
+                    }
+                    if ($count + ($wordLength = strlen($word)) <= 38) {
+                        $postalText .= (($count == 0) ? "" : " ") . $word;
+                        $count += (($count == 0) ? 0 : 1) + $wordLength;
+                    } else {
+                        $postalText .= "\n" . $word;
+                        $count = strlen($word);
+                    }
+                }
+            } else {
+                $postalText .= $lign;
+            }
+        }
+        return $postalText;
+    }
+
+    // Trims the name of the real country if it contains an ISO 3166-1 non-country
+    // item. For that purpose, we compare the last but one line of the address with
+    // all non-country items of ISO 3166-1.
+    private function getTextToGeocode($address)
+    {
+        $res = XDB::iterator('SELECT  country, countryFR
+                                FROM  geoloc_countries
+                               WHERE  belongsTo IS NOT NULL');
+        $countries = array();
+        foreach ($res as $item) {
+            $countries[] = $item[0];
+            $countries[] = $item[1];
+        }
+        $textLines  = explode("\n", $address['text']);
+        $countLines = count($textLines);
+        $needle     = strtoupper(trim($textLines[$countLines - 2]));
+        $isPseudoCountry = false;
+        foreach ($countries as $country) {
+            if (strtoupper($country) == $needle) {
+                $isPseudoCountry = true;
+                break;
+            }
+        }
+
+        if ($isPseudoCountry) {
+            return $address['text'];
+        }
+        return implode("\n", array_slice($textLines, 0, -1));
+    }
+
     // Search for the lign from the given address that is the closest to the geocoded thoroughfareName
     // and replaces the corresponding lign in the geocoded text by it.
     static protected function fixStreetNumber(&$address)