4rd commit

static/css/style.css

@@ -0,0 +1,229 @@
+/* Style général */
+body {
+    font-family: 'Open Sans', sans-serif;
+    margin: 0;
+    padding: 0;
+    background-color: #f5f5f5;
+}
+
+.container {
+    max-width: 1400px;
+    margin: 0 auto;
+    padding: 20px;
+}
+
+/* Header */
+header {
+    text-align: center;
+    margin-bottom: 20px;
+}
+
+header h1 {
+    color: #333;
+    margin: 0;
+    font-size: 2em;
+}
+
+.generated-time {
+    color: #666;
+    margin: 5px 0;
+    font-size: 0.9em;
+}
+
+/* Layout principal */
+.traffic-map-container {
+    display: grid;
+    grid-template-columns: 300px 1fr;
+    gap: 20px;
+    margin-bottom: 20px;
+}
+
+/* Section trafic */
+.traffic-info {
+    background: white;
+    padding: 20px;
+    border-radius: 8px;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+}
+
+.traffic-info h2 {
+    margin-top: 0;
+    color: #333;
+}
+
+.incident-summary {
+    margin-top: 20px;
+}
+
+/* Carte */
+.map-section {
+    height: 500px;
+    border-radius: 8px;
+    overflow: hidden;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+}
+
+#leaflet-map {
+    height: 100%;
+    width: 100%;
+}
+
+/* Liste des incidents */
+.incidents-section {
+    background: white;
+    padding: 20px;
+    border-radius: 8px;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+}
+
+.incidents-section h2 {
+    margin-top: 0;
+    color: #333;
+}
+
+.incident-list {
+    display: grid;
+    gap: 15px;
+}
+
+.incident-item {
+    display: flex;
+    align-items: flex-start;
+    padding: 15px;
+    background: #f8f9fa;
+    border-radius: 6px;
+    cursor: pointer;
+    transition: background-color 0.2s;
+}
+
+.incident-item:hover {
+    background: #e9ecef;
+}
+
+.incident-icon {
+    margin-right: 15px;
+    flex-shrink: 0;
+}
+
+.incident-details {
+    flex-grow: 1;
+}
+
+.incident-details h4 {
+    margin: 0 0 8px 0;
+    color: #333;
+}
+
+.incident-details p {
+    margin: 4px 0;
+    color: #666;
+    font-size: 0.9em;
+}
+
+.delay {
+    color: #dc3545;
+    font-weight: 600;
+}
+
+/* Popup de la carte */
+.incident-popup {
+    padding: 5px;
+}
+
+.incident-popup h3 {
+    margin: 0 0 8px 0;
+    color: #333;
+    font-size: 1em;
+}
+
+.incident-popup p {
+    margin: 4px 0;
+    color: #666;
+    font-size: 0.9em;
+}
+
+/* RTM Traffic styles */
+.rtm-traffic {
+    margin-bottom: 20px;
+}
+
+.rtm-period {
+    margin-bottom: 20px;
+}
+
+.rtm-section {
+    margin-bottom: 15px;
+}
+
+.transport-lines {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+    margin-top: 5px;
+}
+
+.line-badge {
+    display: inline-flex;
+    align-items: center;
+    padding: 5px 10px;
+    border-radius: 15px;
+    font-weight: 600;
+    cursor: pointer;
+    transition: background-color 0.2s;
+}
+
+.line-badge.metro {
+    background-color: #007bff;
+    color: white;
+}
+
+.line-badge.tram {
+    background-color: #28a745;
+    color: white;
+}
+
+.line-badge.bus {
+    background-color: #ffc107;
+    color: black;
+}
+
+.line-badge.other {
+    background-color: #6c757d;
+    color: white;
+}
+
+.line-badge.upcoming {
+    opacity: 0.7;
+}
+
+.perturbation-details {
+    display: none;
+    margin: 10px 0;
+    padding: 10px;
+    background: #f8f9fa;
+    border-radius: 5px;
+}
+
+.perturbation-details.active {
+    display: block;
+}
+
+.empty-message {
+    color: #6c757d;
+    font-style: italic;
+}
+
+/* Responsive */
+@media (max-width: 768px) {
+    .traffic-map-container {
+        grid-template-columns: 1fr;
+    }
+    
+    .container {
+        padding: 10px;
+    }
+    
+    .map-section {
+        height: 400px;
+    }
+}

static/js/traffic.js

