Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 1097 → Rev 1112

/trunk/jrest/lib/CartoGroupage.php
18,6 → 18,8
private static $listeNoeudsSelectionnes = array();
private static $pointsDejaTraites = array();
private static $bornesMax = array('latMin' => null, 'lngMin' => null, 'latMax' => null, 'lngMax' => null);
 
/*
+---------+---------+
43,7 → 45,8
self::attribuerAuCadran($noeudRacine, $neLat, $neLng, $swLat, $swLng);
} else {
foreach($markers as $marker) {
foreach($markers as $marker) {
self::mettreAJourBornes(&$marker);
$points = array($marker);
$noeudSimple = array('points' => $points, 'nbrePoints' => 1);
self::$nbElements['observations']++;
89,6 → 92,17
return self::$nbElements;
}
public static function mettreAJourBornes(&$point) {
self::$bornesMax['latMin'] = (is_numeric($point['lat']) && $point['lat'] < self::$bornesMax['latMin'] || self::$bornesMax['latMin'] == null) ? $point['lat'] : self::$bornesMax['latMin'] ;
self::$bornesMax['lngMin'] = (is_numeric($point['lng']) && $point['lng'] < self::$bornesMax['lngMin'] || self::$bornesMax['lngMin'] == null) ? $point['lng'] : self::$bornesMax['lngMin'] ;
self::$bornesMax['latMax'] = (is_numeric($point['lat']) && $point['lat'] > self::$bornesMax['latMax'] || self::$bornesMax['latMax'] == null) ? $point['lat'] : self::$bornesMax['latMax'] ;
self::$bornesMax['lngMax'] = (is_numeric($point['lng']) && $point['lng'] > self::$bornesMax['lngMax'] || self::$bornesMax['lngMax'] == null) ? $point['lng'] : self::$bornesMax['lngMax'] ;
}
public static function getBornes() {
return self::$bornesMax;
}
/**
*
* @param mixed $noeud Le noeud à traiter par le quadtree
104,6 → 118,7
$lngCentre = round((($neLng+$swLng)/2)/self::$pasCorrectionCentre,0)*self::$pasCorrectionCentre;
foreach ($noeud['points'] as &$point) {
self::mettreAJourBornes(&$point);
self::$nbElements['observations']++;
$emplacement = isset($point['type_emplacement']) ? $point['type_emplacement'] : self::obtenirTypeEmplacementParId(&$point);
self::$nbElements[$emplacement]++;
/trunk/jrest/services/CelWidgetMapPoint.php
187,21 → 187,11
$this->construireWhereDate().
$this->construireWhereCommentaire().
$this->construireWhereProjet().
$this->construireWhereTag();
$this->construireWhereTag().' LIMIT 0,20000';
$i = 0;
$limite = 50000;
$resultats = array();
do {
$resultats_emplacements = $this->executerRequete($requete.' LIMIT '.$i.','.$limite);
$resultats = array_merge($resultats,$resultats_emplacements);
$i += $limite;
} while(count($resultats_emplacements) > 0);
//echo $requete;
echo '<pre>'.print_r($resultats,true).'</pre>';
//$emplacements = $this->traiterEmplacements($resultats_emplacements, $this->compterObservations($params));
 
//return $emplacements;
$resultats_emplacements = $this->executerRequete($requete);
$emplacements = $this->traiterEmplacements($resultats_emplacements, $this->compterObservations($params));
return $emplacements;
}
private function afficherRequeteFormatee($requete) {
261,7 → 251,8
// laisser la classe cartoGroupage compter les élements simplifie le comptage
// et permet de ne pas reparser le tableau pour compter les différents éléments
$nb_elements = CartoGroupage::getNbElements();
 
$marqueurs['stats']['coordmax'] = CartoGroupage::getBornes();
$marqueurs['stats']['stations'] = $nb_elements['stations'];
$marqueurs['stats']['communes'] = $nb_elements['communes'];
$marqueurs['stats']['observations'] = (int)$nb_total_observation;