| 84,13 → 84,13 |
|---|
| $this->bdd = $this->gestionBdd->getBdd(); |
| } |
| |
| static function reformateObservation($obs, Conteneur $c = NULL) { |
| static function reformateObservation($obs, $url_pattern = '') { |
| $obs = array_map('array_filter', $obs); |
| $obs_merged = array(); |
| foreach($obs as $o) { |
| $id = $o['id_observation']; |
| $image = array_intersect_key($o, array_flip(array('id_image', 'date', 'hauteur' , 'largeur', 'nom_original'))); |
| $image['binaire.href'] = sprintf($c->getParametre('url_images'), $image['id_image']); |
| $image['binaire.href'] = sprintf($url_pattern, $image['id_image']); |
| unset($o['id_image'], $o['date'], $o['hauteur'], $o['largeur'], $o['nom_original']); |
| if(!isset($obs_merged['"' . $id . '"'])) $obs_merged['"' . $id . '"'] = $o; |
| $obs_merged['"' . $id . '"']['images'][] = $image; |
| 98,6 → 98,20 |
|---|
| return $obs_merged; |
| } |
| |
| static function reformateObservationSimpleIndex($obs, $url_pattern = '') { |
| $obs = array_map('array_filter', $obs); |
| $obs_merged = array(); |
| foreach($obs as $o) { |
| $id = $o['id_observation']; |
| $image = array_intersect_key($o, array_flip(array('id_image', 'date', 'hauteur' , 'largeur', 'nom_original'))); |
| $image['binaire.href'] = sprintf($url_pattern, $image['id_image']); |
| unset($o['id_image'], $o['date'], $o['hauteur'], $o['largeur'], $o['nom_original']); |
| if(!isset($obs_merged[$id])) $obs_merged[$id] = $o; |
| $obs_merged[$id]['images'][$image['id_image']] = $image; |
| } |
| return $obs_merged; |
| } |
| |
| /** |
| * Méthode principale de la classe. |
| * Lance la récupération des images dans la base et les place dans un objet ResultatService |
| 130,7 → 144,7 |
|---|
| $obs_unfmt = self::getInfos($idobs, $db); |
| |
| // 3) suppression, merge des données en tableau assez représentatif du futur JSON en output |
| $observations = self::reformateObservation($obs_unfmt, $this->conteneur); |
| $observations = self::reformateObservation($obs_unfmt, $this->conteneur->getParametre('url_images')); |
| |
| // 4) récupération des données nécessaires pour ces observations (commentaires + votes) |
| // modifie $observations |