Skip to content

Commit

Permalink
Merge branch 'main' into renovate/linting
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm authored Jun 11, 2024
2 parents 0cc7b12 + 9abdf39 commit 9f78d38
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion data/external/scrapers/public_transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from utils import setup_logging

MVV_OPENDATA_URL = "https://www.mvv-muenchen.de/fileadmin/mediapool/02-Fahrplanauskunft/03-Downloads/openData"
MVV_GTFS_URL = f"{MVV_OPENDATA_URL}/mvv_gtfs.zip"
MVV_GTFS_URL = f"{MVV_OPENDATA_URL}/gtfs_mvv_ohneShape_01.zip"
MVV_HST_REPORT_URL = f"{MVV_OPENDATA_URL}/MVV_HSTReport2312.csv" # train/tram stations + some bus stations
PUBLIC_TRANSPORT_CACHE_PATH = CACHE_PATH / "public_transport"

Expand Down
3 changes: 1 addition & 2 deletions server/main-api/src/maps/mod.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
use std::fmt::{Display, Formatter};
use std::io::Cursor;

use actix_web::http::header::LOCATION;
use actix_web::{get, web, HttpResponse};
use image::{ImageBuffer, Rgba};

use log::{debug, error, warn};
use serde::{Deserialize, Serializer};
use serde::Deserialize;
use sqlx::Error::RowNotFound;
use sqlx::PgPool;
use tokio::time::Instant;
Expand Down

0 comments on commit 9f78d38

Please sign in to comment.