| 90,12 → 90,17 |
|---|
| } |
| |
| public function getTout($params) { |
| |
| $emplacements = null; |
| $concatenation_id = "CONCAT(IFNULL(latitude,''),IFNULL(longitude,''), IFNULL(wgs84_latitude,''),IFNULL(wgs84_longitude,'')) "; |
| |
| $requete = 'SELECT ce_zone_geo, zone_geo, station, '. |
| ' mots_cles_texte, latitude, wgs84_latitude, longitude, wgs84_longitude, '. |
| " $concatenation_id AS id_coord ". |
| "mots_cles_texte, ". |
| "latitude, ". |
| "wgs84_latitude, ". |
| "longitude, ". |
| "wgs84_longitude, ". |
| $concatenation_id." as id_coord ". |
| 'FROM cel_obs AS co '. |
| ' LEFT JOIN cel_zones_geo AS l '. |
| ' ON (l.nom = co.zone_geo AND l.id_zone_geo = co.ce_zone_geo) '. |
| 244,7 → 249,7 |
|---|
| if (isset($this->parametres['ne']) && $this->parametres['sw'] && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) { |
| $ne = $this->decomposerLatLng($this->parametres['ne']); |
| $sw = $this->decomposerLatLng($this->parametres['sw']); |
| $marqueurs['points'] = CartoGroupage::creerGroupesQuadtree($points, $ne['lat'], $ne['lng'], $sw['lat'], $sw['lng'], $zoom); |
| $marqueurs['points'] = CartoGroupage::creerGroupesQuadtree(&$points, $ne['lat'], $ne['lng'], $sw['lat'], $sw['lng'], $zoom); |
| } else { |
| $marqueurs['points'] = $points; |
| } |
| 319,7 → 324,7 |
|---|
| $requete = 'SELECT SQL_CALC_FOUND_ROWS id_observation, ce_utilisateur, courriel_utilisateur, nom_utilisateur, prenom_utilisateur, '. |
| ' nom_sel, nom_ret, nom_sel_nn, nom_ret_nn, nt, famille, '. |
| ' lieudit, zone_geo, date_observation, milieu, commentaire, '. |
| ' utm_secteur, utm_x, utm_y, code, date_transmission '. |
| ' utm_secteur, utm_x, utm_y, code, date_transmission, nom_referentiel '. |
| 'FROM cel_obs AS co '. |
| ' LEFT JOIN cel_zones_geo AS l '. |
| " ON (l.nom = co.zone_geo AND l.id_zone_geo = co.ce_zone_geo) ". |
| 368,7 → 373,7 |
|---|
| $observation['lieu'] = $this->traiterLieu($donnee); |
| $observation['observateur'] = $donnee->courriel_utilisateur; |
| $observation['observateurId'] = $donnee->ce_utilisateur; |
| $observation['urlEflore'] = $this->getUrlEflore($donnee->nom_sel_nn); |
| $observation['urlEflore'] = $this->getUrlEflore($donnee->nom_referentiel, $donnee->nom_sel_nn); |
| |
| if (isset($donnee->zone_geo)) { |
| $observations['commune'] = $this->nettoyerTexte($donnee->zone_geo); |
| 383,14 → 388,6 |
|---|
| return $observations; |
| } |
| |
| private function getUrlEflore($nn) { |
| $urlEflore = null; |
| if (! $this->etreNull($nn)) { |
| $urlEflore = sprintf($this->config['settings']['efloreUrlTpl'], $nn, 'illustration'); |
| } |
| return $urlEflore; |
| } |
| |
| private function traiterLieu($donnee) { |
| $lieu = array(); |
| if (!$this->etreNull($donnee->lieudit)) { |