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