From 1a4156232bb11ed911df88ce02dae4e00763ffac Mon Sep 17 00:00:00 2001
From: Vincent Calame <vincent.calame@exemole.fr>
Date: Wed, 6 Mar 2019 01:26:18 +0100
Subject: [PATCH] Utilisation de events plutot que map.json

---
 mes_fonctions.php   | 10 +++++-----
 modeles/agenda.html |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mes_fonctions.php b/mes_fonctions.php
index 4a729d7..0b20c29 100644
--- a/mes_fonctions.php
+++ b/mes_fonctions.php
@@ -122,16 +122,16 @@ function mes_balise_Repartition2($tag) {
     if ($GLOBALS[MES]["repartition2"] != false) {
         return $GLOBALS[MES]["repartition2"];
     }
-    $url_evenements = 'http://www.agendadulibre.org/maps.json?future=false&tag='.$tag;
+    $url_evenements = 'http://www.agendadulibre.org/events.json?future=false&tag='.$tag;
     $evenementArray = json_decode(file_get_contents($url_evenements), true);
     $evenementCount = count($evenementArray);
     $evenementParRegionMap = array();
     for($i = 0; $i < $evenementCount; $i++) {
         $evenement = $evenementArray[$i];
         $region_id = 0;
-        if (array_key_exists("region", $evenement["properties"])) {
-            $region_id = $evenement["properties"]["region_id"];
-        }
+        if (array_key_exists("region_id", $evenement)) {
+            $region_id = $evenement["region_id"];
+	}
         if (array_key_exists("id_".$region_id, $evenementParRegionMap)) {
             $evenementParRegionMap["id_".$region_id][] = $evenement;
         } else {
@@ -183,4 +183,4 @@ function mes_balise_Repartition2($tag) {
 function mes_compare($a, $b) {
     $coll = collator_create( 'fr_FR' );
     return collator_compare($coll, $a, $b);
-}
\ No newline at end of file
+}
diff --git a/modeles/agenda.html b/modeles/agenda.html
index 409680e..97ff0f7 100644
--- a/modeles/agenda.html
+++ b/modeles/agenda.html
@@ -4,10 +4,10 @@
 <BOUCLE_sousregions(DATA){source tableau, #VALEUR{sousregions}}>
 <h4 class="spip">#VALEUR{name}</h4>
 <ul>
-<BOUCLE_evenements(DATA) {source tableau, #VALEUR{evenements}}{par properties/start_time}>
-[(#SET{evt,#VALEUR|table_valeur{properties}})]
+<BOUCLE_evenements(DATA) {source tableau, #VALEUR{evenements}}{par start_time}>
+[(#SET{evt,#VALEUR})]
     <li>[[(#GET{evt/start_time}|nom_jour)] (#GET{evt/start_time}|affdate_jourcourt)[ à (#GET{evt/start_time}|heures)][:(#GET{evt/start_time}|minutes)]]
-        <a href="http://www.agendadulibre.org/events/[(#GET{evt/id})]">[(#GET{evt/name})]</a>
+        <a href="http://www.agendadulibre.org/events/[(#GET{evt/id})]">[(#GET{evt/title})]</a>
         à [(#GET{evt/city})]
     </li>
 </BOUCLE_evenements>