Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 498 → Rev 499

/trunk/jrest/services/CelWidgetMap.php
74,34 → 74,39
$resultats = $this->executerRequete($requete);
// Traitement des résultats
$mm = array('min_x' => 0,'max_x' => 0,'min_y' => 0,'max_y' => 0);
$mm = null;
$points = array();
foreach ($resultats as $enrg) {
$convertisseur = new gPoint();
$convertisseur->setUTM($enrg['x_utm'], $enrg['y_utm'], $enrg['sector']);
$convertisseur->convertTMtoLL();
$enrg['coord_x'] = $convertisseur->Lat();
$enrg['coord_y'] = $convertisseur->Long();
$enrg['id'] = 'UTM:'.$enrg['x_utm'].'-'.$enrg['y_utm'].'-'.$enrg['sector'];
$id = $enrg['coord_x'].'-'.$enrg['coord_y'];
if (!isset($points[$id])) {
$points[$id] = $enrg;
$points[$id]['nbre'] = 1;
} else {
$points[$id]['nbre']++;
if ($enrg['x_utm'] != null && $enrg['y_utm'] != null) {
$convertisseur = new gPoint();
$convertisseur->setUTM($enrg['x_utm'], $enrg['y_utm'], $enrg['sector']);
$convertisseur->convertTMtoLL();
$enrg['coord_x'] = $convertisseur->Lat();
$enrg['coord_y'] = $convertisseur->Long();
$enrg['id'] = 'UTM:'.$enrg['x_utm'].'-'.$enrg['y_utm'].'-'.$enrg['sector'];
$id = $enrg['coord_x'].'-'.$enrg['coord_y'];
if (!isset($points[$id])) {
$points[$id] = $enrg;
$points[$id]['nbre'] = 1;
} else {
$points[$id]['nbre']++;
}
// Détermination x et y min et max
if (is_null($mm)) {
$mm = array('min_x' => $enrg['coord_x'],
'max_x' => $enrg['coord_x'],
'min_y' => $enrg['coord_y'],
'max_y' => $enrg['coord_y']);
} else {
$mm['min_x'] = ($mm['min_x'] > $enrg['coord_x']) ? $enrg['coord_x'] : $mm['min_x'];
$mm['min_y'] = ($mm['min_y'] > $enrg['coord_y']) ? $enrg['coord_y'] : $mm['min_y'];
$mm['max_x'] = ($mm['max_x'] < $enrg['coord_x']) ? $enrg['coord_x'] : $mm['max_x'];
$mm['max_y'] = ($mm['max_y'] < $enrg['coord_y']) ? $enrg['coord_y'] : $mm['max_y'];
}
}
 
// Détermination x et y min et max
$mm['min_x'] = ($mm['min_x'] > $enrg['coord_x']) ? $enrg['coord_x'] : $mm['min_x'];
$mm['min_y'] = ($mm['min_y'] > $enrg['coord_y']) ? $enrg['coord_y'] : $mm['min_y'];
$mm['max_x'] = ($mm['max_x'] < $enrg['coord_x']) ? $enrg['coord_x'] : $mm['max_x'];
$mm['max_y'] = ($mm['max_y'] < $enrg['coord_y']) ? $enrg['coord_y'] : $mm['max_y'];
}
 
// Post-traitement des résultats
$x_moyen = str_replace(',', '.', ($mm['max_x'] - $mm['min_x']));
$y_moyen = str_replace(',', '.', ($mm['max_y'] - $mm['min_y']));
$points = array_values($points);
 
// Création des infos du widget
110,8 → 115,8
$json['donnees']['points'] = $points;
$json['donnees']['nombre'] = count($points);
$json['donnees']['centre_x'] = $x_moyen;
$json['donnees']['centre_y'] = $y_moyen;
$json['donnees']['centre_x'] = $mm['min_x'].'-'.$mm['max_x'];
$json['donnees']['centre_y'] = $mm['min_y'].'-'.$mm['max_y'];
 
 
//echo '<pre>'.print_r($json, true).'</pre>';
169,10 → 174,6
$mm['max_x'] = ($mm['max_x'] < $enrg['coord_x']) ? $enrg['coord_x'] : $mm['max_x'];
$mm['max_y'] = ($mm['max_y'] < $enrg['coord_y']) ? $enrg['coord_y'] : $mm['max_y'];
}
// Post-traitement des résultats
$x_moyen = str_replace(',', '.', ($mm['max_x'] - $mm['min_x']));
$y_moyen = str_replace(',', '.', ($mm['max_y'] - $mm['min_y']));
$points = array_values($points);
// Création des infos du widget
180,8 → 181,8
$json['variable_js'] = 'obs';
$json['donnees']['points'] = $points;
$json['donnees']['nombre'] = count($points);
$json['donnees']['centre_x'] = $x_moyen;
$json['donnees']['centre_y'] = $y_moyen;
$json['donnees']['centre_x'] = $mm['min_x'].'-'.$mm['max_x'];
$json['donnees']['centre_y'] = $mm['min_y'].'-'.$mm['max_y'];
}
 
//echo '<pre>'.print_r($json, true).'</pre>';
256,7 → 257,8
(isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '').
(isset($dept) ? " AND l.insee_code LIKE '$dept%' " : '').
(isset($num_taxon) ? " AND num_taxon = '$num_taxon' " : '' ).
((isset($projet) && $projet_sql != '') ? " AND ($projet_sql) " : '' );
((isset($projet) && $projet_sql != '') ? " AND ($projet_sql) " : '' ).
'ORDER BY nom_ret ASC ';
//$this->debug[] = $requete;
 
$resultats = $this->executerRequete($requete);