Change directories

alexisseurin · Jul 24, 2024 · df8a7e4 · df8a7e4
1 parent 9c6736b
commit df8a7e4
Show file tree

Hide file tree

Showing 35 changed files with 126 additions and 29 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -39,4 +39,4 @@ jobs:
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./dist
+          publish_dir: dist
diff --git a/public-transport-map/api/package-lock.json → api/package-lock.json b/public-transport-map/api/package-lock.json → api/package-lock.json
diff --git a/public-transport-map/api/package.json → api/package.json b/public-transport-map/api/package.json → api/package.json
diff --git a/public-transport-map/api/pointId.js → api/pointId.js b/public-transport-map/api/pointId.js → api/pointId.js
diff --git a/...transport-map/api/updateTrainPositions.js → api/updateTrainPositions.js b/...transport-map/api/updateTrainPositions.js → api/updateTrainPositions.js
diff --git a/index.html b/index.html
@@ -8,31 +8,9 @@
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
     <title>Public Transport Map</title>
     <base href=".">
-    <script type="text/javascript">
-      // Single Page Apps for GitHub Pages
-      // MIT License
-      // https://github.com/rafgraph/spa-github-pages
-      // This script checks to see if a redirect is present in the query string,
-      // converts it back into the correct url and adds it to the
-      // browser's history using window.history.replaceState(...),
-      // which won't cause the browser to attempt to load the new url.
-      // When the single page app is loaded further down in this file,
-      // the correct url will be waiting in the browser's history for
-      // the single page app to route accordingly.
-      (function (l) {
-        if (l.search[1] === '/') {
-          var decoded = l.search.slice(1).split('&').map(function (s) {
-            return s.replace(/~and~/g, '&')
-          }).join('?');
-          window.history.replaceState(null, null,
-            l.pathname.slice(0, -1) + decoded + l.hash
-          );
-        }
-      }(window.location))
-    </script>
   </head>
   <body>
     <div id="root"></div>
-    <script src="/public-transport-map/src/main.tsx" type="module" ></script>
+    <script src="./src/main.tsx" type="module" ></script>
   </body>
 </html>
diff --git a/public-transport-map/src/App.tsx b/public-transport-map/src/App.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState, useMemo, useCallback } from 'react';
 import Map from "./components/Map";
 import StatCounter from "./components/StatCounter";
-import { RouteData, StopData, TrainData } from './types';
+import { RouteData, StopData, TrainData } from '../../src/types';
 import LinesDisplay from './components/LinesDisplay';
 import './App.css';
 import "leaflet/dist/leaflet.css";

