X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fgeoloc.inc.php;h=51fc43c38c15162c975cd45180257fde0d0389c1;hb=e6bf921624e50f7abdd9a1862d0b7ef4f1053090;hp=107a5626d654817b6ba43cd2e7357582aad64769;hpb=8c4a0c30c699f190cb7906746e22f67014df3368;p=platal.git diff --git a/include/geoloc.inc.php b/include/geoloc.inc.php index 107a562..51fc43c 100644 --- a/include/geoloc.inc.php +++ b/include/geoloc.inc.php @@ -1,6 +1,6 @@ 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 @@ -77,17 +67,7 @@ function geoloc_region($country, $current, $avail_only = false) $regid, ($current==$regid?"selected='selected'":""), $regname); } return $html; - } - -function _geoloc_region_smarty($params) -{ - if(!isset($params['country']) || !isset($params['region'])) { - return; - } - return geoloc_region($params['country'], $params['region'], @$params['available']); -} -$GLOBALS['page']->register_function('geoloc_region', '_geoloc_region_smarty'); // }}} // {{{ get_address_infos($txt) @@ -95,7 +75,7 @@ $GLOBALS['page']->register_function('geoloc_region', '_geoloc_region_smarty'); * store on the fly the info of the city concerned * @param $txt the raw text of an address */ -function get_address_infos($txt) +function get_address_infos($txt) { global $globals; $url = $globals->geoloc->webservice_url."address.php?precise=1&txt=" . urlencode($txt); @@ -114,11 +94,25 @@ function get_address_infos($txt) } } if (isset($infos['sql']) && $infos['sql']) - XDB::execute("REPLACE INTO geoloc_city VALUES ".$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'])) + 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']); + if (floatval($infos['precise_lat']) && floatval($infos['precise_lon'])) { + $res = XDB::query("SELECT c.lat / 100000, c.lon / 100000 + FROM geoloc_city AS c + WHERE c.id = {?}", $infos['cityid']); + if ($res->numRows()) { + list($glat, $glng) = $res->fetchOneRow(); + $infos['precise_lat'] = $glat; + $infos['precise_lon'] = $glng; + } + } + } return $infos; } // }}} @@ -171,7 +165,7 @@ function get_new_maps($url) /** 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) +function get_address_text($adr) { $t = ""; if (isset($adr['adr1']) && $adr['adr1']) $t.= $adr['adr1']; @@ -217,7 +211,7 @@ function compare_addresses_text($a, $b) { $ta = strtoupper(preg_replace(array("/[0-9,\"'#~:;_\- ]/", "/\r\n/"), array("", "\n"), $a)); $tb = strtoupper(preg_replace(array("/[0-9,\"'#~:;_\- ]/", "/\r\n/"), array("", "\n"), $b)); - + $la = explode("\n", $ta); $lb = explode("\n", $tb); @@ -225,7 +219,7 @@ function compare_addresses_text($a, $b) return false; } foreach ($la as $i=>$l) { - if (levenshtein($l, $lb[$i]) > 3) { + if (levenshtein(trim($l), trim($lb[$i])) > 3) { return false; } } @@ -245,7 +239,9 @@ function empty_address() { "region" => "", "regiontxt" => "", "country" => "00", - "countrytxt" => ""); + "countrytxt" => "", + "precise_lat" => "", + "precise_lon" => ""); } // create a simple address from a text without geoloc @@ -299,7 +295,7 @@ function localize_addresses($uid) /** synchronise the local geoloc_city base to geoloc.org * @param $id the id of the city to synchronize */ -function synchro_city($id) +function synchro_city($id) { global $globals; $url = $globals->geoloc->webservice_url."cityFinder.php?method=id&id=".$id."&out=sql"; @@ -318,7 +314,7 @@ 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) + 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" : "" )); @@ -368,7 +364,7 @@ function geoloc_to_y($lon, $lat) if ($lat > 75) { return latToY(75); } - return -100 * log(tan(pi()/4 + deg2rad(1)/2*$lat)); + return -100 * log(tan(pi()/4 + deg2rad(1)/2*$lat)); } function size_of_city($nb) @@ -406,6 +402,7 @@ function geoloc_getData_subcities($mapid, $SFields, &$cities, $direct=true) $mapid); $fields = new SFieldGroup(true, $SFields); $where = $fields->get_where_statement(); + $joins = $fields->get_select_statement(); if ($where) { $where .= ' AND '; } @@ -414,7 +411,7 @@ function geoloc_getData_subcities($mapid, $SFields, &$cities, $direct=true) gc.name, COUNT(u.user_id) AS pop, SUM(u.promo % 2) AS yellow', - "{$fields->get_select_statement()} + "$joins LEFT JOIN geoloc_city AS gc ON(gcim.city_id = gc.id)", $where . ($direct ? "gcim.infos = 'smallest'" : '1'), 'gc.id, gc.alias', @@ -430,18 +427,18 @@ function geoloc_getData_subcities($mapid, $SFields, &$cities, $direct=true) } } -function geoloc_getData_subcountries($mapid, $sin, $minentities) +function geoloc_getData_subcountries($mapid, $sin, $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, + "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','')); @@ -454,7 +451,7 @@ function geoloc_getData_subcountries($mapid, $sin, $minentities) $country['swf'] = $globals->geoloc->webservice_url."maps/mercator/map_".$c['id'].".swf"; $countries[$c['id']] = $country; } - + if ($mapid === false) { return array($countries, $cities); } @@ -479,21 +476,23 @@ function geoloc_getData_subcountries($mapid, $sin, $minentities) array('map.parent'), array('adresses','geoloc_city_in_maps','geoloc_maps'), array('am','gcim','map'), - array(getadr_join('am'), - 'am.cityid = gcim.city_id', + 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(); + $joins = $fields->get_select_statement(); $countryres = $set->get('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', - $fields->get_select_statement(), - $fields->get_where_statement(), + $joins, + $where, 'map.map_id', 'NULL'); - + $maxpop = 0; $nbentities = $nbcities + $countryres->total(); while ($c = $countryres->next()) { @@ -503,29 +502,29 @@ function geoloc_getData_subcountries($mapid, $sin, $minentities) 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); - + @$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) { + if (@$c['nbCities'] > 0) { geoloc_getData_subcities($c['id'], $sin, $cities, false); - } + } } } - + foreach ($countries as $i => $c) { - if ($c['nbPop'] > 0) { + if (@$c['nbPop'] > 0) { $lambda = pow($c['nbPop'] / $maxpop,0.3); $countries[$i]['color'] = 0x0000FF + round((1-$lambda) * 0xFF)*0x010100; } } - - return array($countries, $cities); -} + + return array($countries, $cities); +} // }}} // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: