Compare commits
No commits in common. "d435837c80653f53052b7ca02a987911304f0ef0" and "119d0bf635a0a386ef45013ddd2a42e9812ee266" have entirely different histories.
d435837c80
...
119d0bf635
4
.gitignore
vendored
4
.gitignore
vendored
@ -46,5 +46,5 @@ venv/
|
||||
db.sqlite3
|
||||
db.sqlite3-journal
|
||||
|
||||
node_modules/
|
||||
|
||||
# Don't git index
|
||||
whoosh_index/
|
||||
|
||||
23
sncf-station/.gitignore
vendored
23
sncf-station/.gitignore
vendored
@ -1,23 +0,0 @@
|
||||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
|
||||
|
||||
# dependencies
|
||||
/node_modules
|
||||
/.pnp
|
||||
.pnp.js
|
||||
|
||||
# testing
|
||||
/coverage
|
||||
|
||||
# production
|
||||
/build
|
||||
|
||||
# misc
|
||||
.DS_Store
|
||||
.env.local
|
||||
.env.development.local
|
||||
.env.test.local
|
||||
.env.production.local
|
||||
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
@ -1,70 +0,0 @@
|
||||
# Getting Started with Create React Station
|
||||
|
||||
This project was bootstrapped with [Create React Station](https://github.com/facebook/create-react-app).
|
||||
|
||||
## Available Scripts
|
||||
|
||||
In the project directory, you can run:
|
||||
|
||||
### `npm start`
|
||||
|
||||
Runs the app in the development mode.\
|
||||
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
|
||||
|
||||
The page will reload when you make changes.\
|
||||
You may also see any lint errors in the console.
|
||||
|
||||
### `npm test`
|
||||
|
||||
Launches the test runner in the interactive watch mode.\
|
||||
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
|
||||
|
||||
### `npm run build`
|
||||
|
||||
Builds the app for production to the `build` folder.\
|
||||
It correctly bundles React in production mode and optimizes the build for the best performance.
|
||||
|
||||
The build is minified and the filenames include the hashes.\
|
||||
Your app is ready to be deployed!
|
||||
|
||||
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
|
||||
|
||||
### `npm run eject`
|
||||
|
||||
**Note: this is a one-way operation. Once you `eject`, you can't go back!**
|
||||
|
||||
If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
|
||||
|
||||
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
|
||||
|
||||
You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
|
||||
|
||||
## Learn More
|
||||
|
||||
You can learn more in the [Create React Station documentation](https://facebook.github.io/create-react-app/docs/getting-started).
|
||||
|
||||
To learn React, check out the [React documentation](https://reactjs.org/).
|
||||
|
||||
### Code Splitting
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
|
||||
|
||||
### Analyzing the Bundle Size
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
|
||||
|
||||
### Making a Progressive Web Station
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
|
||||
|
||||
### Advanced Configuration
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
|
||||
|
||||
### Deployment
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
|
||||
|
||||
### `npm run build` fails to minify
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
|
||||
18829
sncf-station/package-lock.json
generated
18829
sncf-station/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,46 +0,0 @@
|
||||
{
|
||||
"name": "sncf-station",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.11.3",
|
||||
"@emotion/styled": "^11.11.0",
|
||||
"@mui/material": "^5.15.6",
|
||||
"@mui/x-date-pickers": "^6.19.2",
|
||||
"@testing-library/jest-dom": "^5.17.0",
|
||||
"@testing-library/react": "^13.4.0",
|
||||
"@testing-library/user-event": "^13.5.0",
|
||||
"dayjs": "^1.11.10",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-router-dom": "^6.21.3",
|
||||
"react-scripts": "5.0.1",
|
||||
"react-transition-group": "^4.4.5",
|
||||
"sass": "^1.70.0",
|
||||
"web-vitals": "^2.1.4"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "react-scripts start",
|
||||
"build": "react-scripts build",
|
||||
"test": "react-scripts test",
|
||||
"eject": "react-scripts eject"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": [
|
||||
"react-app",
|
||||
"react-app/jest"
|
||||
]
|
||||
},
|
||||
"browserslist": {
|
||||
"production": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not op_mini all"
|
||||
],
|
||||
"development": [
|
||||
"last 1 chrome version",
|
||||
"last 1 firefox version",
|
||||
"last 1 safari version"
|
||||
]
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB |
@ -1,22 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="fr" data-bs-theme="dark">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="theme-color" content="#000000" />
|
||||
<meta
|
||||
name="description"
|
||||
content="Web site created using create-react-app"
|
||||
/>
|
||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
||||
|
||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
||||
|
||||
<title>Écrans en gare</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>Vous avez besoin de JavaScript pour utiliser cette application.</noscript>
|
||||
<div id="root"></div>
|
||||
</body>
|
||||
</html>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.4 KiB |
@ -1,25 +0,0 @@
|
||||
{
|
||||
"short_name": "React App",
|
||||
"name": "Create React App Sample",
|
||||
"icons": [
|
||||
{
|
||||
"src": "favicon.ico",
|
||||
"sizes": "64x64 32x32 24x24 16x16",
|
||||
"type": "image/x-icon"
|
||||
},
|
||||
{
|
||||
"src": "logo192.png",
|
||||
"type": "image/png",
|
||||
"sizes": "192x192"
|
||||
},
|
||||
{
|
||||
"src": "logo512.png",
|
||||
"type": "image/png",
|
||||
"sizes": "512x512"
|
||||
}
|
||||
],
|
||||
"start_url": ".",
|
||||
"display": "standalone",
|
||||
"theme_color": "#000000",
|
||||
"background_color": "#ffffff"
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
# https://www.robotstxt.org/robotstxt.html
|
||||
User-agent: *
|
||||
Disallow:
|
||||
@ -1,19 +0,0 @@
|
||||
.shrink-enter {
|
||||
transform: translateY(100%);
|
||||
opacity: 0;
|
||||
}
|
||||
.shrink-enter-active {
|
||||
transform: translateY(0);
|
||||
opacity: 1;
|
||||
transition: transform 500ms ease-out, opacity 500ms ease-out;
|
||||
}
|
||||
.shrink-exit {
|
||||
transform: translateY(0);
|
||||
height: 100%;
|
||||
opacity: 1;
|
||||
}
|
||||
.shrink-exit-active {
|
||||
transform: translateY(-100%);
|
||||
opacity: 0;
|
||||
transition: transform 500ms ease-in, opacity 500ms ease-in;
|
||||
}
|
||||
@ -1,53 +0,0 @@
|
||||
import {createBrowserRouter, RouterProvider} from "react-router-dom"
|
||||
import Station from "./Station"
|
||||
import {createTheme, CssBaseline, ThemeProvider, useMediaQuery} from "@mui/material"
|
||||
import React, {useMemo} from "react"
|
||||
import {frFR, LocalizationProvider} from "@mui/x-date-pickers"
|
||||
import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs"
|
||||
import 'dayjs/locale/fr'
|
||||
import './App.css'
|
||||
|
||||
function App() {
|
||||
const router = createBrowserRouter([
|
||||
{
|
||||
path: "/",
|
||||
element: <div>Hello World!</div>
|
||||
},
|
||||
{
|
||||
path: "/station/:stopId",
|
||||
element: <Station />
|
||||
}
|
||||
])
|
||||
|
||||
const prefersDarkMode = useMediaQuery('(prefers-color-scheme: dark)');
|
||||
const theme = useMemo(
|
||||
() =>
|
||||
createTheme({
|
||||
palette: {
|
||||
mode: prefersDarkMode ? 'dark' : 'light',
|
||||
sncf: {
|
||||
departures: {
|
||||
dark: "#003A79",
|
||||
light: "#0064AB",
|
||||
},
|
||||
arrivals: {
|
||||
dark: "#1F5628",
|
||||
light: "#187936",
|
||||
},
|
||||
}
|
||||
},
|
||||
}),
|
||||
[prefersDarkMode],
|
||||
);
|
||||
|
||||
return <>
|
||||
<ThemeProvider theme={theme}>
|
||||
<CssBaseline />
|
||||
<LocalizationProvider dateAdapter={AdapterDayjs} localeText={frFR.components.MuiLocalizationProvider.defaultProps.localeText} adapterLocale="fr">
|
||||
<RouterProvider router={router} />
|
||||
</LocalizationProvider>
|
||||
</ThemeProvider>
|
||||
</>
|
||||
}
|
||||
|
||||
export default App;
|
||||
@ -1,64 +0,0 @@
|
||||
import {useParams, useSearchParams} from "react-router-dom"
|
||||
import TrainsTable from "./TrainsTable"
|
||||
import {useEffect, useState} from "react";
|
||||
import {Box, Button, FormControl, FormControlLabel, FormGroup, FormLabel} from "@mui/material";
|
||||
import {DatePicker, DateTimePicker, TimePicker} from "@mui/x-date-pickers";
|
||||
import dayjs from "dayjs";
|
||||
|
||||
function DateTimeSelector({date, time}) {
|
||||
return <>
|
||||
<Box component="form" display="flex" alignItems="center" sx={{'& .MuiTextField-root': { m: 1, width: '25ch' },}}>
|
||||
<FormLabel>
|
||||
Modifier la date et l'heure de recherche :
|
||||
</FormLabel>
|
||||
<DatePicker name="date" label="Date" format="YYYY-MM-DD" defaultValue={dayjs(`${date}`)} />
|
||||
<TimePicker name="time" label="Heure" format="HH:mm" defaultValue={dayjs(`${date} ${time}`)} />
|
||||
<Button type="submit">Rechercher</Button>
|
||||
</Box>
|
||||
</>
|
||||
}
|
||||
|
||||
function Station() {
|
||||
let {stopId} = useParams()
|
||||
let [stop, setStop] = useState({'name': "Chargement…"})
|
||||
let [searchParams, _setSearchParams] = useSearchParams()
|
||||
const now = new Date()
|
||||
let dateNow = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`
|
||||
let timeNow = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`
|
||||
let [date, setDate] = useState(searchParams.get('date') || dateNow)
|
||||
let [time, setTime] = useState(searchParams.get('time') || timeNow)
|
||||
|
||||
useEffect(() => {
|
||||
fetch(`http://localhost:8000/api/gtfs/stop/${stopId}/`)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
setStop(data)
|
||||
})
|
||||
}, [stopId])
|
||||
|
||||
if (time === timeNow) {
|
||||
setInterval(() => {
|
||||
const now = new Date()
|
||||
let dateNow = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`
|
||||
let timeNow = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`
|
||||
setDate(dateNow)
|
||||
setTime(timeNow)
|
||||
}, 60000)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="Station">
|
||||
<header className="App-header">
|
||||
<h1>Horaires en gare de {stop.name}</h1>
|
||||
</header>
|
||||
|
||||
<main>
|
||||
<DateTimeSelector date={date} time={time} />
|
||||
<TrainsTable stop={stop} date={date} time={time} tableType="departures" />
|
||||
<TrainsTable stop={stop} date={date} time={time} tableType="arrivals" />
|
||||
</main>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default Station;
|
||||
@ -1,8 +0,0 @@
|
||||
import { render, screen } from '@testing-library/react';
|
||||
import Station from './Station';
|
||||
|
||||
test('renders learn react link', () => {
|
||||
render(<Station />);
|
||||
const linkElement = screen.getByText(/learn react/i);
|
||||
expect(linkElement).toBeInTheDocument();
|
||||
});
|
||||
@ -1,236 +0,0 @@
|
||||
import {useEffect, useState} from "react"
|
||||
import {
|
||||
Box,
|
||||
styled,
|
||||
Table,
|
||||
TableBody,
|
||||
TableCell,
|
||||
TableContainer,
|
||||
TableHead,
|
||||
TableRow,
|
||||
Typography
|
||||
} from "@mui/material"
|
||||
import {CSSTransition, TransitionGroup} from 'react-transition-group'
|
||||
|
||||
const StyledTableRow = styled(TableRow)(({ theme, tableType }) => ({
|
||||
'tbody &:nth-of-type(odd)': {
|
||||
backgroundColor: theme.palette.sncf[tableType].light,
|
||||
},
|
||||
'th, &:nth-of-type(even)': {
|
||||
backgroundColor: theme.palette.sncf[tableType].dark,
|
||||
},
|
||||
// hide last border
|
||||
'&:last-child td, &:last-child th': {
|
||||
border: 0,
|
||||
},
|
||||
}));
|
||||
|
||||
function TrainsTable({stop, date, time, tableType}) {
|
||||
return <>
|
||||
<TableContainer>
|
||||
<Table>
|
||||
<TrainsTableHeader tableType={tableType} />
|
||||
<TrainsTableBody stop={stop} date={date} time={time} tableType={tableType} />
|
||||
</Table>
|
||||
</TableContainer>
|
||||
</>
|
||||
}
|
||||
|
||||
function TrainsTableHeader({tableType}) {
|
||||
return <>
|
||||
<TableHead>
|
||||
<StyledTableRow tableType={tableType}>
|
||||
<TableCell colSpan="2" fontSize={16} fontWeight="bold">Train</TableCell>
|
||||
<TableCell fontSize={16} fontWeight="bold">Heure</TableCell>
|
||||
<TableCell fontSize={16} fontWeight="bold">Destination</TableCell>
|
||||
</StyledTableRow>
|
||||
</TableHead>
|
||||
</>
|
||||
}
|
||||
|
||||
function TrainsTableBody({stop, date, time, tableType}) {
|
||||
const [trains, setTrains] = useState([])
|
||||
|
||||
useEffect(() => {
|
||||
if (stop.id !== undefined) {
|
||||
let validTrains = trains.filter(train => {
|
||||
if (tableType === "departures")
|
||||
return `${train.departure_date}T${train.departure_time_24h}` >= `${date}T${time}`
|
||||
else
|
||||
return `${train.arrival_date}T${train.arrival_time_24h}` >= `${date}T${time}`
|
||||
})
|
||||
if (trains.length > 0 && validTrains.length === trains.length)
|
||||
return
|
||||
console.log(`${trains.length - validTrains.length} trains deleted`)
|
||||
fetch(`http://localhost:8000/api/station/next_${tableType}/?stop_id=${stop.id}&date=${date}&time=${time}&offset=${validTrains.length}&limit=${20 - validTrains.length}`)
|
||||
.then(response => response.json())
|
||||
.then(data => data.results)
|
||||
.then(data => {
|
||||
setTrains(trains => [...validTrains, ...data])
|
||||
})
|
||||
}
|
||||
}, [stop, tableType, date, time])
|
||||
|
||||
let table_rows = trains.map((train) => <CSSTransition key={train.id} timeout={500} classNames="shrink">
|
||||
<TrainRow train={train} tableType={tableType} />
|
||||
</CSSTransition>)
|
||||
|
||||
return <>
|
||||
<TableBody>
|
||||
<TransitionGroup component={null}>
|
||||
{table_rows}
|
||||
</TransitionGroup>
|
||||
</TableBody>
|
||||
</>
|
||||
}
|
||||
|
||||
function TrainRow({train, tableType}) {
|
||||
const [trip, setTrip] = useState({})
|
||||
const [route, setRoute] = useState({})
|
||||
const [stopTimes, setStopTimes] = useState([])
|
||||
const [trainType, setTrainType] = useState("")
|
||||
|
||||
useEffect(() => {
|
||||
if (train.trip !== undefined) {
|
||||
fetch(`http://localhost:8000/api/gtfs/trip/${train.trip}/`)
|
||||
.then(response => response.json())
|
||||
.then(t => {
|
||||
t.stop_times = []
|
||||
setTrip(t)
|
||||
})
|
||||
}
|
||||
}, [train.trip])
|
||||
|
||||
useEffect(() => {
|
||||
if (trip.route !== undefined) {
|
||||
fetch(`http://localhost:8000/api/gtfs/route/${trip.route}/`)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
setRoute(data)
|
||||
})
|
||||
}
|
||||
}, [trip.route])
|
||||
|
||||
useEffect(() => {
|
||||
if (route !== undefined) {
|
||||
setTrainType(getTrainType(train, route))
|
||||
}
|
||||
}, [train, route]);
|
||||
|
||||
useEffect(() => {
|
||||
if (trip.route !== undefined) {
|
||||
fetch(`http://localhost:8000/api/gtfs/stop_time/?trip=${trip.id}&order=stop_sequence&limit=1000`)
|
||||
.then(response => response.json())
|
||||
.then(data => data.results)
|
||||
.then(stop_times => {
|
||||
Promise.all(stop_times.map(stop_time =>
|
||||
fetch(`http://localhost:8000/api/gtfs/stop/${stop_time.stop}/`).then(response => response.json())
|
||||
)).then(stops => {
|
||||
setStopTimes(stop_times.map((stop_time, index) => {
|
||||
stop_time.stop = stops[index]
|
||||
return stop_time
|
||||
}))
|
||||
})
|
||||
})
|
||||
}
|
||||
}, [trip.route])
|
||||
|
||||
let headline = stopTimes[tableType === "departures" ? stopTimes.length - 1 : 0]?.stop ?? {name: "Chargement…"}
|
||||
|
||||
let stops_filter
|
||||
if (tableType === "departures")
|
||||
stops_filter = (stop_time) => stop_time.stop_sequence > train.stop_sequence && stop_time.drop_off_type === 0
|
||||
else
|
||||
stops_filter = (stop_time) => stop_time.stop_sequence < train.stop_sequence && stop_time.pickup_type === 0
|
||||
let stops_names = stopTimes.filter(stops_filter).map(stop_time => stop_time?.stop.name ?? "").join(", ")
|
||||
|
||||
return <>
|
||||
<StyledTableRow tableType={tableType}>
|
||||
<TableCell>
|
||||
<div>
|
||||
<Box display="flex"
|
||||
justifyContent="center"
|
||||
alignItems="center"
|
||||
textAlign="center"
|
||||
width="4em"
|
||||
height="4em"
|
||||
borderRadius="15%"
|
||||
fontWeight="bold"
|
||||
backgroundColor={`#${getBackgroundColor(train, route)}`}
|
||||
color={`#${getTextColor(train, route)}`}>
|
||||
{trainType}
|
||||
</Box>
|
||||
</div>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Box display="flex" alignItems="center" justifyContent="center" textAlign="center">
|
||||
<div>
|
||||
<div>{trip.short_name}</div>
|
||||
<div>{trip.headsign}</div>
|
||||
</div>
|
||||
</Box>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Box display="flex" alignItems="center" justifyContent="center" fontWeight="bold" color="#FFED02" fontSize={24}>
|
||||
{getDisplayTime(train, tableType)}
|
||||
</Box>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Typography fontSize={24} fontWeight="bold">{headline.name}</Typography>
|
||||
<span className="stops">{stops_names}</span>
|
||||
</TableCell>
|
||||
</StyledTableRow>
|
||||
</>
|
||||
}
|
||||
|
||||
function getTrainType(train, route) {
|
||||
if (train.id.startsWith("IDFM"))
|
||||
return route.short_name
|
||||
else {
|
||||
let trainType = train.stop.split("StopPoint:OCE")[1].split("-")[0]
|
||||
if (trainType === "Train TER")
|
||||
trainType = "TER"
|
||||
else if (trainType === "INTERCITES")
|
||||
trainType = "INTER-CITÉS"
|
||||
else if (trainType === "INTERCITES de nuit")
|
||||
trainType = "INTER-CITÉS de nuit"
|
||||
return trainType
|
||||
}
|
||||
}
|
||||
|
||||
function getBackgroundColor(train, route) {
|
||||
if (route.color)
|
||||
return route.color
|
||||
else if (getTrainType(train, route) === "OUIGO")
|
||||
return "E60075"
|
||||
return "FFFFFF"
|
||||
}
|
||||
|
||||
function getTextColor(train, route) {
|
||||
if (route.text_color)
|
||||
return route.text_color
|
||||
else {
|
||||
let trainType = getTrainType(train, route)
|
||||
switch (trainType) {
|
||||
case "OUIGO":
|
||||
return "FFFFFF"
|
||||
case "TGV INOUI":
|
||||
return "9B2743"
|
||||
case "ICE":
|
||||
return "B4B4B4"
|
||||
case "INTER-CITÉS":
|
||||
case "INTER-CITÉS de nuit":
|
||||
return "404042"
|
||||
default:
|
||||
return "000000"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getDisplayTime(train, tableType) {
|
||||
let time = tableType === "departures" ? train.departure_time : train.arrival_time
|
||||
let day_split = time.split(' ')
|
||||
return day_split[day_split.length - 1].substring(0, 5)
|
||||
}
|
||||
|
||||
export default TrainsTable;
|
||||
@ -1,13 +0,0 @@
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
||||
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
|
||||
sans-serif;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
code {
|
||||
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
|
||||
monospace;
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
import React, {useMemo} from 'react';
|
||||
import ReactDOM from 'react-dom/client';
|
||||
import './index.css';
|
||||
import reportWebVitals from './reportWebVitals';
|
||||
import App from "./App";
|
||||
|
||||
const root = ReactDOM.createRoot(document.getElementById('root'));
|
||||
root.render(
|
||||
<React.StrictMode>
|
||||
<App />
|
||||
</React.StrictMode>
|
||||
);
|
||||
|
||||
// If you want to start measuring performance in your app, pass a function
|
||||
// to log results (for example: reportWebVitals(console.log))
|
||||
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
|
||||
reportWebVitals();
|
||||
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 2.6 KiB |
@ -1,13 +0,0 @@
|
||||
const reportWebVitals = onPerfEntry => {
|
||||
if (onPerfEntry && onPerfEntry instanceof Function) {
|
||||
import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
|
||||
getCLS(onPerfEntry);
|
||||
getFID(onPerfEntry);
|
||||
getFCP(onPerfEntry);
|
||||
getLCP(onPerfEntry);
|
||||
getTTFB(onPerfEntry);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
export default reportWebVitals;
|
||||
@ -1,5 +0,0 @@
|
||||
// jest-dom adds custom jest matchers for asserting on DOM nodes.
|
||||
// allows you to do things like:
|
||||
// expect(element).toHaveTextContent(/react/i)
|
||||
// learn more: https://github.com/testing-library/jest-dom
|
||||
import '@testing-library/jest-dom';
|
||||
@ -1,6 +0,0 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class ApiConfig(AppConfig):
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "sncf.api"
|
||||
@ -1,63 +0,0 @@
|
||||
from rest_framework import serializers
|
||||
|
||||
from sncfgtfs.models import Agency, Stop, Route, Trip, StopTime, Calendar, CalendarDate, \
|
||||
Transfer, FeedInfo
|
||||
|
||||
|
||||
class AgencySerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Agency
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class StopSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Stop
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class RouteSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Route
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class TripSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Trip
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class StopTimeSerializer(serializers.ModelSerializer):
|
||||
arrival_date = serializers.DateField(required=False)
|
||||
departure_date = serializers.DateField(required=False)
|
||||
arrival_time_24h = serializers.DurationField(required=False)
|
||||
departure_time_24h = serializers.DurationField(required=False)
|
||||
|
||||
class Meta:
|
||||
model = StopTime
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class CalendarSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Calendar
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class CalendarDateSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = CalendarDate
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class TransferSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Transfer
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class FeedInfoSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = FeedInfo
|
||||
fields = '__all__'
|
||||
@ -1,3 +0,0 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@ -1,221 +0,0 @@
|
||||
from datetime import datetime, timedelta, date
|
||||
|
||||
from django.db.models import F, Q, Value
|
||||
from django.utils.decorators import method_decorator
|
||||
from django.views.decorators.http import last_modified
|
||||
from django_filters.rest_framework import DjangoFilterBackend
|
||||
from rest_framework import viewsets
|
||||
from rest_framework.filters import OrderingFilter
|
||||
|
||||
from sncf.api.serializers import AgencySerializer, StopSerializer, RouteSerializer, TripSerializer, \
|
||||
StopTimeSerializer, CalendarSerializer, CalendarDateSerializer, TransferSerializer, \
|
||||
FeedInfoSerializer
|
||||
from sncfgtfs.models import Agency, Stop, Route, Trip, StopTime, Calendar, CalendarDate, \
|
||||
Transfer, FeedInfo
|
||||
|
||||
|
||||
LAST_MODIFIED_CACHE = last_modified(lambda *args, **kwargs: datetime.fromisoformat(FeedInfo.objects.get().version))
|
||||
|
||||
|
||||
@method_decorator(name='list', decorator=LAST_MODIFIED_CACHE)
|
||||
@method_decorator(name='retrieve', decorator=LAST_MODIFIED_CACHE)
|
||||
class AgencyViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
queryset = Agency.objects.all()
|
||||
serializer_class = AgencySerializer
|
||||
filter_backends = [DjangoFilterBackend]
|
||||
filterset_fields = '__all__'
|
||||
|
||||
|
||||
@method_decorator(name='list', decorator=LAST_MODIFIED_CACHE)
|
||||
@method_decorator(name='retrieve', decorator=[LAST_MODIFIED_CACHE])
|
||||
class StopViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
queryset = Stop.objects.all()
|
||||
serializer_class = StopSerializer
|
||||
filter_backends = [DjangoFilterBackend]
|
||||
filterset_fields = '__all__'
|
||||
|
||||
|
||||
@method_decorator(name='list', decorator=LAST_MODIFIED_CACHE)
|
||||
@method_decorator(name='retrieve', decorator=LAST_MODIFIED_CACHE)
|
||||
class RouteViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
queryset = Route.objects.all()
|
||||
serializer_class = RouteSerializer
|
||||
filter_backends = [DjangoFilterBackend]
|
||||
filterset_fields = '__all__'
|
||||
|
||||
|
||||
@method_decorator(name='list', decorator=LAST_MODIFIED_CACHE)
|
||||
@method_decorator(name='retrieve', decorator=LAST_MODIFIED_CACHE)
|
||||
class TripViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
queryset = Trip.objects.all()
|
||||
serializer_class = TripSerializer
|
||||
filter_backends = [DjangoFilterBackend]
|
||||
filterset_fields = '__all__'
|
||||
|
||||
|
||||
@method_decorator(name='list', decorator=LAST_MODIFIED_CACHE)
|
||||
@method_decorator(name='retrieve', decorator=LAST_MODIFIED_CACHE)
|
||||
class StopTimeViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
queryset = StopTime.objects.order_by('id').all()
|
||||
serializer_class = StopTimeSerializer
|
||||
filter_backends = [DjangoFilterBackend, OrderingFilter]
|
||||
filterset_fields = '__all__'
|
||||
ordering_fields = ['arrival_time', 'departure_time', 'stop_sequence', ]
|
||||
ordering = ['stop_sequence', ]
|
||||
|
||||
|
||||
@method_decorator(name='list', decorator=LAST_MODIFIED_CACHE)
|
||||
@method_decorator(name='retrieve', decorator=LAST_MODIFIED_CACHE)
|
||||
class CalendarViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
queryset = Calendar.objects.all()
|
||||
serializer_class = CalendarSerializer
|
||||
filter_backends = [DjangoFilterBackend]
|
||||
filterset_fields = '__all__'
|
||||
|
||||
|
||||
@method_decorator(name='list', decorator=LAST_MODIFIED_CACHE)
|
||||
@method_decorator(name='retrieve', decorator=LAST_MODIFIED_CACHE)
|
||||
class CalendarDateViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
queryset = CalendarDate.objects.all()
|
||||
serializer_class = CalendarDateSerializer
|
||||
filter_backends = [DjangoFilterBackend]
|
||||
filterset_fields = '__all__'
|
||||
|
||||
|
||||
@method_decorator(name='list', decorator=LAST_MODIFIED_CACHE)
|
||||
@method_decorator(name='retrieve', decorator=LAST_MODIFIED_CACHE)
|
||||
class TransferViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
queryset = Transfer.objects.all()
|
||||
serializer_class = TransferSerializer
|
||||
filter_backends = [DjangoFilterBackend]
|
||||
|
||||
|
||||
@method_decorator(name='list', decorator=LAST_MODIFIED_CACHE)
|
||||
@method_decorator(name='retrieve', decorator=LAST_MODIFIED_CACHE)
|
||||
class FeedInfoViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
queryset = FeedInfo.objects.all()
|
||||
serializer_class = FeedInfoSerializer
|
||||
filter_backends = [DjangoFilterBackend]
|
||||
filterset_fields = '__all__'
|
||||
|
||||
|
||||
class NextDeparturesViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
queryset = StopTime.objects.none()
|
||||
serializer_class = StopTimeSerializer
|
||||
filter_backends = [DjangoFilterBackend]
|
||||
|
||||
def get_queryset(self):
|
||||
now = datetime.now()
|
||||
|
||||
stop_id = self.request.query_params.get('stop_id', None)
|
||||
stop_name = self.request.query_params.get('stop_name', None)
|
||||
query_date = date.fromisoformat(self.request.query_params.get('date', now.date().isoformat()))
|
||||
query_time = self.request.query_params.get('time', now.time().isoformat(timespec='seconds'))
|
||||
query_time = timedelta(seconds=int(query_time[:2]) * 3600
|
||||
+ int(query_time[3:5]) * 60
|
||||
+ (int(query_time[6:]) if len(query_time) > 6 else 0))
|
||||
|
||||
yesterday = query_date - timedelta(days=1)
|
||||
time_yesterday = query_time + timedelta(days=1)
|
||||
tomorrow = query_date + timedelta(days=1)
|
||||
|
||||
stop_filter = Q(stop__location_type=0)
|
||||
if stop_id:
|
||||
stop = Stop.objects.get(id=stop_id)
|
||||
stops = Stop.objects.filter(Q(id=stop_id)
|
||||
| Q(parent_station=stop_id))
|
||||
if stop.location_type == 0:
|
||||
stops |= Stop.objects.filter(parent_station=stop.parent_station_id)
|
||||
stop_filter = Q(stop__in=stops.values_list('id', flat=True))
|
||||
elif stop_name:
|
||||
stops = Stop.objects.filter(name__iexact=stop_name).values_list('id', flat=True)
|
||||
stop_filter = Q(stop__in=stops)
|
||||
|
||||
def calendar_filter(d: date):
|
||||
return Q(trip__service_id__in=CalendarDate.objects.filter(date=d, exception_type=1)
|
||||
.values_list('service_id')) \
|
||||
| Q(trip__service_id__in=Calendar.objects.filter(
|
||||
start_date__lte=d,
|
||||
end_date__gte=d,
|
||||
**{f"{d:%A}".lower(): True})
|
||||
.filter(~Q(id__in=CalendarDate.objects.filter(date=d, exception_type=2)
|
||||
.values_list('service_id', flat=True)))
|
||||
.values_list('id'))
|
||||
|
||||
qs_today = StopTime.objects.filter(stop_filter) \
|
||||
.filter(Q(departure_time__gte=query_time, pickup_type=0), calendar_filter(query_date)) \
|
||||
.annotate(departure_date=Value(query_date)) \
|
||||
.annotate(departure_time_24h=F('departure_time'))
|
||||
|
||||
qs_yesterday = StopTime.objects.filter(stop_filter) \
|
||||
.filter(Q(departure_time__gte=time_yesterday, pickup_type=0), calendar_filter(yesterday)) \
|
||||
.annotate(departure_date=Value(yesterday)) \
|
||||
.annotate(departure_time_24h=F('departure_time') - timedelta(days=1))
|
||||
|
||||
qs_tomorrow = StopTime.objects.filter(stop_filter) \
|
||||
.filter(Q(departure_time__gte=timedelta(0), pickup_type=0), calendar_filter(tomorrow)) \
|
||||
.annotate(departure_date=Value(tomorrow)) \
|
||||
.annotate(departure_time_24h=F('departure_time') + timedelta(days=1))
|
||||
|
||||
return qs_today.union(qs_yesterday).union(qs_tomorrow).order_by("departure_time_24h").all()
|
||||
|
||||
|
||||
class NextArrivalsViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
queryset = StopTime.objects.none()
|
||||
serializer_class = StopTimeSerializer
|
||||
filter_backends = [DjangoFilterBackend]
|
||||
|
||||
def get_queryset(self):
|
||||
now = datetime.now()
|
||||
|
||||
stop_id = self.request.query_params.get('stop_id', None)
|
||||
stop_name = self.request.query_params.get('stop_name', None)
|
||||
query_date = date.fromisoformat(self.request.query_params.get('date', now.date().isoformat()))
|
||||
query_time = self.request.query_params.get('time', now.time().isoformat(timespec='seconds'))
|
||||
query_time = timedelta(seconds=int(query_time[:2]) * 3600
|
||||
+ int(query_time[3:5]) * 60
|
||||
+ (int(query_time[6:]) if len(query_time) > 6 else 0))
|
||||
|
||||
yesterday = query_date - timedelta(days=1)
|
||||
time_yesterday = query_time + timedelta(days=1)
|
||||
tomorrow = query_date + timedelta(days=1)
|
||||
|
||||
stop_filter = Q(stop__location_type=0)
|
||||
if stop_id:
|
||||
stop = Stop.objects.get(id=stop_id)
|
||||
stops = Stop.objects.filter(Q(id=stop_id)
|
||||
| Q(parent_station=stop_id))
|
||||
if stop.location_type == 0:
|
||||
stops |= Stop.objects.filter(parent_station=stop.parent_station_id)
|
||||
stop_filter = Q(stop__in=stops.values_list('id', flat=True))
|
||||
elif stop_name:
|
||||
stops = Stop.objects.filter(name__iexact=stop_name).values_list('id', flat=True)
|
||||
stop_filter = Q(stop__in=stops)
|
||||
|
||||
def calendar_filter(d: date):
|
||||
return Q(trip__service_id__in=CalendarDate.objects.filter(date=d, exception_type=1)
|
||||
.values_list('service_id')) \
|
||||
| Q(trip__service_id__in=Calendar.objects.filter(
|
||||
start_date__lte=d,
|
||||
end_date__gte=d,
|
||||
**{f"{d:%A}".lower(): True})
|
||||
.filter(~Q(id__in=CalendarDate.objects.filter(date=d, exception_type=2)
|
||||
.values_list('service_id', flat=True)))
|
||||
.values_list('id'))
|
||||
|
||||
qs_today = StopTime.objects.filter(stop_filter) \
|
||||
.filter(Q(arrival_time__gte=query_time, drop_off_type=0), calendar_filter(query_date)) \
|
||||
.annotate(arrival_date=Value(query_date)) \
|
||||
.annotate(arrival_time_24h=F('arrival_time'))
|
||||
|
||||
qs_yesterday = StopTime.objects.filter(stop_filter) \
|
||||
.filter(Q(arrival_time__gte=time_yesterday, drop_off_type=0), calendar_filter(yesterday)) \
|
||||
.annotate(arrival_date=Value(yesterday)) \
|
||||
.annotate(arrival_time_24h=F('arrival_time') - timedelta(days=1))
|
||||
|
||||
qs_tomorrow = StopTime.objects.filter(stop_filter) \
|
||||
.filter(Q(arrival_time__gte=timedelta(0), drop_off_type=0), calendar_filter(tomorrow)) \
|
||||
.annotate(arrival_date=Value(tomorrow)) \
|
||||
.annotate(arrival_time_24h=F('arrival_time') + timedelta(days=1))
|
||||
|
||||
return qs_today.union(qs_yesterday).union(qs_tomorrow).order_by("arrival_time_24h").all()
|
||||
@ -38,18 +38,12 @@ INSTALLED_APPS = [
|
||||
"django.contrib.messages",
|
||||
"django.contrib.staticfiles",
|
||||
|
||||
"corsheaders",
|
||||
"django_filters",
|
||||
"rest_framework",
|
||||
|
||||
"sncf.api",
|
||||
"sncfgtfs",
|
||||
]
|
||||
|
||||
MIDDLEWARE = [
|
||||
"django.middleware.security.SecurityMiddleware",
|
||||
"django.contrib.sessions.middleware.SessionMiddleware",
|
||||
"corsheaders.middleware.CorsMiddleware",
|
||||
"django.middleware.common.CommonMiddleware",
|
||||
"django.middleware.csrf.CsrfViewMiddleware",
|
||||
"django.contrib.auth.middleware.AuthenticationMiddleware",
|
||||
@ -57,10 +51,6 @@ MIDDLEWARE = [
|
||||
"django.middleware.clickjacking.XFrameOptionsMiddleware",
|
||||
]
|
||||
|
||||
CORS_ALLOWED_ORIGINS = [
|
||||
"http://localhost:3000",
|
||||
]
|
||||
|
||||
ROOT_URLCONF = "sncf.urls"
|
||||
|
||||
TEMPLATES = [
|
||||
@ -133,9 +123,3 @@ STATIC_URL = "static/"
|
||||
# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field
|
||||
|
||||
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
|
||||
|
||||
REST_FRAMEWORK = {
|
||||
'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend'],
|
||||
'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
|
||||
'PAGE_SIZE': 20,
|
||||
}
|
||||
|
||||
19
sncf/urls.py
19
sncf/urls.py
@ -16,27 +16,8 @@ Including another URLconf
|
||||
"""
|
||||
from django.contrib import admin
|
||||
from django.urls import path, include
|
||||
from rest_framework import routers
|
||||
|
||||
from sncf.api.views import AgencyViewSet, StopViewSet, RouteViewSet, TripViewSet, StopTimeViewSet, \
|
||||
CalendarViewSet, CalendarDateViewSet, TransferViewSet, FeedInfoViewSet, NextDeparturesViewSet, NextArrivalsViewSet
|
||||
|
||||
router = routers.DefaultRouter()
|
||||
router.register("gtfs/agency", AgencyViewSet)
|
||||
router.register("gtfs/stop", StopViewSet)
|
||||
router.register("gtfs/route", RouteViewSet)
|
||||
router.register("gtfs/trip", TripViewSet)
|
||||
router.register("gtfs/stop_time", StopTimeViewSet)
|
||||
router.register("gtfs/calendar", CalendarViewSet)
|
||||
router.register("gtfs/calendar_date", CalendarDateViewSet)
|
||||
router.register("gtfs/transfer", TransferViewSet)
|
||||
router.register("gtfs/feed_info", FeedInfoViewSet)
|
||||
router.register("station/next_departures", NextDeparturesViewSet, basename="next_departures")
|
||||
router.register("station/next_arrivals", NextArrivalsViewSet, basename="next_arrivals")
|
||||
|
||||
urlpatterns = [
|
||||
path("admin/", admin.site.urls, name="admin"),
|
||||
path("api/", include(router.urls)),
|
||||
path("api-auth/", include('rest_framework.urls', namespace='rest_framework')),
|
||||
path("gtfs/", include("sncfgtfs.urls"), name="gtfs"),
|
||||
]
|
||||
|
||||
@ -69,14 +69,14 @@ class CalendarDateAdmin(admin.ModelAdmin):
|
||||
class TransferAdmin(admin.ModelAdmin):
|
||||
list_display = ('from_stop', 'to_stop', 'transfer_type', 'min_transfer_time',)
|
||||
list_filter = ('transfer_type',)
|
||||
search_fields = ('from_stop__name', 'to_stop__name',)
|
||||
search_fields = ('from_stop__stop_name', 'to_stop__stop_name',)
|
||||
autocomplete_fields = ('from_stop', 'to_stop',)
|
||||
|
||||
|
||||
@admin.register(FeedInfo)
|
||||
class FeedInfoAdmin(admin.ModelAdmin):
|
||||
list_display = ('publisher_name', 'publisher_url', 'lang', 'start_date',
|
||||
'end_date', 'version',)
|
||||
search_fields = ('publisher_name', 'publisher_url', 'lang', 'start_date',
|
||||
'end_date', 'version',)
|
||||
ordering = ('publisher_name',)
|
||||
list_display = ('feed_publisher_name', 'feed_publisher_url', 'feed_lang', 'feed_start_date',
|
||||
'feed_end_date', 'feed_version',)
|
||||
search_fields = ('feed_publisher_name', 'feed_publisher_url', 'feed_lang', 'feed_start_date',
|
||||
'feed_end_date', 'feed_version',)
|
||||
ordering = ('feed_publisher_name',)
|
||||
|
||||
@ -28,7 +28,7 @@ class Command(BaseCommand):
|
||||
if not FeedInfo.objects.exists():
|
||||
last_update_date = "1970-01-01"
|
||||
else:
|
||||
last_update_date = FeedInfo.objects.get().version
|
||||
last_update_date = FeedInfo.objects.get().feed_version
|
||||
|
||||
for url in self.GTFS_FEEDS.values():
|
||||
last_modified = requests.head(url).headers["Last-Modified"]
|
||||
@ -325,12 +325,12 @@ class Command(BaseCommand):
|
||||
for feed_info_dict in csv.DictReader(zipfile.read("feed_info.txt").decode().splitlines()):
|
||||
feed_info_dict: dict
|
||||
FeedInfo.objects.update_or_create(
|
||||
publisher_name=feed_info_dict['feed_publisher_name'],
|
||||
defaults=dict(
|
||||
publisher_url=feed_info_dict['feed_publisher_url'],
|
||||
lang=feed_info_dict['feed_lang'],
|
||||
start_date=feed_info_dict['feed_start_date'],
|
||||
end_date=feed_info_dict['feed_end_date'],
|
||||
version=feed_info_dict['feed_version'],
|
||||
)
|
||||
feed_publisher_name=feed_info_dict['feed_publisher_name'],
|
||||
defaults={
|
||||
'feed_publisher_url': feed_info_dict['feed_publisher_url'],
|
||||
'feed_lang': feed_info_dict['feed_lang'],
|
||||
'feed_start_date': feed_info_dict['feed_start_date'],
|
||||
'feed_end_date': feed_info_dict['feed_end_date'],
|
||||
'feed_version': feed_info_dict['feed_version'],
|
||||
}
|
||||
)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Generated by Django 5.0.1 on 2024-01-27 14:08
|
||||
# Generated by Django 5.0.1 on 2024-01-27 10:29
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
@ -55,7 +55,6 @@ class Migration(migrations.Migration):
|
||||
options={
|
||||
"verbose_name": "Agency",
|
||||
"verbose_name_plural": "Agencies",
|
||||
"ordering": ("name",),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
@ -96,7 +95,6 @@ class Migration(migrations.Migration):
|
||||
options={
|
||||
"verbose_name": "Calendar",
|
||||
"verbose_name_plural": "Calendars",
|
||||
"ordering": ("id",),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
@ -112,27 +110,29 @@ class Migration(migrations.Migration):
|
||||
),
|
||||
),
|
||||
(
|
||||
"publisher_name",
|
||||
"feed_publisher_name",
|
||||
models.CharField(
|
||||
max_length=255, verbose_name="Feed publisher name"
|
||||
),
|
||||
),
|
||||
("publisher_url", models.URLField(verbose_name="Feed publisher URL")),
|
||||
(
|
||||
"lang",
|
||||
"feed_publisher_url",
|
||||
models.URLField(verbose_name="Feed publisher URL"),
|
||||
),
|
||||
(
|
||||
"feed_lang",
|
||||
models.CharField(max_length=255, verbose_name="Feed language"),
|
||||
),
|
||||
("start_date", models.DateField(verbose_name="Feed start date")),
|
||||
("end_date", models.DateField(verbose_name="Feed end date")),
|
||||
("feed_start_date", models.DateField(verbose_name="Feed start date")),
|
||||
("feed_end_date", models.DateField(verbose_name="Feed end date")),
|
||||
(
|
||||
"version",
|
||||
"feed_version",
|
||||
models.CharField(max_length=255, verbose_name="Feed version"),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"verbose_name": "Feed info",
|
||||
"verbose_name_plural": "Feed infos",
|
||||
"ordering": ("publisher_name",),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
@ -181,7 +181,6 @@ class Migration(migrations.Migration):
|
||||
options={
|
||||
"verbose_name": "Calendar date",
|
||||
"verbose_name_plural": "Calendar dates",
|
||||
"ordering": ("id",),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
@ -252,7 +251,6 @@ class Migration(migrations.Migration):
|
||||
options={
|
||||
"verbose_name": "Route",
|
||||
"verbose_name_plural": "Routes",
|
||||
"ordering": ("id",),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
@ -345,7 +343,6 @@ class Migration(migrations.Migration):
|
||||
options={
|
||||
"verbose_name": "Stop",
|
||||
"verbose_name_plural": "Stops",
|
||||
"ordering": ("id",),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
@ -401,7 +398,6 @@ class Migration(migrations.Migration):
|
||||
options={
|
||||
"verbose_name": "Transfer",
|
||||
"verbose_name_plural": "Transfers",
|
||||
"ordering": ("id",),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
@ -496,7 +492,6 @@ class Migration(migrations.Migration):
|
||||
options={
|
||||
"verbose_name": "Trip",
|
||||
"verbose_name_plural": "Trips",
|
||||
"ordering": ("id",),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
|
||||
@ -103,7 +103,6 @@ class Agency(models.Model):
|
||||
class Meta:
|
||||
verbose_name = _("Agency")
|
||||
verbose_name_plural = _("Agencies")
|
||||
ordering = ("name",)
|
||||
|
||||
|
||||
class Stop(models.Model):
|
||||
@ -195,7 +194,6 @@ class Stop(models.Model):
|
||||
class Meta:
|
||||
verbose_name = _("Stop")
|
||||
verbose_name_plural = _("Stops")
|
||||
ordering = ("id",)
|
||||
|
||||
|
||||
class Route(models.Model):
|
||||
@ -256,7 +254,6 @@ class Route(models.Model):
|
||||
class Meta:
|
||||
verbose_name = _("Route")
|
||||
verbose_name_plural = _("Routes")
|
||||
ordering = ("id",)
|
||||
|
||||
|
||||
class Trip(models.Model):
|
||||
@ -379,7 +376,6 @@ class Trip(models.Model):
|
||||
class Meta:
|
||||
verbose_name = _("Trip")
|
||||
verbose_name_plural = _("Trips")
|
||||
ordering = ("id",)
|
||||
|
||||
|
||||
class StopTime(models.Model):
|
||||
@ -518,7 +514,6 @@ class Calendar(models.Model):
|
||||
class Meta:
|
||||
verbose_name = _("Calendar")
|
||||
verbose_name_plural = _("Calendars")
|
||||
ordering = ("id",)
|
||||
|
||||
|
||||
class CalendarDate(models.Model):
|
||||
@ -556,7 +551,6 @@ class CalendarDate(models.Model):
|
||||
class Meta:
|
||||
verbose_name = _("Calendar date")
|
||||
verbose_name_plural = _("Calendar dates")
|
||||
ordering = ("id",)
|
||||
|
||||
|
||||
class Transfer(models.Model):
|
||||
@ -594,33 +588,32 @@ class Transfer(models.Model):
|
||||
class Meta:
|
||||
verbose_name = _("Transfer")
|
||||
verbose_name_plural = _("Transfers")
|
||||
ordering = ("id",)
|
||||
|
||||
|
||||
class FeedInfo(models.Model):
|
||||
publisher_name = models.CharField(
|
||||
feed_publisher_name = models.CharField(
|
||||
max_length=255,
|
||||
verbose_name=_("Feed publisher name"),
|
||||
)
|
||||
|
||||
publisher_url = models.URLField(
|
||||
feed_publisher_url = models.URLField(
|
||||
verbose_name=_("Feed publisher URL"),
|
||||
)
|
||||
|
||||
lang = models.CharField(
|
||||
feed_lang = models.CharField(
|
||||
max_length=255,
|
||||
verbose_name=_("Feed language"),
|
||||
)
|
||||
|
||||
start_date = models.DateField(
|
||||
feed_start_date = models.DateField(
|
||||
verbose_name=_("Feed start date"),
|
||||
)
|
||||
|
||||
end_date = models.DateField(
|
||||
feed_end_date = models.DateField(
|
||||
verbose_name=_("Feed end date"),
|
||||
)
|
||||
|
||||
version = models.CharField(
|
||||
feed_version = models.CharField(
|
||||
max_length=255,
|
||||
verbose_name=_("Feed version"),
|
||||
)
|
||||
@ -628,4 +621,3 @@ class FeedInfo(models.Model):
|
||||
class Meta:
|
||||
verbose_name = _("Feed info")
|
||||
verbose_name_plural = _("Feed infos")
|
||||
ordering = ("publisher_name",)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user