Subversion Repositories eFlore/Projets.eflore-projets

Compare Revisions

Ignore whitespace Rev 961 → Rev 1300

/trunk/services/modules/0.1/eflore/cartes/CbnmedFormateur.php
112,7 → 112,7
$utm = array(0 => $tab_code_insee[$id_location_protege]);
} else {
$requete = "SELECT * ".
"FROM tb_cel.locations ".
"FROM tb_new_cel.locations ".
"WHERE insee_code = $id_location_protege ";
$utm = $this->getBdd()->recupererTous($requete);
}
/trunk/services/modules/0.1/eflore/cartes/GeneralFormateur.php
63,7 → 63,7
$inventoriesCel = array();
} else {
$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 ".
" longitude as y_utm, latitude as x_utm, geodatum as sector, courriel_utilisateur as identifiant FROM tb_new_cel.cel_obs ".
"WHERE nt = '".$this->info['nt']."' ".
" AND transmission = 1";
$inventoriesCel = $this->getBdd()->recupererTous($queryCel);
191,7 → 191,7
$utm = array(0 => $tab_code_insee[$id_location_protege]);
} else {
$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 ".
"FROM tb_new_cel.cel_zones_geo ".
"WHERE nom LIKE $location_protege ".
" AND code = $id_location_protege ";
$resultat = $this->getBdd()->recupererTous($requete);
201,7 → 201,7
}
} else {
$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 ";
" FROM tb_new_cel.cel_zones_geo WHERE nom LIKE $location_protege ";
$utm = $this->getBdd()->recupererTous($requete);
}
}
/trunk/services/modules/0.1/eflore/cartes/LegendeCartes.php
23,7 → 23,7
 
private $formatsSupportes = array(self::MIME_JSON);
private $tableOntologie = '';
private $ontologies = '';
private $ontologies = [];
private $legende = array();
 
public function __construct(Conteneur $conteneur) {
/trunk/services/modules/0.1/eflore/cartes/CelFormateur.php
54,7 → 54,7
* 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, 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 ".
" longitude as y_utm, latitude as x_utm, geodatum as sector, courriel_utilisateur as identifiant FROM tb_new_cel.cel_obs ".
"WHERE nt = '".$this->info['nt']."' ".
" AND transmission = 1";
$inventoriesCel = $this->getBdd()->recupererTous($queryCel);
117,7 → 117,7
}
} else {
$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 ";
" FROM tb_new_cel.cel_zones_geo WHERE nom LIKE $location_protege ";
$utm = $this->getBdd()->recupererTous($requete);
}
return $utm;