@@ -0,0 +1,74 @@
+// Variables globales pour la carte et les marqueurs
+let map;
+let markers = [];
+
+function initMap() {
+    if (map) {
+        map.remove();
+    }
+
+    map = L.map('leaflet-map').setView([43.2965, 5.3698], 12);
+    
+    L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
+        attribution: 'OpenStreetMap, CartoDB',
+        maxZoom: 19
+    }).addTo(map);
+
+    updateTrafficIncidents();
+}
+
+function clearMarkers() {
+    markers.forEach(marker => marker.remove());
+    markers = [];
+}
+
+function updateTrafficIncidents() {
+    fetch('/incidents')
+        .then(response => response.json())
+        .then(data => {
+            clearMarkers();
+            if (data.incidents) {
+                data.incidents.forEach(incident => {
+                    const coordinates = incident.geometry.coordinates;
+                    
+                    // Créer un marqueur pour chaque incident
+                    const marker = L.marker([coordinates[1], coordinates[0]])
+                        .addTo(map);
+                    
+                    markers.push(marker);
+
+                    // Créer le contenu du popup
+                    let popupContent = `
+                        <div class="incident-popup">
+                            <h3>Incident</h3>
+                            <p>${incident.properties.events[0].description}</p>
+                    `;
+
+                    if (incident.properties.delay) {
+                        popupContent += `<p>Délai: ${incident.properties.delay}</p>`;
+                    }
+
+                    if (incident.properties.startTime) {
+                        const startTime = new Date(incident.properties.startTime);
+                        popupContent += `<p>Début: ${startTime.toLocaleString()}</p>`;
+                    }
+
+                    popupContent += '</div>';
+
+                    // Ajouter le popup au marqueur
+                    const popup = L.popup()
+                        .setLatLng([coordinates[1], coordinates[0]])
+                        .setContent(popupContent);
+
+                    marker.bindPopup(popup);
+                });
+            }
+        })
+        .catch(error => console.error('Erreur:', error));
+}
+
+// Mettre à jour les incidents toutes les 5 minutes
+setInterval(updateTrafficIncidents, 5 * 60 * 1000);
+
+// Initialiser la carte au chargement de la page
+document.addEventListener('DOMContentLoaded', initMap);

templates/marseille_traffic.html

@@ -8,475 +8,9 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
     <script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
