X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fgeoloc.inc.php;h=95a646b165543d6c9d2e964c450adb4d80237609;hb=493b6abebf3d6c35691f66fd1bfdc063efaab576;hp=d77668a61d14b9ead215a31e17837e8e9cd593ce;hpb=80ca1b4e452e761903acd2a72d9fe21716a1098e;p=platal.git
diff --git a/include/geoloc.inc.php b/include/geoloc.inc.php
index d77668a..95a646b 100644
--- a/include/geoloc.inc.php
+++ b/include/geoloc.inc.php
@@ -1,6 +1,6 @@
xdb->iterRow('SELECT a2,pays FROM geoloc_pays ORDER BY pays');
+ $res = XDB::iterRow('SELECT a2,pays FROM geoloc_pays ORDER BY pays');
$html = "";
while (list($my_id, $my_pays) = $res->next()) {
$html .= sprintf("\n",
@@ -47,8 +45,7 @@ $GLOBALS['page']->register_function('geoloc_country', '_geoloc_country_smarty');
* @param $current la region actuellement selectionnee
*/
function geoloc_region($country,$current) {
- global $globals;
- $res = $globals->xdb->iterRow('SELECT region,name FROM geoloc_region where a2={?} ORDER BY name', $country);
+ $res = XDB::iterRow('SELECT region,name FROM geoloc_region where a2={?} ORDER BY name', $country);
$html = "";
while (list($regid, $regname) = $res->next()) {
$html .= sprintf("\n",
@@ -67,38 +64,103 @@ function _geoloc_region_smarty($params){
$GLOBALS['page']->register_function('geoloc_region', '_geoloc_region_smarty');
// }}}
+function geoloc_is_utf8($text)
+{
+ return (iconv('utf-8', 'utf-8', $text) == $text);
+}
+
+function geoloc_utf8_decode($text)
+{
+ return geoloc_is_utf8($text) ? utf8_decode($text) : $text;
+}
+
// {{{ get_address_infos($txt)
/** retrieve the infos on a text address
* store on the fly the info of the city concerned
* @param $txt the raw text of an address
*/
function get_address_infos($txt) {
- $url ="http://www.geoloc.org/adressparser/address.php?txt=".urlencode(utf8_encode($txt));
+ global $globals;
+ $url = $globals->geoloc->webservice_url."address.php?precise=1&txt=".urlencode(utf8_encode($txt));
if (!($f = @fopen($url, 'r'))) return false;
$keys = explode('|',fgets($f));
$vals = explode('|',fgets($f));
$infos = array();
- foreach ($keys as $i=>$key) if($vals[$i]) $infos[$key] = ($key == 'sql')?$vals[$i]:utf8_decode(strtr($vals[$i], array(chr(197).chr(147) => "œ")));
- global $globals;
- if ($infos['sql'])
- $globals->xdb->execute("REPLACE INTO geoloc_city VALUES ".$infos['sql']);
- if ($infos['display'])
- $globals->xdb->execute("UPDATE geoloc_pays SET display = {?} WHERE a2 = {?}", $infos['display'], $infos['country']);
+ foreach ($keys as $i=>$key) {
+ if($vals[$i]) {
+ if ($key == 'sql') {
+ $infos[$key] = $vals[$i];
+ } else {
+ $val = strtr($vals[$i], array(chr(197).chr(147) => "œ"));
+ $infos[$key] = geoloc_utf8_decode($val);
+ }
+ }
+ }
+ if (isset($infos['sql']) && $infos['sql'])
+ XDB::execute("REPLACE INTO geoloc_city VALUES ".$infos['sql']);
+ if (isset($infos['display']) && $infos['display'])
+ XDB::execute("UPDATE geoloc_pays SET display = {?} WHERE a2 = {?}", $infos['display'], $infos['country']);
+ if (isset($infos['cityid']))
+ fix_cities_not_on_map(1, $infos['cityid']);
return $infos;
}
// }}}
+// {{{ get_cities_maps($array)
+/* get all the maps id of the cities contained in an array */
+function get_cities_maps($array)
+{
+ global $globals;
+ implode("\n",$array);
+ $url = $globals->geoloc->webservice_url."findMaps.php?datatext=".urlencode(utf8_encode(implode("\n", $array)));
+ if (!($f = @fopen($url, 'r'))) return false;
+ $maps = array();
+ while (!feof($f))
+ {
+ $l = trim(fgets($f));
+ $tab = explode(';', $l);
+ $i = $tab[0];
+ unset($tab[0]);
+ $maps[$i] = $tab;
+ }
+ return $maps;
+}
+// }}}
+
+// {{{ get_new_maps($url)
+/** set new maps from url **/
+function get_new_maps($url)
+{
+ if (!($f = @fopen($url, 'r'))) {
+ return false;
+ }
+ XDB::query('TRUNCATE TABLE geoloc_maps');
+ $s = '';
+ while (!feof($f)) {
+ $l = fgetcsv($f, 1024, ';', '"');
+ foreach ($l as $i => $val) {
+ if ($val != 'NULL') {
+ $l[$i] = '\''.addslashes($val).'\'';
+ }
+ }
+ $s .= ',('.implode(',',$l).')';
+ }
+ XDB::execute('INSERT INTO geoloc_maps VALUES '.substr($s, 1));
+ return true;
+}
+// }}}
+
// {{{ get_address_text($adr)
/** make the text of an address that can be read by a mailman
* @param $adr an array with all the usual fields
*/
function get_address_text($adr) {
$t = "";
- if ($adr['adr1']) $t.= $adr['adr1'];
- if ($adr['adr2']) $t.= "\n".$adr['adr2'];
- if ($adr['adr3']) $t.= "\n".$adr['adr3'];
+ if (isset($adr['adr1']) && $adr['adr1']) $t.= $adr['adr1'];
+ if (isset($adr['adr2']) && $adr['adr2']) $t.= "\n".$adr['adr2'];
+ if (isset($adr['adr3']) && $adr['adr3']) $t.= "\n".$adr['adr3'];
$l = "";
- if ($adr['display']) {
+ if (isset($adr['display']) && $adr['display']) {
$keys = explode(' ', $adr['display']);
foreach ($keys as $key) {
if (isset($adr[$key]))
@@ -115,17 +177,16 @@ function get_address_text($adr) {
if ($adr['region']) $l .= $adr['region']." ";
if ($adr['postcode']) $l .= $adr['postcode'];
} else {
- if ($adr['postcode']) $l .= $adr['postcode']." ";
- if ($adr['city']) $l .= $adr['city'];
+ if (isset($adr['postcode']) && $adr['postcode']) $l .= $adr['postcode']." ";
+ if (isset($adr['city']) && $adr['city']) $l .= $adr['city'];
}
}
if ($l) $t .= "\n".trim($l);
if ($adr['country'] != '00' && (!$adr['countrytxt'] || $adr['countrytxt'] == strtoupper($adr['countrytxt']))) {
- global $globals;
- $res = $globals->xdb->query("SELECT pays FROM geoloc_pays WHERE a2 = {?}", $adr['country']);
+ $res = XDB::query("SELECT pays FROM geoloc_pays WHERE a2 = {?}", $adr['country']);
$adr['countrytxt'] = $res->fetchOneCell();
}
- if ($adr['countrytxt']) $t .= "\n".$adr['countrytxt'];
+ if (isset($adr['countrytxt']) && $adr['countrytxt']) $t .= "\n".$adr['countrytxt'];
return trim($t);
}
// }}}
@@ -176,21 +237,22 @@ function cut_address($txt) {
* @param $uid the id of the user
*/
function localize_addresses($uid) {
- global $globals;
- $res = $globals->xdb->iterator("SELECT * FROM adresses WHERE uid = {?} and (cityid IS NULL OR cityid = 0)", $uid);
+ $res = XDB::iterator("SELECT * FROM adresses WHERE uid = {?} and (cityid IS NULL OR cityid = 0)", $uid);
$erreur = Array();
while ($a = $res->next()) {
$new = get_address_infos($ta = get_address_text($a));
if (compare_addresses_text($ta, get_address_text($new))) {
- $globals->xdb->execute("UPDATE adresses SET
+ XDB::execute("UPDATE adresses SET
adr1 = {?}, adr2 = {?}, adr3 = {?},
cityid = {?}, city = {?}, postcode = {?},
- region = {?}, regiontxt = {?}, country = {?}
+ region = {?}, regiontxt = {?}, country = {?},
+ glat = {?}, glng = {?}
WHERE uid = {?} AND adrid = {?}",
$new['adr1'], $new['adr2'], $new['adr3'],
$new['cityid'], $new['city'], $new['postcode'],
$new['region'], $new['regiontxt'], $new['country'],
+ $new['precise_lat'], $new['precise_lon'],
$uid, $a['adrid']);
$new['store'] = true;
if (!$new['cityid']) $erreur[$a['adrid']] = $new;
@@ -208,14 +270,183 @@ function localize_addresses($uid) {
* @param $id the id of the city to synchronize
*/
function synchro_city($id) {
- $url ="http://www.geoloc.org/adressparser/cityFinder.php?method=id&id=".$id."&out=sql";
+ global $globals;
+ $url = $globals->geoloc->webservice_url."cityFinder.php?method=id&id=".$id."&out=sql";
if (!($f = @fopen($url, 'r'))) return false;
$s = fgets($f);
- global $globals;
if ($s)
- return $globals->xdb->execute("REPLACE INTO geoloc_city VALUES ".$s) > 0;
+ return XDB::execute("REPLACE INTO geoloc_city VALUES ".$s) > 0;
}
// }}}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+// {{{ function fix_cities_not_on_map($limit)
+function fix_cities_not_on_map($limit=false, $cityid=false)
+{
+ $missing = XDB::query("SELECT c.id FROM geoloc_city AS c LEFT JOIN geoloc_city_in_maps AS m ON(c.id = m.city_id) WHERE m.city_id IS NULL".($cityid?(" AND c.id = '".$cityid."'"):"").($limit?" LIMIT $limit":""));
+ $maps = get_cities_maps($missing->fetchColumn());
+ if ($maps)
+ {
+ $values = "";
+ foreach ($maps as $cityid => $maps_c)
+ foreach ($maps_c as $map_id)
+ $values .= ",($cityid, $map_id, '')";
+ XDB::execute("REPLACE INTO geoloc_city_in_maps VALUES ".substr($values, 1));
+ }
+ else
+ return false;
+ return true;
+}
+
+function set_smallest_levels() {
+ $maxlengths = XDB::iterRow("SELECT MAX(LENGTH(gm.path)), gcim.city_id
+ FROM geoloc_city_in_maps AS gcim
+ INNER JOIN geoloc_maps AS gm
+ USING ( map_id )
+ GROUP BY gcim.city_id
+ ");
+ while (list($length, $id) = $maxlengths->next()) {
+ XDB::execute("UPDATE geoloc_city_in_maps AS gcim
+ INNER JOIN geoloc_maps AS gm USING(map_id)
+ SET gcim.infos = IF(LENGTH(gm.path) = {?}, 'smallest', '')
+ WHERE gcim.city_id = {?}", $length, $id);
+ }
+ return true;
+}
+// }}}
+
+
+function geoloc_to_x($lon, $lat) { return deg2rad(1) * $lon *100; }
+
+function geoloc_to_y($lon, $lat) {
+ if ($lat < -75) return latToY(-75);
+ if ($lat > 75) return latToY(75);
+ return -100 * log(tan(pi()/4 + deg2rad(1)/2*$lat));
+}
+
+function size_of_city($nb) { $s = round(log($nb + 1)*2,2); if ($s < 1) return 1; return $s; }
+function size_of_territory($nb) { return size_of_city($nb); }
+
+function geoloc_getData_subcities($mapid, $SFields, &$cities, $direct=true) {
+ for ($i_mapfield=0; $i_mapfield < count($SFields) ; $i_mapfield++) if ($SFields[$i_mapfield]->fieldFormName == 'mapid') break;
+ $SFields[$i_mapfield] = new MapSField('mapid', array('gcim.map_id'), array('adresses','geoloc_city_in_maps'), array('am','gcim'), array(getadr_join('am'), 'am.cityid = gcim.city_id'), $mapid);
+
+ $fields = new SFieldGroup(true, $SFields);
+ $where = $fields->get_where_statement();
+ if ($where) $where = " AND ".$where;
+
+ $cityres = XDB::iterator("
+ SELECT gc.id,
+ gc.lon / 100000 AS x, gc.lat/100000 AS y,
+ gc.name,
+ COUNT(u.user_id) AS pop,
+ SUM(u.promo % 2) AS yellow
+ FROM auth_user_md5 AS u
+ INNER JOIN auth_user_quick AS q ON(u.user_id = q.user_id)
+ ".$fields->get_select_statement()."
+ LEFT JOIN geoloc_city AS gc ON(gcim.city_id = gc.id)
+ WHERE ".($direct?"gcim.infos = 'smallest'":"1")."
+ $where
+ GROUP BY gc.id,gc.alias ORDER BY pop DESC");
+ while ($c = $cityres->next())
+ if ($c['pop'] > 0)
+ {
+ $city = $c;
+ // $city['name'] = geoloc_utf8_decode($city['name']);
+ if (!geoloc_is_utf8($city['name'])) {
+ $city['name'] = utf8_encode($city['name']);
+ }
+ $city['x'] = geoloc_to_x($c['x'], $c['y']);
+ $city['y'] = geoloc_to_y($c['x'], $c['y']);
+ $city['size'] = size_of_city($c['pop']);
+ $cities[$c['id']] = $city;
+ }
+}
+
+function geoloc_getData_subcountries($mapid, $SFields, $minentities) {
+ $countries = array();
+ $cities = array();
+
+ if ($mapid === false)
+ $wheremapid = "WHERE gm.parent IS NULL";
+ else
+ $wheremapid = "WHERE gm.parent = {?}";
+ $submapres = XDB::iterator(
+ "SELECT gm.map_id AS id, gm.name, gm.x, gm.y, gm.xclip, gm.yclip,
+ gm.width, gm.height, gm.scale, 1 AS rat
+ FROM geoloc_maps AS gm
+ ".$wheremapid, Env::v('mapid',''));
+
+ global $globals;
+
+ while ($c = $submapres->next())
+ {
+ $country = $c;
+ $country['name'] = utf8_decode($country['name']);
+ $country['color'] = 0xFFFFFF;
+ $country['swf'] = $globals->geoloc->webservice_url."maps/mercator/map_".$c['id'].".swf";
+ $countries[$c['id']] = $country;
+ }
+
+ if ($mapid === false) return array($countries, $cities);
+
+ geoloc_getData_subcities(Env::i('mapid'), $SFields, $cities);
+ $nbcities = count($cities);
+ $nocity = $nbcities == 0;
+
+ for ($i_mapfield=0; $i_mapfield < count($SFields) ; $i_mapfield++) if ($SFields[$i_mapfield]->fieldFormName == 'mapid') break;
+ $SFields[$i_mapfield] = new MapSField('mapid', array('map.parent'), array('adresses','geoloc_city_in_maps','geoloc_maps'), array('am','gcim','map'), array(getadr_join('am'), 'am.cityid = gcim.city_id', 'map.map_id = gcim.map_id'));
+
+ $fields = new SFieldGroup(true, $SFields);
+ $where = $fields->get_where_statement();
+ if ($where) $where = " WHERE ".$where;
+
+ $countryres = XDB::iterator("
+ SELECT map.map_id AS id,
+ COUNT(u.user_id) AS nbPop,
+ SUM(u.promo % 2) AS yellow,
+ COUNT(DISTINCT gcim.city_id) AS nbCities,
+ SUM(IF(u.user_id IS NULL,0,am.glng)) AS lonPop,
+ SUM(IF(u.user_id IS NULL, 0,am.glat)) AS latPop
+ FROM auth_user_md5 AS u
+ INNER JOIN auth_user_quick AS q ON(u.user_id = q.user_id)
+ ".$fields->get_select_statement()."
+ $where
+ GROUP BY map.map_id ORDER BY NULL", $hierarchy);
+
+ $maxpop = 0;
+ $nbentities = $nbcities + $countryres->total();
+ while ($c = $countryres->next())
+ {
+ $c['latPop'] /= $c['nbPop'];
+ $c['lonPop'] /= $c['nbPop'];
+ $c['rad'] = size_of_territory($c['nbPop']);
+ if ($maxpop < $c['nbPop']) $maxpop = $c['nbPop'];
+ $c['xPop'] = geoloc_to_x($c['lonPop'], $c['latPop']);
+ $c['yPop'] = geoloc_to_y($c['lonPop'], $c['latPop']);
+ $countries[$c['id']] = array_merge($countries[$c['id']], $c);
+
+ $nbcities += $c['nbCities'];
+ }
+
+ if ($nocity && $nbcities < $minentities)
+ {
+ foreach($countries as $i => $c)
+ {
+ $countries[$i]['nbPop'] = 0;
+ if ($c['nbCities'] > 0)
+ geoloc_getData_subcities($c['id'], $SFields, $cities, false);
+ }
+ }
+
+ foreach ($countries as $i => $c) if ($c['nbPop'] > 0)
+ {
+ $lambda = pow($c['nbPop'] / $maxpop,0.3);
+ $countries[$i]['color'] = 0x0000FF + round((1-$lambda) * 0xFF)*0x010100;
+ }
+
+ return array($countries, $cities);
+}
+// }}}
+
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>