Compare commits
No commits in common. "c65e60a1f13845df14364953170a4c19333d9beb" and "4fa7647584dd049c6c287143dd67eb614db1ab05" have entirely different histories.
c65e60a1f1
...
4fa7647584
17
.eslintrc.js
17
.eslintrc.js
|
@ -1,17 +0,0 @@
|
||||||
module.exports = {
|
|
||||||
"env": {
|
|
||||||
"browser": true,
|
|
||||||
"es6": true
|
|
||||||
},
|
|
||||||
"extends": "eslint:recommended",
|
|
||||||
"globals": {
|
|
||||||
"Atomics": "readonly",
|
|
||||||
"SharedArrayBuffer": "readonly"
|
|
||||||
},
|
|
||||||
"parserOptions": {
|
|
||||||
"ecmaVersion": 14,
|
|
||||||
"sourceType": "module"
|
|
||||||
},
|
|
||||||
"rules": {
|
|
||||||
}
|
|
||||||
};
|
|
|
@ -58,9 +58,7 @@ def load_trains(
|
||||||
return trains
|
return trains
|
||||||
|
|
||||||
|
|
||||||
def load_ferries(
|
def load_ferries(data_dir: str) -> list[StrDict]:
|
||||||
data_dir: str, route_distances: travel.RouteDistances | None = None
|
|
||||||
) -> list[StrDict]:
|
|
||||||
"""Load ferries."""
|
"""Load ferries."""
|
||||||
ferries = load_travel("ferry", "ferries", data_dir)
|
ferries = load_travel("ferry", "ferries", data_dir)
|
||||||
terminals = travel.parse_yaml("ferry_terminals", data_dir)
|
terminals = travel.parse_yaml("ferry_terminals", data_dir)
|
||||||
|
@ -72,9 +70,6 @@ def load_ferries(
|
||||||
item["from_terminal"] = from_terminal
|
item["from_terminal"] = from_terminal
|
||||||
item["to_terminal"] = to_terminal
|
item["to_terminal"] = to_terminal
|
||||||
|
|
||||||
if route_distances:
|
|
||||||
travel.add_leg_route_distance(item, route_distances)
|
|
||||||
|
|
||||||
geojson = from_terminal["routes"].get(item["to"])
|
geojson = from_terminal["routes"].get(item["to"])
|
||||||
if geojson:
|
if geojson:
|
||||||
item["geojson_filename"] = geojson
|
item["geojson_filename"] = geojson
|
||||||
|
@ -136,7 +131,7 @@ def build_trip_list(
|
||||||
travel_items = sorted(
|
travel_items = sorted(
|
||||||
load_flights(data_dir)
|
load_flights(data_dir)
|
||||||
+ load_trains(data_dir, route_distances=route_distances)
|
+ load_trains(data_dir, route_distances=route_distances)
|
||||||
+ load_ferries(data_dir, route_distances=route_distances),
|
+ load_ferries(data_dir),
|
||||||
key=depart_datetime,
|
key=depart_datetime,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"copy-webpack-plugin": "^12.0.2",
|
"copy-webpack-plugin": "^12.0.2",
|
||||||
"eslint": "^9.2.0",
|
|
||||||
"webpack": "^5.91.0",
|
"webpack": "^5.91.0",
|
||||||
"webpack-cli": "^5.1.4"
|
"webpack-cli": "^5.1.4"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue