From 9670407b8ce38db8ccfb57e0b041ccd95313ea2f Mon Sep 17 00:00:00 2001 From: r-leyshon Date: Wed, 3 Jul 2024 15:23:11 +0100 Subject: [PATCH] chore: Flatten out PKG_PATH data --- .../html_templates/evaluation_template.html | 117 ------------------ .../report/html_templates/stops_template.html | 42 ------- .../html_templates/summary_template.html | 46 ------- .../data/{gtfs => }/report/.gitkeep | 0 .../{gtfs => }/report/css_styles/styles.css | 0 .../data/{gtfs => }/route_lookup.pkl | Bin src/assess_gtfs/gtfs_utils.py | 4 +- src/assess_gtfs/report/report_utils.py | 2 +- src/assess_gtfs/routes.py | 4 +- src/assess_gtfs/validation.py | 3 - 10 files changed, 5 insertions(+), 213 deletions(-) delete mode 100644 src/assess_gtfs/data/gtfs/report/html_templates/evaluation_template.html delete mode 100644 src/assess_gtfs/data/gtfs/report/html_templates/stops_template.html delete mode 100644 src/assess_gtfs/data/gtfs/report/html_templates/summary_template.html rename src/assess_gtfs/data/{gtfs => }/report/.gitkeep (100%) rename src/assess_gtfs/data/{gtfs => }/report/css_styles/styles.css (100%) rename src/assess_gtfs/data/{gtfs => }/route_lookup.pkl (100%) diff --git a/src/assess_gtfs/data/gtfs/report/html_templates/evaluation_template.html b/src/assess_gtfs/data/gtfs/report/html_templates/evaluation_template.html deleted file mode 100644 index e428456..0000000 --- a/src/assess_gtfs/data/gtfs/report/html_templates/evaluation_template.html +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - GTFS Report [date] - - - -
-
-

GTFS Report

-
- -
-
-
-
- GTFS Data Evaluation -
-
-
-
- GTFS Feed Info -
-
-
-
Publisher Name:
-
[name_placeholder]
-
-
-
Publisher URL:
-
[url_placeholder]
-
-
-
Feed Language:
-
[lang_placeholder]
-
-
-
Feed Start Date:
-
[start_placeholder]
-
-
-
Feed End Data:
-
[end_placeholder]
-
-
-
Feed Version:
-
[version_placeholder]
-
-
-
-
-
-
- GTFS Feed Counts -
-
-
-
Agencies:
-
[agency_placeholder]
-
-
-
Routes:
-
[routes_placeholder]
-
-
-
Trips:
-
[trips_placeholder]
-
-
-
Stops:
-
[stops_placeholder]
-
-
-
Shapes:
-
[shapes_placeholder]
-
-
-
-
-
-
- [eval_title_3] -
-
- [eval_placeholder_3] -
-
-
-
-
- [eval_title_1] -
-
- [eval_placeholder_1] -
-
-
-
-
- [eval_title_2] -
-
- [eval_placeholder_2] -
-
-
-
- diff --git a/src/assess_gtfs/data/gtfs/report/html_templates/stops_template.html b/src/assess_gtfs/data/gtfs/report/html_templates/stops_template.html deleted file mode 100644 index 411ea46..0000000 --- a/src/assess_gtfs/data/gtfs/report/html_templates/stops_template.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - GTFS Report - [date] - - - -
-
-

GTFS Report

-
- -
-
-
-
- GTFS Trips and Routes Summaries -
-
-
-
- [stops_title_1] - -
-
-
-
- [stops_title_2] - -
-
-
- diff --git a/src/assess_gtfs/data/gtfs/report/html_templates/summary_template.html b/src/assess_gtfs/data/gtfs/report/html_templates/summary_template.html deleted file mode 100644 index 72efdd3..0000000 --- a/src/assess_gtfs/data/gtfs/report/html_templates/summary_template.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - GTFS Report - [date] - - - -
-
-

GTFS Report

-
- -
-
-
-
- GTFS Trips and Routes Summaries -
-
-
-
- [plotly_title_1] -
- [plotly_placeholder_1] -
-
-
-
-
- [plotly_title_2] -
- [plotly_placeholder_2] -
-
-
-
- diff --git a/src/assess_gtfs/data/gtfs/report/.gitkeep b/src/assess_gtfs/data/report/.gitkeep similarity index 100% rename from src/assess_gtfs/data/gtfs/report/.gitkeep rename to src/assess_gtfs/data/report/.gitkeep diff --git a/src/assess_gtfs/data/gtfs/report/css_styles/styles.css b/src/assess_gtfs/data/report/css_styles/styles.css similarity index 100% rename from src/assess_gtfs/data/gtfs/report/css_styles/styles.css rename to src/assess_gtfs/data/report/css_styles/styles.css diff --git a/src/assess_gtfs/data/gtfs/route_lookup.pkl b/src/assess_gtfs/data/route_lookup.pkl similarity index 100% rename from src/assess_gtfs/data/gtfs/route_lookup.pkl rename to src/assess_gtfs/data/route_lookup.pkl diff --git a/src/assess_gtfs/gtfs_utils.py b/src/assess_gtfs/gtfs_utils.py index d665991..9e6568b 100644 --- a/src/assess_gtfs/gtfs_utils.py +++ b/src/assess_gtfs/gtfs_utils.py @@ -147,7 +147,7 @@ def filter_gtfs( def bbox_filter_gtfs( in_pth: Union[pathlib.Path, str] = ( - os.path.join(PKG_PATH, "data", "gtfs", "newport-20230613_gtfs.zip"), + os.path.join(PKG_PATH, "data", "newport-20230613_gtfs.zip"), ), out_pth: Union[pathlib.Path, str] = pathlib.Path( here("data/external/filtered_gtfs.zip") @@ -173,7 +173,7 @@ def bbox_filter_gtfs( ---------- in_pth : Union[pathlib.Path, str], optional Path to the unfiltered GTFS feed. Defaults to - os.path.join(PKG_PATH, "data", "gtfs", "newport-20230613_gtfs.zip"). + os.path.join(PKG_PATH, "data", "newport-20230613_gtfs.zip"). out_pth : Union[pathlib.Path, str], optional Path to write the filtered feed to. Defaults to here("data/external/filtered_gtfs.zip"). diff --git a/src/assess_gtfs/report/report_utils.py b/src/assess_gtfs/report/report_utils.py index 8a39e2d..d98103a 100644 --- a/src/assess_gtfs/report/report_utils.py +++ b/src/assess_gtfs/report/report_utils.py @@ -157,7 +157,7 @@ def _set_up_report_dir( except FileExistsError: pass styles_loc = os.path.join( - PKG_PATH, "data", "gtfs", "report", "css_styles", "styles.css" + PKG_PATH, "data", "report", "css_styles", "styles.css" ) shutil.copy( src=styles_loc, diff --git a/src/assess_gtfs/routes.py b/src/assess_gtfs/routes.py index d352fdf..e386b0e 100644 --- a/src/assess_gtfs/routes.py +++ b/src/assess_gtfs/routes.py @@ -156,7 +156,7 @@ def scrape_route_type_lookup( def get_saved_route_type_lookup( path: Union[str, pathlib.Path] = pathlib.Path( - os.path.join(PKG_PATH, "data", "gtfs", "route_lookup.pkl") + os.path.join(PKG_PATH, "data", "route_lookup.pkl") ) ) -> pd.DataFrame: """Get the locally saved route type lookup as a dataframe. @@ -165,7 +165,7 @@ def get_saved_route_type_lookup( ---------- path : Union[str, pathlib.Path], optional The path to the route type lookup, - defaults to os.path.join(PKG_PATH, "data", "gtfs", "route_lookup.pkl") + defaults to os.path.join(PKG_PATH, "data", "route_lookup.pkl") Returns ------- diff --git a/src/assess_gtfs/validation.py b/src/assess_gtfs/validation.py index c11e6a0..8f30185 100644 --- a/src/assess_gtfs/validation.py +++ b/src/assess_gtfs/validation.py @@ -1459,7 +1459,6 @@ def html_report( os.path.join( PKG_PATH, "data", - "gtfs", "report", "html_templates", "evaluation_template.html", @@ -1555,7 +1554,6 @@ def html_report( os.path.join( PKG_PATH, "data", - "gtfs", "report", "html_templates", "stops_template.html", @@ -1601,7 +1599,6 @@ def html_report( os.path.join( PKG_PATH, "data", - "gtfs", "report", "html_templates", "summary_template.html",