-    <style>
-        body {
-            margin: 0;
-            padding: 0;
-            font-family: 'Open Sans', sans-serif;
-            display: flex;
-            flex-direction: column;
-        }
-
-        .header {
-            background-color: #004494;
-            color: white;
-            padding: 8px;
-            text-align: center;
-        }
-
-        .header h1 {
-            margin: 0;
-            font-size: 18px;
-        }
-
-        .header .last-update {
-            color: white;
-            font-size: 12px;
-            margin-top: 2px;
-        }
-
-        .main-section {
-            display: flex;
-            margin: 0 50px;
-            background: white;
-            height: 80vh;
-        }
-
-        .left-panel {
-            width: 500px;
-            overflow-y: auto;
-            background: white;
-            padding: 20px;
-            border-right: 1px solid #e0e0e0;
-        }
-
-        .map-section {
-            flex: 1;
-            position: relative;
-            background: white;
-        }
-
-        #leaflet-map {
-            position: absolute;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            width: 100%;
-            height: 100%;
-            z-index: 1;
-        }
-
-        .ferries-section {
-            margin: 20px 50px;
-            padding: 20px;
-            background: white;
-            border-radius: 10px;
-            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-        }
-
-        .ship-schedules {
-            margin-top: 20px;
-            padding: 15px;
-            background: #f5f5f5;
-            border-radius: 5px;
-        }
-        
-        .ship-schedules h3 {
-            margin: 0 0 15px 0;
-            color: #333;
-        }
-        
-        .ship-departures, .ship-arrivals {
-            margin-top: 15px;
-        }
-        
-        .ship-item {
-            padding: 10px;
-            margin: 5px 0;
-            background: white;
-            border-radius: 3px;
-            box-shadow: 0 1px 3px rgba(0,0,0,0.1);
-        }
-        
-        .ship-item h5 {
-            margin: 0;
-            color: #333;
-            font-weight: 600;
-        }
-        
-        .ship-item p {
-            margin: 3px 0;
-            font-size: 0.9em;
-            color: #666;
-        }
-        
-        .ship-item .time {
-            color: #0066cc;
-            font-weight: 500;
-        }
-        
-        .ship-item .cut-off {
-            color: #cc0000;
-            font-size: 0.85em;
-        }
-        
-        .last-update {
-            font-size: 0.8em;
-            color: #666;
-            margin: 5px 0 15px 0;
-            font-style: italic;
-        }
-
-        /* Styles pour le conteneur des navires */
-        .ships-container {
-            margin-top: 20px;
-            width: 100%;
-            background: rgba(255, 255, 255, 0.9);
-            padding: 20px 0;
-            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-        }
-
-        .ships-section {
-            margin-bottom: 20px;
-        }
-
-        .ships-scroll-container {
-            width: 100%;
-            background: #fff;
-            border: 1px solid #ddd;
-            border-radius: 5px;
-            padding: 10px;
-        }
-
-        .ships-scroll {
-            padding: 10px 0;
-        }
-
-        .ship-item {
-            display: block;
-            margin: 10px 0;
-            padding: 15px 20px;
-            background: #f8f9fa;
-            border-radius: 5px;
-            font-size: 1.2em;
-            line-height: 1.4;
-        }
-
-        .ships-section h3 {
-            font-size: 1.5em;
-            margin: 15px 0;
-            color: #333;
-        }
-
-        .ship-time {
-            color: #ff0000;
-            font-weight: bold;
-            font-size: 1.1em;
-        }
-
-        .last-update {
-            margin-bottom: 20px;
-            color: #666;
-            font-size: 0.9em;
-        }
-        
-        /* Ajout de styles pour les tables */
-        .table-responsive {
-            overflow-x: auto;
-        }
-        
-        .table {
-            width: 100%;
-            border-collapse: collapse;
-        }
-        
-        .table th, .table td {
-            border: 1px solid #ddd;
-            padding: 8px;
-            text-align: left;
-        }
-        
-        .table th {
-            background-color: #f0f0f0;
-        }
-        
-        .ships-container {
-            margin: 20px;
-            padding: 20px;
-            background: white;
-            border-radius: 10px;
-            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-        }
-
-        .ships-section {
-            margin-bottom: 20px;
-        }
-
-        .ships-section h3 {
-            color: #333;
-            margin: 10px 0;
-            padding: 10px;
-            background: #f8f9fa;
-            border-radius: 5px;
-            font-size: 1.2em;
-        }
-
-        .ships-scroll-container {
-            width: 100%;
-            background: #fff;
-            border: 1px solid #ddd;
-            border-radius: 5px;
-            padding: 10px;
-        }
-
-        .ships-scroll {
-            padding: 10px 0;
-        }
-
-        .ship-item {
-            display: block;
-            margin: 10px 0;
-            padding: 10px 15px;
-            background: #f8f9fa;
-            border-radius: 5px;
-            font-size: 0.9em;
-        }
-
-        .last-update {
-            margin-bottom: 20px;
-            color: #666;
-            font-size: 0.9em;
-        }
-
-        .traffic-info {
-            padding: 15px;
-            background: white;
-            border-radius: 5px;
-            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-            margin-right: 20px;
-            max-height: 600px;
-            overflow-y: auto;
-        }
-
-        .rtm-line {
-            margin-bottom: 15px;
-            padding: 10px;
-            border-radius: 5px;
-            background: #f8f9fa;
-        }
-
-        .rtm-line h3 {
-            margin: 0 0 10px 0;
-            color: #333;
-            font-size: 1.2em;
-        }
-
-        .rtm-line .content {
-            font-size: 0.95em;
-            line-height: 1.4;
-            color: #666;
-        }
-
-        .rtm-line.metro { border-left: 4px solid #0066cc; }
-        .rtm-line.bus { border-left: 4px solid #ff9900; }
-        .rtm-line.tram { border-left: 4px solid #33cc33; }
-        
-        /* Styles pour les perturbations RTM */
-        .rtm-traffic {
-            margin: 20px 0;
-            padding: 15px;
-            background: #fff;
-            border-radius: 8px;
-            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-        }
-        
-        .rtm-section {
-            margin-bottom: 20px;
-        }
-        
-        .rtm-section h3 {
-            color: #333;
-            margin-bottom: 10px;
-            padding-bottom: 5px;
-            border-bottom: 2px solid #f0f0f0;
-        }
-        
-        .transport-lines {
-            display: flex;
-            flex-wrap: wrap;
-            gap: 10px;
-        }
-        
-        .line-badge {
-            padding: 8px 15px;
-            border-radius: 20px;
-            font-weight: 600;
-            cursor: pointer;
-            transition: all 0.3s ease;
-        }
-        
-        .line-badge:hover {
-            transform: translateY(-2px);
-            box-shadow: 0 2px 5px rgba(0,0,0,0.2);
-        }
-        
-        .line-badge.metro {
-            background-color: #0055A4;
-            color: white;
-        }
-        
-        .line-badge.bus {
-            background-color: #3498db;
-            color: white;
-        }
-        
-        .line-badge.tram {
-            background-color: #27ae60;
-            color: white;
-        }
-        
-        .line-badge.other {
-            background-color: #95a5a6;
-            color: white;
-        }
-        
-        .perturbation-details {
-            display: none;
-            margin-top: 10px;
-            padding: 15px;
-            background: #f8f9fa;
-            border-radius: 5px;
-            border-left: 4px solid #0055A4;
-        }
-        
-        .perturbation-details.active {
-            display: block;
-        }
-        
-        .perturbation-details h4 {
-            margin: 0 0 10px 0;
-            color: #333;
-        }
-        
-        .perturbation-details p {
-            margin: 5px 0;
-            color: #666;
-        }
-        
-        .perturbation-details .validity {
-            font-style: italic;
-            color: #e74c3c;
-        }
-        
-        .rtm-period {
-            margin: 20px 0;
-            padding: 20px;
-            background: #f8f9fa;
-            border-radius: 8px;
-        }
-        
-        .rtm-period h3 {
-            color: #2c3e50;
-            margin-bottom: 20px;
-            padding-bottom: 10px;
-            border-bottom: 2px solid #e74c3c;
-        }
-        
-        .upcoming-disruptions .line-badge {
-            border: 2px dashed;
-            opacity: 0.8;
-        }
-        
-        .upcoming-disruptions .line-badge:hover {
-            opacity: 1;
-        }
-        
-        .rtm-section h4 {
-            color: #34495e;
-            margin: 15px 0 10px 0;
-        }
-        
-        .empty-message {
-            color: #7f8c8d;
-            font-style: italic;
-            padding: 10px;
-        }
-
-        .incident-popup {
-            padding: 10px;
-            max-width: 300px;
-        }
-
-        .incident-popup h4 {
-            margin: 0 0 10px 0;
-            color: #004494;
-            font-size: 16px;
-        }
-
-        .incident-popup p {
-            margin: 5px 0;
-            font-size: 14px;
-        }
-
-        .incident-popup .warning {
-            color: #ff0000;
-            font-weight: bold;
-        }
-
-        .custom-div-icon {
-            background: none;
-            border: none;
-        }
-        
-        .incident-marker {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-        }
-        
-        .marker-icon {
-            width: 24px;
-            height: 24px;
-            border-radius: 50%;
-            border: 2px solid white;
-            box-shadow: 0 0 4px rgba(0,0,0,0.4);
-        }
-        
-        /* Styles pour les différents types d'incidents */
-        .marker-icon.1 { background-color: #ff0000; } /* Accident */
-        .marker-icon.2 { background-color: #808080; } /* Brouillard */
-        .marker-icon.3 { background-color: #ff4500; } /* Conditions dangereuses */
-        .marker-icon.4 { background-color: #4169e1; } /* Pluie */
-        .marker-icon.5 { background-color: #87ceeb; } /* Verglas */
-        .marker-icon.6 { background-color: #ffa500; } /* Embouteillage */
-        .marker-icon.7 { background-color: #ff6347; } /* Voie fermée */
-        .marker-icon.8 { background-color: #dc143c; } /* Route fermée */
-        .marker-icon.9 { background-color: #ffd700; } /* Travaux routiers */
-        .marker-icon.10 { background-color: #00bfff; } /* Vent */
-        .marker-icon.11 { background-color: #4682b4; } /* Inondation */
-        .marker-icon.14 { background-color: #daa520; } /* Véhicule en panne */
-        .marker-icon.default { background-color: #666666; }
-        
-        .incident-popup {
-            padding: 10px;
-            max-width: 250px;
-        }
-        
-        .incident-popup h3 {
-            margin: 0 0 10px 0;
-            font-size: 14px;
-            font-weight: bold;
-            color: #333;
-        }
-        
-        .incident-popup p {
-            margin: 5px 0;
-            font-size: 12px;
-            color: #666;
-        }
-    </style>
+    <script src="{{ url_for('static', filename='js/traffic.js') }}"></script>
 </head>
 <body>
     <div class="header">