diff --git a/public-transport-map/src/App.css → src/App.css b/public-transport-map/src/App.css → src/App.css
diff --git a/src/App.tsx b/src/App.tsx
@@ -0,0 +1,120 @@
+import { useEffect, useState, useMemo, useCallback } from 'react';
+import Map from "./components/Map";
+import StatCounter from "./components/StatCounter";
+import { RouteData, StopData, TrainData } from './types';
+import LinesDisplay from './components/LinesDisplay';
+import './App.css';
+import "leaflet/dist/leaflet.css";
+import './components/Icon.css';
+import './components/StatCounter.css';
+import stopPlaceholder from "./assets/stop.svg";
+import trainPlaceholder from "/assets/train.svg";
+import routePlaceholder from "./assets/road.svg";
+
+function App() {
+  const [routes, setRoutes] = useState<RouteData[]>([]);
+  const [stops, setStops] = useState<StopData[]>([]);
+  const [trains, setTrains] = useState<TrainData[]>([]);
+  const [isLoaded, setIsLoaded] = useState(false);
+  const [isLineDisplayVisible, setisLineDisplayVisible] = useState(false);
+
+  const updateTrainPositions = useCallback((newTrains: TrainData[]) => {
+    setTrains(newTrains);
+  }, []);
+
+  useEffect(() => {
+
+
+    Promise.all([
+      fetch('data/gtfs-routes-production.json').then(response => response.json()),
+      fetch('data/gtfs-stops-production.json').then(response => response.json()),
+      fetch('data/vehicle-position-rt-production.json').then(response => response.json()),
+      fetch('data/stop-details-production.json').then(response => response.json()),
+      fetch('data/stops-by-line-production.json').then(response => response.json())
+    ]).then(([routesData, stopsData, trainsData, stopDetailsData, stopsByLineData]) => {
+      console.log('Routes, stops, and trains loaded');
+
+      const combinedStopsData = stopsData.map((stop: { stop_id: string; stop_name: string; }) => {
+        const stopDetails = stopDetailsData.find((detail: { id: string; name: string; }) => detail.id === stop.stop_id);
+        const stopName = stopDetails ? JSON.parse(stopDetails.name.replace(/\\/g, '')) : { fr: stop.stop_name, nl: stop.stop_name };
+
+        let ordersAndLineIds: { order: any; lineid: string; }[] = [];
+        stopsByLineData.forEach((line: { lineid: string, points: string }) => {
+            const points = JSON.parse(line.points);
+            const stopPoint = points.find((point: { id: string; order: number }) => point.id === stop.stop_id);
+            if (stopPoint) {
+                ordersAndLineIds.push({ order: stopPoint.order, lineid: line.lineid });
+            }
+        });
+
+        return {
+            ...stop,
+            stop_name: stopName,
+            ordersAndLineIds: ordersAndLineIds
+        };
+    });
+
+
+      setRoutes(routesData);
+      setStops(combinedStopsData); 
+      updateTrainPositions(trainsData);
+      setIsLoaded(true);
+    }).catch(error => {
+      console.error('Error loading data:', error);
+    });
+
+    const fetchTrainData = () => {
+      fetch('data/vehicle-position-rt-production.json')
+        .then(response => response.json())
+        .then(data => {
+          console.log('Trains loaded:', data); 
+          setTrains(data);
+        })
+        .catch(error => {
+          console.error('Error loading trains:', error);
+        });
+    };
+
+    fetchTrainData(); // Initial fetch
+    const interval = setInterval(fetchTrainData, 20000); // Fetch every 20 seconds
+
+    return () => clearInterval(interval); // Cleanup on unmount
+  }, [updateTrainPositions]);
+
+
+    const { RouteCount, stopCount, trainCount } = useMemo(() => {
+      const totalRoutes = routes.length;
+      const totalStops = stops.length;
+      const totalTrains = trains.length;
+
+    return {
+        RouteCount: totalRoutes,
+        stopCount: totalStops,
+        trainCount: totalTrains
+      };
+    }, [routes, stops, trains]);
+
+    const toggleStatsVisibility = () => {
+      setisLineDisplayVisible(!isLineDisplayVisible);
+    };
+
+    return (
+      <div className="app-container">
+        <div className="top-left-text">
+          <span>Public transport map</span>
+        </div>
+        <div className="bottom-left-stats">
+          <StatCounter icon={routePlaceholder} label="lines" count={RouteCount} />
+          <StatCounter icon={stopPlaceholder} label="stops" count={stopCount} />
+          <StatCounter icon={trainPlaceholder} label="trams, subways and buses" count={trainCount} />
+        </div>
+        <LinesDisplay 
+          isLineDisplayVisible={isLineDisplayVisible}
+          toggleStatsVisibility={toggleStatsVisibility} 
+        />
+        {isLoaded && <Map routes={routes} stops={stops} trains={trains} />}
+      </div>
+    );
+  }
+
+export default App;
diff --git a/public-transport-map/src/assets/bus.svg → src/assets/bus.svg b/public-transport-map/src/assets/bus.svg → src/assets/bus.svg
diff --git a/...ransport-map/src/assets/controls/down.svg → src/assets/controls/down.svg b/...ransport-map/src/assets/controls/down.svg → src/assets/controls/down.svg
diff --git a/...ansport-map/src/assets/controls/minus.svg → src/assets/controls/minus.svg b/...ansport-map/src/assets/controls/minus.svg → src/assets/controls/minus.svg
diff --git a/...ransport-map/src/assets/controls/plus.svg → src/assets/controls/plus.svg b/...ransport-map/src/assets/controls/plus.svg → src/assets/controls/plus.svg
diff --git a/...-transport-map/src/assets/controls/up.svg → src/assets/controls/up.svg b/...-transport-map/src/assets/controls/up.svg → src/assets/controls/up.svg
diff --git a/...-transport-map/src/assets/information.svg → src/assets/information.svg b/...-transport-map/src/assets/information.svg → src/assets/information.svg
diff --git a/public-transport-map/src/assets/metro.svg → src/assets/metro.svg b/public-transport-map/src/assets/metro.svg → src/assets/metro.svg
diff --git a/...transport-map/src/assets/placeholder1.png → src/assets/placeholder1.png b/...transport-map/src/assets/placeholder1.png → src/assets/placeholder1.png
diff --git a/public-transport-map/src/assets/road.svg → src/assets/road.svg b/public-transport-map/src/assets/road.svg → src/assets/road.svg
diff --git a/public-transport-map/src/assets/stop.svg → src/assets/stop.svg b/public-transport-map/src/assets/stop.svg → src/assets/stop.svg
diff --git a/public-transport-map/src/assets/subway.svg → src/assets/subway.svg b/public-transport-map/src/assets/subway.svg → src/assets/subway.svg
diff --git a/public-transport-map/src/assets/train.svg → src/assets/train.svg b/public-transport-map/src/assets/train.svg → src/assets/train.svg
diff --git a/public-transport-map/src/assets/tram.svg → src/assets/tram.svg b/public-transport-map/src/assets/tram.svg → src/assets/tram.svg
diff --git a/public-transport-map/src/components/Icon.css → src/components/Icon.css b/public-transport-map/src/components/Icon.css → src/components/Icon.css
diff --git a/public-transport-map/src/components/Icon.tsx → src/components/Icon.tsx b/public-transport-map/src/components/Icon.tsx → src/components/Icon.tsx
diff --git a/...sport-map/src/components/LinesDisplay.css → src/components/LinesDisplay.css b/...sport-map/src/components/LinesDisplay.css → src/components/LinesDisplay.css
diff --git a/...sport-map/src/components/LinesDisplay.tsx → src/components/LinesDisplay.tsx b/...sport-map/src/components/LinesDisplay.tsx → src/components/LinesDisplay.tsx
diff --git a/public-transport-map/src/components/Map.css → src/components/Map.css b/public-transport-map/src/components/Map.css → src/components/Map.css
diff --git a/public-transport-map/src/components/Map.tsx → src/components/Map.tsx b/public-transport-map/src/components/Map.tsx → src/components/Map.tsx
diff --git a/...nsport-map/src/components/StatCounter.css → src/components/StatCounter.css b/...nsport-map/src/components/StatCounter.css → src/components/StatCounter.css
diff --git a/...nsport-map/src/components/StatCounter.tsx → src/components/StatCounter.tsx b/...nsport-map/src/components/StatCounter.tsx → src/components/StatCounter.tsx
diff --git a/public-transport-map/src/main.tsx → src/main.tsx b/public-transport-map/src/main.tsx → src/main.tsx
@@ -4,9 +4,9 @@ import { HashRouter as Router } from 'react-router-dom';
 import App from './App.tsx';
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
-  // <React.StrictMode>
+  <React.StrictMode>
     <Router>
       <App />
     </Router>
-  //</React.StrictMode>,
+  </React.StrictMode>,
 );
diff --git a/public-transport-map/src/types.ts → src/types.ts b/public-transport-map/src/types.ts → src/types.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -20,6 +20,6 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["src"],
+  "include": ["src", "src/App.tsx", "public-transport-map/src/main.tsx"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/public-transport-map/src/vite-env.d.ts → vite-env.d.ts b/public-transport-map/src/vite-env.d.ts → vite-env.d.ts
diff --git a/vite.config.ts b/vite.config.ts
@@ -3,7 +3,6 @@ import react from '@vitejs/plugin-react-swc'
 
 export default defineConfig({
   plugins: [react()],
-  base: '/public-transport-map/', // Remplacez par le nom de votre dépôt GitHub
   build: {
     outDir: 'dist',  // Le dossier de sortie pour les fichiers transpilés
   },