Line 88... |
Line 88... |
88 |
|
88 |
|
89 |
return array('type' => 'png', 'img' => $img);
|
89 |
return array('type' => 'png', 'img' => $img);
|
Line 90... |
Line 90... |
90 |
}
|
90 |
}
|
- |
|
91 |
|
91 |
|
92 |
public function getTout($params) {
|
92 |
public function getTout($params) {
|
93 |
|
Line 93... |
Line 94... |
93 |
$emplacements = null;
|
94 |
$emplacements = null;
|
- |
|
95 |
$concatenation_id = "CONCAT(IFNULL(latitude,''),IFNULL(longitude,''), IFNULL(wgs84_latitude,''),IFNULL(wgs84_longitude,'')) ";
|
- |
|
96 |
|
- |
|
97 |
$requete = 'SELECT ce_zone_geo, zone_geo, station, '.
|
- |
|
98 |
"mots_cles_texte, ".
|
94 |
$concatenation_id = "CONCAT(IFNULL(latitude,''),IFNULL(longitude,''), IFNULL(wgs84_latitude,''),IFNULL(wgs84_longitude,'')) ";
|
99 |
"latitude, ".
|
95 |
|
100 |
"wgs84_latitude, ".
|
96 |
$requete = 'SELECT ce_zone_geo, zone_geo, station, '.
|
101 |
"longitude, ".
|
97 |
' mots_cles_texte, latitude, wgs84_latitude, longitude, wgs84_longitude, '.
|
102 |
"wgs84_longitude, ".
|
98 |
" $concatenation_id AS id_coord ".
|
103 |
$concatenation_id." as id_coord ".
|
99 |
'FROM cel_obs AS co '.
|
104 |
'FROM cel_obs AS co '.
|
100 |
' LEFT JOIN cel_zones_geo AS l '.
|
105 |
' LEFT JOIN cel_zones_geo AS l '.
|
Line 242... |
Line 247... |
242 |
}
|
247 |
}
|
Line 243... |
Line 248... |
243 |
|
248 |
|
244 |
if (isset($this->parametres['ne']) && $this->parametres['sw'] && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) {
|
249 |
if (isset($this->parametres['ne']) && $this->parametres['sw'] && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) {
|
245 |
$ne = $this->decomposerLatLng($this->parametres['ne']);
|
250 |
$ne = $this->decomposerLatLng($this->parametres['ne']);
|
246 |
$sw = $this->decomposerLatLng($this->parametres['sw']);
|
251 |
$sw = $this->decomposerLatLng($this->parametres['sw']);
|
247 |
$marqueurs['points'] = CartoGroupage::creerGroupesQuadtree($points, $ne['lat'], $ne['lng'], $sw['lat'], $sw['lng'], $zoom);
|
252 |
$marqueurs['points'] = CartoGroupage::creerGroupesQuadtree(&$points, $ne['lat'], $ne['lng'], $sw['lat'], $sw['lng'], $zoom);
|
248 |
} else {
|
253 |
} else {
|
249 |
$marqueurs['points'] = $points;
|
254 |
$marqueurs['points'] = $points;
|
250 |
}
|
255 |
}
|
251 |
//$marqueurs['stats']['latDiff'] = abs($marqueurs['stats']['latMin'] - $marqueurs['stats']['latMax']);
|
256 |
//$marqueurs['stats']['latDiff'] = abs($marqueurs['stats']['latMin'] - $marqueurs['stats']['latMax']);
|
Line 317... |
Line 322... |
317 |
$total = 0;
|
322 |
$total = 0;
|
318 |
if (isset($this->parametres['station']) && !$this->etreNull($this->parametres['station'])) {
|
323 |
if (isset($this->parametres['station']) && !$this->etreNull($this->parametres['station'])) {
|
319 |
$requete = 'SELECT SQL_CALC_FOUND_ROWS id_observation, ce_utilisateur, courriel_utilisateur, nom_utilisateur, prenom_utilisateur, '.
|
324 |
$requete = 'SELECT SQL_CALC_FOUND_ROWS id_observation, ce_utilisateur, courriel_utilisateur, nom_utilisateur, prenom_utilisateur, '.
|
320 |
' nom_sel, nom_ret, nom_sel_nn, nom_ret_nn, nt, famille, '.
|
325 |
' nom_sel, nom_ret, nom_sel_nn, nom_ret_nn, nt, famille, '.
|
321 |
' lieudit, zone_geo, date_observation, milieu, commentaire, '.
|
326 |
' lieudit, zone_geo, date_observation, milieu, commentaire, '.
|
322 |
' utm_secteur, utm_x, utm_y, code, date_transmission '.
|
327 |
' utm_secteur, utm_x, utm_y, code, date_transmission, nom_referentiel '.
|
323 |
'FROM cel_obs AS co '.
|
328 |
'FROM cel_obs AS co '.
|
324 |
' LEFT JOIN cel_zones_geo AS l '.
|
329 |
' LEFT JOIN cel_zones_geo AS l '.
|
325 |
" ON (l.nom = co.zone_geo AND l.id_zone_geo = co.ce_zone_geo) ".
|
330 |
" ON (l.nom = co.zone_geo AND l.id_zone_geo = co.ce_zone_geo) ".
|
326 |
"WHERE transmission = '1' ".
|
331 |
"WHERE transmission = '1' ".
|
327 |
(($this->communeEstDemandee()) ? $this->construireWhereCommuneSansCoordonneesAvecSensibles() : $this->construireWhereCoordonneesSansSensibles()).
|
332 |
(($this->communeEstDemandee()) ? $this->construireWhereCommuneSansCoordonneesAvecSensibles() : $this->construireWhereCoordonneesSansSensibles()).
|
Line 366... |
Line 371... |
366 |
$observation['date'] = ($donnee->date_observation != '0000-00-00 00:00:00') ? $this->formaterDate($donnee->date_observation, '%d/%m/%Y') : '';
|
371 |
$observation['date'] = ($donnee->date_observation != '0000-00-00 00:00:00') ? $this->formaterDate($donnee->date_observation, '%d/%m/%Y') : '';
|
367 |
$observation['datePubli'] = $this->formaterDate($donnee->date_transmission);
|
372 |
$observation['datePubli'] = $this->formaterDate($donnee->date_transmission);
|
368 |
$observation['lieu'] = $this->traiterLieu($donnee);
|
373 |
$observation['lieu'] = $this->traiterLieu($donnee);
|
369 |
$observation['observateur'] = $donnee->courriel_utilisateur;
|
374 |
$observation['observateur'] = $donnee->courriel_utilisateur;
|
370 |
$observation['observateurId'] = $donnee->ce_utilisateur;
|
375 |
$observation['observateurId'] = $donnee->ce_utilisateur;
|
371 |
$observation['urlEflore'] = $this->getUrlEflore($donnee->nom_sel_nn);
|
376 |
$observation['urlEflore'] = $this->getUrlEflore($donnee->nom_referentiel, $donnee->nom_sel_nn);
|
Line 372... |
Line 377... |
372 |
|
377 |
|
373 |
if (isset($donnee->zone_geo)) {
|
378 |
if (isset($donnee->zone_geo)) {
|
374 |
$observations['commune'] = $this->nettoyerTexte($donnee->zone_geo);
|
379 |
$observations['commune'] = $this->nettoyerTexte($donnee->zone_geo);
|
375 |
}
|
380 |
}
|
Line 381... |
Line 386... |
381 |
}
|
386 |
}
|
382 |
}
|
387 |
}
|
383 |
return $observations;
|
388 |
return $observations;
|
384 |
}
|
389 |
}
|
Line 385... |
Line -... |
385 |
|
- |
|
386 |
private function getUrlEflore($nn) {
|
- |
|
387 |
$urlEflore = null;
|
- |
|
388 |
if (! $this->etreNull($nn)) {
|
- |
|
389 |
$urlEflore = sprintf($this->config['settings']['efloreUrlTpl'], $nn, 'illustration');
|
- |
|
390 |
}
|
- |
|
391 |
return $urlEflore;
|
- |
|
392 |
}
|
- |
|
393 |
|
390 |
|
394 |
private function traiterLieu($donnee) {
|
391 |
private function traiterLieu($donnee) {
|
395 |
$lieu = array();
|
392 |
$lieu = array();
|
396 |
if (!$this->etreNull($donnee->lieudit)) {
|
393 |
if (!$this->etreNull($donnee->lieudit)) {
|
397 |
$lieu[] = $donnee->lieudit;
|
394 |
$lieu[] = $donnee->lieudit;
|