<?php
/***************************************************************************
- * Copyright (C) 2003-2006 Polytechnique.org *
+ * Copyright (C) 2003-2007 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
-// {{{ liste les pays ou les régions d'un pays
-/** donne la liste déroulante des pays
- * @param $current pays actuellement selectionné
+// {{{ liste les pays ou les régions d'un pays
+/** donne la liste déroulante des pays
+ * @param $current pays actuellement selectionné
*/
-function geoloc_country($current) {
- $res = XDB::iterRow('SELECT a2,pays FROM geoloc_pays ORDER BY pays');
+function geoloc_country($current, $avail_only = false)
+{
+ if ($avail_only) {
+ $res = XDB::iterRow('SELECT g.a2, g.pays
+ FROM geoloc_pays AS g
+ INNER JOIN adresses AS a ON(a.country = g.a2)
+ GROUP BY g.a2
+ ORDER BY g.pays');
+ } else {
+ $res = XDB::iterRow('SELECT a2,pays FROM geoloc_pays ORDER BY pays');
+ }
$html = "";
while (list($my_id, $my_pays) = $res->next()) {
- $html .= sprintf("<option value=\"%s\" %s>%s</option>\n",
- $my_id, ($current==$my_id?"selected='selected'":""), $my_pays);
+ $html .= sprintf("<option value=\"%s\" %s>%s</option>\n",
+ $my_id, ($current==$my_id?"selected='selected'":""), $my_pays);
}
return $html;
}
-function _geoloc_country_smarty($params){
- if(!isset($params['country']))
- return;
- return geoloc_country($params['country']);
+function _geoloc_country_smarty($params)
+{
+ if(!isset($params['country']))
+ return;
+ return geoloc_country($params['country'], @$params['available']);
}
+
$GLOBALS['page']->register_function('geoloc_country', '_geoloc_country_smarty');
/** donne la liste deroulante des regions pour un pays
* @param $pays le pays dont on veut afficher les regions
* @param $current la region actuellement selectionnee
*/
-function geoloc_region($country,$current) {
- $res = XDB::iterRow('SELECT region,name FROM geoloc_region where a2={?} ORDER BY name', $country);
+function geoloc_region($country, $current, $avail_only = false)
+{
+ if ($avail_only) {
+ $res = XDB::iterRow('SELECT r.region, r.name
+ FROM geoloc_region AS r
+ INNER JOIN adresses AS a ON (a.country = r.a2 AND a.region = r.region)
+ WHERE r.a2 = {?}
+ GROUP BY r.region
+ ORDER BY r.name', $country);
+ } else {
+ $res = XDB::iterRow('SELECT region,name
+ FROM geoloc_region
+ WHERE a2 = {?}
+ ORDER BY name', $country);
+ }
$html = "<option value=\"\"></option>";
while (list($regid, $regname) = $res->next()) {
- $html .= sprintf("<option value=\"%s\" %s>%s</option>\n",
- $regid, ($current==$regid?"selected='selected'":""), $regname);
+ $html .= sprintf("<option value=\"%s\" %s>%s</option>\n",
+ $regid, ($current==$regid?"selected='selected'":""), $regname);
}
return $html;
}
-function _geoloc_region_smarty($params){
- if(!isset($params['country']))
- return;
- if(!isset($params['region']))
- return;
- return geoloc_region($params['country'], $params['region']);
+
+function _geoloc_region_smarty($params)
+{
+ if(!isset($params['country']))
+ return;
+ if(!isset($params['region']))
+ return;
+ return geoloc_region($params['country'], $params['region'], @$params['available']);
}
$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
$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) => "œ")));
- if ($infos['sql'])
+ 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 ($infos['display'])
- XDB::execute("UPDATE geoloc_pays SET display = {?} WHERE a2 = {?}", $infos['display'], $infos['country']);
+ 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;
}
// }}}
*/
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]))
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);
$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);
}
// }}}
// }}}
// {{{ function fix_cities_not_on_map($limit)
-function fix_cities_not_on_map($limit=false)
+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".($limit?" LIMIT $limit":""));
+ $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)
{
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));
+ 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; }
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)
+ 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");
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 = array();
if ($mapid === false)
- $wheremapid = "WHERE gm.parent IS NULL";
+ $wheremapid = "WHERE gm.parent IS NULL";
else
- $wheremapid = "WHERE gm.parent = {?}";
+ $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
if ($mapid === false) return array($countries, $cities);
- geoloc_getData_subcities(Env::i('mapid'), $SFields, $cities);
- $nbcities = count($cities);
- $nocity = $nbcities == 0;
+ 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;
- }
-
+ $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:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>
projects / platal.git / blobdiff