31,9 → 31,6 |
*/ |
public function getElement($ressources) { |
$retour = null; |
if($this->parametres == null) { |
$this->parametres = array(); |
} |
extract($this->parametres); |
//Chronometre::chrono("Avant groupage"); |
|
246,7 → 243,7 |
'points' => null |
); |
|
if (isset($this->parametres['ne']) && $this->parametres['sw'] && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) { |
if (! $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($emplacements, $ne['lat'], $ne['lng'], $sw['lat'], $sw['lng'], $zoom); |
323,7 → 320,7 |
} |
} |
|
if (isset($this->parametres['ne']) && $this->parametres['sw'] && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) { |
if (! $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); |
388,7 → 385,7 |
public function getObservations($params) { |
$resultats = array(); |
$total = 0; |
if (isset($this->parametres['station']) && !$this->etreNull($this->parametres['station'])) { |
if (!$this->etreNull($this->parametres['station'])) { |
$requete = 'SELECT SQL_CALC_FOUND_ROWS id, identifiant, nom_sel, nom_ret, num_nom_sel, num_nom_ret, num_taxon, famille, '. |
' lieudit, location, date_observation, milieu, commentaire, '. |
' sector, x_utm, y_utm, insee_code, date_transmission '. |
847,7 → 844,7 |
|
private function construireWhereRectangleStation() { |
$sql = ''; |
if (isset($this->parametres['ne']) && isset($this->parametres['sw']) && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) { |
if (! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) { |
$ne = $this->decomposerLatLng($this->parametres['ne']); |
$sw = $this->decomposerLatLng($this->parametres['sw']); |
|
869,7 → 866,7 |
|
private function construireWhereRectangleStationOR() { |
$sql = ''; |
if (isset($this->parametres['ne']) && isset($this->parametres['sw']) && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) { |
if (! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) { |
$ne = $this->decomposerLatLng($this->parametres['ne']); |
$sw = $this->decomposerLatLng($this->parametres['sw']); |
|
891,7 → 888,7 |
|
private function construireWhereRectangleCommune() { |
$sql = ''; |
if (isset($this->parametres['ne']) && isset($this->parametres['sw']) && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) { |
if (! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) { |
$ne = $this->decomposerLatLng($this->parametres['ne']); |
$sw = $this->decomposerLatLng($this->parametres['sw']); |
|
912,7 → 909,7 |
|
private function construireWhereRectangleCommuneOR() { |
$sql = ''; |
if (isset($this->parametres['ne']) && isset($this->parametres['sw']) && ! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) { |
if (! $this->etreNull($this->parametres['ne']) && ! $this->etreNull($this->parametres['sw'])) { |
$ne = $this->decomposerLatLng($this->parametres['ne']); |
$sw = $this->decomposerLatLng($this->parametres['sw']); |
|
935,7 → 932,7 |
$sql = ''; |
// Récupération des coordonnées depuis l'id station |
extract($this->parametres); |
if (isset($this->parametres['dept']) && !$this->etreNull($dept)) { |
if (!$this->etreNull($dept)) { |
$dept = $this->traiterValeursMultiples($dept); |
$sql = " AND code IN ($dept) "; |
} |
946,7 → 943,7 |
$sql = ''; |
// Récupération des coordonnées depuis l'id station |
extract($this->parametres); |
if (isset($this->parametres['commune']) && !$this->etreNull($commune)) { |
if (!$this->etreNull($commune)) { |
$commune = $this->proteger($commune); |
$sql = " AND location LIKE $commune "; |
} |
957,7 → 954,7 |
$sql = ''; |
// Récupération des coordonnées depuis l'id station |
extract($this->parametres); |
if (isset($this->parametres['commune']) && !$this->etreNull($commune)) { |
if (!$this->etreNull($commune)) { |
$commune = $this->proteger($commune); |
$sql = " AND location LIKE $commune "; |
$sql .= " AND ( |
976,7 → 973,7 |
$sql = ''; |
// Récupération des coordonnées depuis l'id station |
extract($this->parametres); |
if (isset($this->parametres['utilisateur']) && !$this->etreNull($utilisateur)) { |
if (!$this->etreNull($utilisateur)) { |
$utilisateur = $this->proteger($utilisateur); |
$sql = " AND identifiant = $utilisateur "; |
} |
987,7 → 984,7 |
$sql = ''; |
// Récupération des coordonnées depuis l'id station |
extract($this->parametres); |
if (isset($this->parametres['num_taxon']) && !$this->etreNull($num_taxon)) { |
if (!$this->etreNull($num_taxon)) { |
$num_taxon = $this->proteger($num_taxon); |
$sql = " AND num_taxon = $num_taxon "; |
} |
998,11 → 995,9 |
$sql = ''; |
// Récupération des coordonnées depuis l'id station |
extract($this->parametres); |
if(isset($this->parametres['projet']) ) { |
$projet_sql = $this->getSqlWhereProjet($projet); |
if (!$this->etreNull($projet_sql)) { |
$sql = " AND ($projet_sql) "; |
} |
$projet_sql = $this->getSqlWhereProjet($projet); |
if (!$this->etreNull($projet_sql)) { |
$sql = " AND ($projet_sql) "; |
} |
return $sql; |
} |
1043,11 → 1038,9 |
$sql = ''; |
// Récupération des coordonnées depuis l'id station |
extract($this->parametres); |
if(isset($this->parametres['tag']) ) { |
$tag_sql = $this->getSqlWhereObsAvecImagesTaguees($tag); |
if (!$this->etreNull($tag_sql)) { |
$sql = " AND ($tag_sql) "; |
} |
$tag_sql = $this->getSqlWhereObsAvecImagesTaguees($tag); |
if (!$this->etreNull($tag_sql)) { |
$sql = " AND ($tag_sql) "; |
} |
return $sql; |
} |
1219,7 → 1212,7 |
} |
|
private function decomposerParametreDate() { |
$date_infos = array(null,null); |
$date_infos = array(); |
if (isset($this->parametres['date'])) { |
$date = $this->parametres['date']; |
if (strpos($date, ':')) { |
1239,7 → 1232,7 |
} |
|
private function decomposerParametreTaxon() { |
$nom_infos = array(null,null); |
$nom_infos = array(); |
if (isset($this->parametres['taxon'])) { |
$taxon = $this->parametres['taxon']; |
if (strpos($taxon, ':')) { |
1252,7 → 1245,7 |
} |
|
private function decomposerParametreCommentaire() { |
$commentaire_infos = array(null,null); |
$commentaire_infos = array(); |
if (isset($this->parametres['commentaire'])) { |
$commentaire = $this->parametres['commentaire']; |
if (strpos($commentaire, ':')) { |