| 43,7 → 43,7 |
|---|
| } else if (array_key_exists('projet', $requeteDonnees)) { |
| $this->debug[] = 'Projet : '.$requeteDonnees['projet']; |
| if ($requeteDonnees['projet'] != "base") { |
| $this->projet = $requeteDonnees['projet']; |
| $this->projet = $requeteDonnees['projet'] ?? null; |
| $this->projetId = $requeteDonnees['id_projet'] ?? null; |
| } |
| |
| 125,6 → 125,8 |
|---|
| 'coordinates' => [ (float)$obs['longitude'], (float)$obs['latitude'] ] |
| ]); // CONCAT('{\"type\":\"Point\",\"coordinates\":[', longitude, ',', latitude,']}'), |
| $obsAAjouter['geodatum'] = 'WGS84'; |
| $obsAAjouter['published_location'] = ($this->tagsObs != null && in_array('sensible', $this->tagsObs) == true) ? |
| "localité" : "précise"; |
| |
| $obsAAjouter['phenology'] = isset($obs['phenologie']) ? $obs['phenologie'] : null; |
| $obsAAjouter['coef'] = isset($obs['abondance']) ? $obs['abondance'] : null; |
| 137,7 → 139,7 |
|---|
| $obsAAjouter['image_nom'] = $obs['image_nom'] ?? null; |
| $obsAAjouter['image_b64'] = $obs['image_b64'] ?? null; |
| |
| $obsAAjouter['certainty'] = ''; |
| $obsAAjouter['certainty'] = null; |
| if (isset($obs['certitude'])) { |
| switch ($obs['certitude']) { |
| case 'certaine': |
| 151,9 → 153,11 |
|---|
| break; |
| } |
| } |
| $obsAAjouter['certainty'] = ($this->projet == "aDeterminer") ? 'à déterminer' : $obsAAjouter['certainty']; |
| $obsAAjouter['input_source'] = 'widget'; |
| $obsAAjouter['project_id'] = $this->projetId; |
| $obsAAjouter['project'] = $this->projet; |
| // racommodage en attendant mieux |
| $obsAAjouter['project'] = ($this->projetId == null) ? null : ($this->projetId == 53) ? "missions-flore" : $this->projet ; |
| if ($this->isFromPlantNet) { |
| $obsAAjouter['input_source'] = 'PlantNet'; |
| $obsAAjouter['plantnet_id'] = $obs['obs_id']; |
| 663,6 → 667,7 |
|---|
| |
| private function traiterNomFichierImage($fichierNom) { |
| $fichierNom = preg_replace('/[.](jpeg|jpg)$/i', '.jpg', strtolower(trim($fichierNom))); |
| |
| return $fichierNom; |
| } |
| |
| 749,7 → 754,7 |
|---|
| $requete = $this->construireRequeteInsertionImage($infosImage); |
| $resultat = Cel::db()->executer($requete); |
| if ($resultat !== false) { |
| $idImage = $this->traiterEtRecupererIdImage($nomFichierImage); |
| $idImage = $this->traiterEtRecupererIdImage($nomFichierImage, $id_obs); |
| if ($idImage !== false) { |
| $infosImage['url'] = 'https://api.tela-botanica.org/img:'.str_pad($idImage, 9, '0', STR_PAD_LEFT).'O'; |
| |
| 799,14 → 804,13 |
|---|
| return $ok; |
| } |
| |
| private function traiterEtRecupererIdImage($original_name) { |
| $id_utilisateur = Cel::db()->proteger($this->userId); |
| $email_utilisateur = Cel::db()->proteger($this->userEmail); |
| private function traiterEtRecupererIdImage($original_name, $id_obs) { |
| $original_name = Cel::db()->proteger($original_name); |
| |
| $id_obs = Cel::db()->proteger($id_obs); |
| |
| $requete = 'SELECT id '. |
| 'FROM photo '. |
| "WHERE (user_id = $id_utilisateur OR user_email = $email_utilisateur)". |
| "WHERE occurrence_id = ".$id_obs. |
| " AND original_name = $original_name "; |
| $resultat = Cel::db()->requeter($requete); |
| $id_image = $resultat[0]['id'] ?? false; |