| 116,7 → 116,7 |
|---|
| $this->bdd->requeter("USE ".Config::get('bdd_nom')); |
| $requete = |
| "SELECT DISTINCTROW lieu_commune_code_insee AS commune, Floor(lieu_station_longitude*10)/10 as lng, Floor(lieu_station_latitude*10)/10 as lat, observation_date AS date, observateur_nom_complet AS auteur ". |
| "FROM vigie_flore_tapir WHERE ".$this->construireWhereTaxonMoissonnage($source)." ". |
| "FROM vigie_flore_tapir WHERE ".$this->construireWhereTaxonMoissonnage('vigie_flore')." ". |
| "AND lieu_station_longitude BETWEEN ".$this->limitesCarte['ouest']." AND ".$this->limitesCarte['est']." ". |
| "AND lieu_station_latitude BETWEEN ".$this->limitesCarte['sud']." AND ".$this->limitesCarte['nord']." ". |
| " ORDER BY lat DESC, lng ASC, lieu_commune_code_insee, date"." -- " . __FILE__ . ":" . __LINE__." ". @$_SERVER['REQUEST_URI']; |
| 127,12 → 127,12 |
|---|
| private function construireWhereTaxonMoissonnage($source) { |
| $nomRang = $this->obtenirNomRang(); |
| $criteres = array(); |
| $criteres[] = ($source == "baznat" || $source == "ifn") ? |
| $criteres[] = (in_array($source, array("baznat", "ifn", "vigie_flore")) ) ? |
| "num_nom = ".$this->taxon['num_nom'] : |
| "nom_scientifique_complet LIKE ".$this->bdd->proteger($this->taxon['nom_sci']) ; |
| if ($this->nomRang == 'espece' || $this->nomRang == 'sous_espece') { |
| foreach ($this->taxons as $sousTaxon) { |
| $criteres[] = ($source == "baznat" || $source == "ifn") ? |
| $criteres[] = (in_array($source, array("baznat", "ifn", "vigie_flore"))) ? |
| "num_nom = ".$sousTaxon['num_nom'] : |
| "nom_scientifique_complet LIKE ".$this->bdd->proteger($sousTaxon['nom_sci']) ; |
| } |