From 65956ff6bea46231ada093ba851b8cfd367b3f45 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Sat, 27 Sep 2025 00:18:03 +0200 Subject: [PATCH] up emojis --- extractors/osm_cal.py | 40 +++ extractors/osmcal_debug.html | 66 ++--- oedb/resources/demo/demo_main.py | 192 +++++++++++-- oedb/resources/demo/static/demo_styles.css | 10 +- oedb/resources/demo/static/edit.js | 8 +- .../resources/demo/templates/traffic_new.html | 12 +- static/map_by_what.css | 148 ++++++++++ static/map_by_what.js | 260 ++++++++++++++++++ 8 files changed, 657 insertions(+), 79 deletions(-) create mode 100644 static/map_by_what.css create mode 100644 static/map_by_what.js diff --git a/extractors/osm_cal.py b/extractors/osm_cal.py index 5263bc0..cc3b2be 100755 --- a/extractors/osm_cal.py +++ b/extractors/osm_cal.py @@ -639,10 +639,15 @@ def submit_event(event): if event_id: logger.success(f"Event created with ID: {event_id}") + logger.info(f" https://api.openeventdatabase.org/event/{event_id}") return True else: logger.warning(f"Event created but no ID returned in response") return True + elif response.status_code == 409: + # 409 Conflict - L'événement existe déjà, considéré comme un succès + logger.success(f"Event already exists in database: {properties.get('label')} (HTTP 409)") + return True else: logger.warning(f"Failed to create event: {properties.get('label')}. Status code: {response.status_code}") logger.warning(f"Response: {response.text}") @@ -739,6 +744,12 @@ def main(max_events=1, offset=0): success_count = 0 for event_link in events_to_process: try: + # Vérifier si l'événement est déjà en succès (sécurité supplémentaire) + if event_cache.get(event_link, {}).get('status') == 'success': + logger.info(f"Événement déjà en succès, passage au suivant : {event_link}") + success_count += 1 # Compter comme succès puisqu'il est déjà traité + continue + event_cache[event_link]['attempts'] += 1 event_cache[event_link]['last_attempt'] = datetime.now().isoformat() @@ -775,7 +786,36 @@ def main(max_events=1, offset=0): # Sauvegarder le cache mis à jour save_event_cache(event_cache) + # Calculer les statistiques finales du cache + cache_stats = { + 'success': 0, + 'pending': 0, + 'failed': 0, + 'error': 0, + 'total': len(event_cache) + } + + for link, data in event_cache.items(): + status = data.get('status', 'pending') + if status in cache_stats: + cache_stats[status] += 1 + + # Événements en attente d'insertion (tous sauf success) + events_awaiting_insertion = cache_stats['pending'] + cache_stats['failed'] + cache_stats['error'] + logger.success(f"Traitement terminé : {success_count} événements insérés avec succès sur {len(events_to_process)} traités") + logger.info("=== STATISTIQUES GLOBALES DU CACHE ===") + logger.info(f"Total d'événements dans le cache : {cache_stats['total']}") + logger.info(f"Événements traités avec succès : {cache_stats['success']}") + logger.info(f"Événements en attente d'insertion : {events_awaiting_insertion}") + logger.info(f" - Statut 'pending' : {cache_stats['pending']}") + logger.info(f" - Statut 'failed' : {cache_stats['failed']}") + logger.info(f" - Statut 'error' : {cache_stats['error']}") + + if events_awaiting_insertion > 0: + logger.info(f"🔄 Il reste {events_awaiting_insertion} événements à traiter lors de la prochaine exécution") + else: + logger.success("✅ Tous les événements découverts ont été traités avec succès") def create_event_from_link(event_link): """ diff --git a/extractors/osmcal_debug.html b/extractors/osmcal_debug.html index 3e94caa..73297ce 100644 --- a/extractors/osmcal_debug.html +++ b/extractors/osmcal_debug.html @@ -689,10 +689,10 @@ -
  • +
  • -

    Mapathon Bliesgau, Saarpfalz-Kreis

    -

    Homburg, Saarland, Germany

    +

    OpenStreetMap Midwest Meetup

    +

    Ohio, United States

    @@ -705,10 +705,10 @@
    • -
  • +
  • -

    OpenStreetMap Midwest Meetup

    -

    Ohio, United States

    +

    Mapathon Bliesgau, Saarpfalz-Kreis

    +

    Homburg, Saarland, Germany

    @@ -897,10 +897,10 @@
    • -
  • +
  • -

    Open Transport Community Conference

    -

    Vienna, Austria

    +

    Open Transport Community Conference (ÖBB)

    +
    @@ -913,10 +913,10 @@
    • -
  • +
  • -

    Open Transport Community Conference (ÖBB)

    - +

    Open Transport Community Conference

    +

    Vienna, Austria

    @@ -1057,7 +1057,7 @@
    • -
  • +

  • OSM-Stammtisch Hannover

    Hanover, Lower Saxony, Germany

    @@ -1102,22 +1102,6 @@ - -
    • - -
  • -
    -

    OSM-Stammtisch Hannover

    -

    Hanover, Lower Saxony, Germany

    -
    - - - - 25th October - - - -
    • @@ -1224,10 +1208,10 @@ -
  • +
  • -

    Missing Maps London: (Online) Mapathon [eng]

    - +

    East Midlands pub meet-up

    +

    Derby, England, United Kingdom

    @@ -1240,10 +1224,10 @@
    • -
  • +
  • -

    East Midlands pub meet-up

    -

    Derby, England, United Kingdom

    +

    Missing Maps London: (Online) Mapathon [eng]

    +
    @@ -1679,10 +1663,10 @@
    • -
  • +
  • -

    OpenStreetMap Midwest Meetup

    -

    Ohio, United States

    +

    Münchner OSM-Treffen

    +

    Munich, Bavaria, Germany

    @@ -1695,10 +1679,10 @@
    • -
  • +
  • -

    Münchner OSM-Treffen

    -

    Munich, Bavaria, Germany

    +

    OpenStreetMap Midwest Meetup

    +

    Ohio, United States

    diff --git a/oedb/resources/demo/demo_main.py b/oedb/resources/demo/demo_main.py index 398fb30..45d6c71 100644 --- a/oedb/resources/demo/demo_main.py +++ b/oedb/resources/demo/demo_main.py @@ -221,6 +221,51 @@ class DemoMainResource: background-color: #0056b3; text-decoration: none; } + + /* Styles pour les marqueurs personnalisés avec forme de goutte */ + .custom-marker { + cursor: pointer; + user-select: none; + } + + .marker-drop { + width: 36px; + height: 46px; + position: relative; + background: #fff; + border-radius: 50% 50% 50% 0; + transform: rotate(-45deg); + filter: drop-shadow(2px 2px 4px rgba(0,0,0,0.3)); + display: flex; + align-items: center; + justify-content: center; + } + + .marker-drop:after { + content: ''; + width: 8px; + height: 8px; + position: absolute; + background: white; + border-radius: 50%; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + z-index: 1; + } + + .marker-emoji { + font-size: 18px; + transform: rotate(45deg); + z-index: 2; + position: relative; + line-height: 1; + } + + .custom-marker:hover .marker-drop { + transform: rotate(-45deg) scale(1.1); + transition: transform 0.2s ease; + } @@ -287,6 +332,63 @@ class DemoMainResource: