diff --git a/gatelogue-aggregator/src/gatelogue_aggregator/sources/rail/nflr.py b/gatelogue-aggregator/src/gatelogue_aggregator/sources/rail/nflr.py index db8a6231..0280849b 100644 --- a/gatelogue-aggregator/src/gatelogue_aggregator/sources/rail/nflr.py +++ b/gatelogue-aggregator/src/gatelogue_aggregator/sources/rail/nflr.py @@ -5,7 +5,6 @@ from gatelogue_aggregator.downloader import DEFAULT_CACHE_DIR, DEFAULT_TIMEOUT, get_url from gatelogue_aggregator.logging import RESULT -from gatelogue_aggregator.sources.wiki_base import get_wiki_html from gatelogue_aggregator.types.base import Source from gatelogue_aggregator.types.node.rail import RailContext, RailLineBuilder, RailSource diff --git a/gatelogue-aggregator/src/gatelogue_aggregator/sources/rail/nflr_warp.py b/gatelogue-aggregator/src/gatelogue_aggregator/sources/rail/nflr_warp.py index 8e837e32..ccb9b43f 100644 --- a/gatelogue-aggregator/src/gatelogue_aggregator/sources/rail/nflr_warp.py +++ b/gatelogue-aggregator/src/gatelogue_aggregator/sources/rail/nflr_warp.py @@ -23,6 +23,8 @@ def __init__(self, cache_dir: Path = DEFAULT_CACHE_DIR, timeout: int = DEFAULT_T code = warp["name"].split("-")[1].lower() if code in ("nsg", "rvb"): continue + if code == "dne" and warp["name"].split("-")[2].lower() == "r5a": + code = "dnw" code = { "n104": {"n104", "n203", "n300"}, "n203": {"n104", "n203", "n300"}, diff --git a/gatelogue-aggregator/src/gatelogue_aggregator/types/node/town.py b/gatelogue-aggregator/src/gatelogue_aggregator/types/node/town.py index 71c0c2bc..79662346 100644 --- a/gatelogue-aggregator/src/gatelogue_aggregator/types/node/town.py +++ b/gatelogue-aggregator/src/gatelogue_aggregator/types/node/town.py @@ -1,7 +1,8 @@ from __future__ import annotations import dataclasses -from typing import Any, Container, Literal, Self, override +from collections.abc import Container +from typing import Any, Literal, Self, override import msgspec