From: Stéphane Jacob <sj@m4x.org>
Date: Wed, 1 Jun 2011 16:12:40 +0000 (+0200)
Subject: Merge remote branch 'origin/xorg/f/geocoding' into xorg/master
X-Git-Tag: xorg/1.1.2~62
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=304cdf32d7c38afbd381909545021fc44c8a0e05;p=platal.git

Merge remote branch 'origin/xorg/f/geocoding' into xorg/master
---

304cdf32d7c38afbd381909545021fc44c8a0e05
diff --cc upgrade/1.1.2/README
index 818e00d,5cbee98..03f5fe5
--- a/upgrade/1.1.2/README
+++ b/upgrade/1.1.2/README
@@@ -1,4 -1,7 +1,12 @@@
 +Check that the following queries return the same results before updating:
 +SELECT COUNT(*), COUNT(DISTINCT(pid)) FROM profile_name AS pn INNER JOIN profile_name_enum AS pne ON (pn.typeid = pne.id) WHERE pne.type = 'nickname';
 +SELECT COUNT(*), COUNT(DISTINCT(pid)) FROM profile_name AS pn INNER JOIN profile_name_enum AS pne ON (pn.typeid = pne.id) WHERE pne.type = 'name_other';
 +SELECT COUNT(*), COUNT(DISTINCT(pid)) FROM profile_name AS pn INNER JOIN profile_name_enum AS pne ON (pn.typeid = pne.id) WHERE pne.type = 'firstname_other';
++
+ Once all sql/php scripts have be run, run retrieve_address_tables.sh and finally xx_retrieve_geocoding.sql.
+ Then "./formatAddresses.php -g -t g -r e" will format the last ungeocoded addresses.
+ 
+ Additions to platal.conf:
+ [Maps]
+ api_version = "3.4" (depending on current version when releasing)
+ language = "fr"