Subversion Repositories eFlore/Projets.eflore-projets

Compare Revisions

Ignore whitespace Rev 540 → Rev 541

/trunk/services/modules/0.1/eflore/cartes/CelFormateur.php
53,9 → 53,9
*
* A terme, utilser vraiment le moissonage, y compris pour les donnees issues du CEL, en utilisant ABCD et en modifiant le programme d'harvesting.
*/
$queryCel = "SELECT 'cel' as collection_code, location, id_location, date_observation, ".
" coord_y as y_utm, coord_x as x_utm, ref_geo as sector, identifiant FROM tb_cel.cel_inventory ".
"WHERE num_taxon = '".$this->info['nt']."' ".
$queryCel = "SELECT 'cel' as collection_code, zone_geo as location, REPLACE(ce_zone_geo,'INSEE-C:','') as id_location, date_observation, ".
" longitude as y_utm, latitude as x_utm, geodatum as sector, courriel_utilisateur as identifiant FROM tb_cel.cel_obs ".
"WHERE nt = '".$this->info['nt']."' ".
" AND transmission = 1";
$inventoriesCel = $this->getBdd()->recupererTous($queryCel);
return $inventoriesCel;
108,15 → 108,15
if (isset($tab_code_insee) & in_array($inventory['id_location'], $tab_code_insee)) {
$utm = array(0 => $this->tab_code_insee[$id_location_protege]);
} else {
$requete = "SELECT * ".
"FROM tb_cel.locations ".
"WHERE name LIKE $location_protege ".
$requete = "SELECT *, nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector ".
"FROM tb_cel.cel_zones_geo ".
"WHERE nom LIKE $location_protege ".
" AND code = $id_location_protege ";
$resultat = $this->getBdd()->recupererTous($requete);
$utm = $resultat;
}
} else {
$requete = "SELECT * FROM tb_cel.locations WHERE name LIKE $location_protege ";
$requete = "SELECT *, nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector FROM tb_cel.cel_zones_geo WHERE nom LIKE $location_protege ";
$utm = $this->getBdd()->recupererTous($requete);
}
return $utm;