python-openpublictransport 0.1.7__tar.gz → 0.1.8__tar.gz

{python_openpublictransport-0.1.7 → python_openpublictransport-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-openpublictransport
-Version: 0.1.7
+Version: 0.1.8
 Summary: Python library for public transport APIs (EFA, OTP2, TRIAS, FPTF, HAFAS, GTFS-RT)
 License: MIT
 Requires-Python: >=3.11

{python_openpublictransport-0.1.7 → python_openpublictransport-0.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-openpublictransport"
-version = "0.1.7"
+version = "0.1.8"
 description = "Python library for public transport APIs (EFA, OTP2, TRIAS, FPTF, HAFAS, GTFS-RT)"
 readme = "README.md"
 license = { text = "MIT" }

{python_openpublictransport-0.1.7 → python_openpublictransport-0.1.8}/src/openpublictransport/providers/national_rail.py

@@ -274,10 +274,22 @@ class NationalRailProvider(BaseProvider):
         )
 
     async def search_stops(self, search_term: str) -> List[Dict[str, Any]]:
-        """Find UK railway stations with CRS codes via Overpass API (OSM)."""
-        escaped = re.sub(r"[.*+?^${}()|[\]\\]", r"\\\g<0>", search_term)
-
-        query = f"""[out:json][timeout:15];
+        """Find UK railway stations with CRS codes via Overpass API (OSM).
+
+        A search term that looks like a 3-letter CRS code (e.g. "WIN", "RDG")
+        is matched directly against the ``ref:crs`` tag; anything else is
+        matched against the station name(s).
+        """
+        term = search_term.strip()
+
+        if re.fullmatch(r"[A-Za-z]{3}", term):
+            # Direct CRS code lookup (ref:crs is stored uppercase in OSM)
+            query = f"""[out:json][timeout:15];
+node["railway"="station"]["ref:crs"="{term.upper()}"]({_UK_BBOX});
+out 10;"""
+        else:
+            escaped = re.sub(r"[.*+?^${}()|[\]\\]", r"\\\g<0>", term)
+            query = f"""[out:json][timeout:15];
 (
   node["railway"="station"]["ref:crs"]["name"~"{escaped}",i]({_UK_BBOX});
   node["railway"="station"]["ref:crs"]["official_name"~"{escaped}",i]({_UK_BBOX});

{python_openpublictransport-0.1.7 → python_openpublictransport-0.1.8}/src/python_openpublictransport.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-openpublictransport
-Version: 0.1.7
+Version: 0.1.8
 Summary: Python library for public transport APIs (EFA, OTP2, TRIAS, FPTF, HAFAS, GTFS-RT)
 License: MIT
 Requires-Python: >=3.11

{python_openpublictransport-0.1.7 → python_openpublictransport-0.1.8}/src/python_openpublictransport.egg-info/SOURCES.txt

@@ -45,4 +45,5 @@ src/python_openpublictransport.egg-info/PKG-INFO
 src/python_openpublictransport.egg-info/SOURCES.txt
 src/python_openpublictransport.egg-info/dependency_links.txt
 src/python_openpublictransport.egg-info/requires.txt
-src/python_openpublictransport.egg-info/top_level.txt
+src/python_openpublictransport.egg-info/top_level.txt
+tests/test_national_rail.py

python_openpublictransport-0.1.8/tests/test_national_rail.py

@@ -0,0 +1,91 @@
+"""Tests for the National Rail (UK) provider stop search.
+
+Focus: a 3-letter CRS code (e.g. "WIN") must be looked up directly against the
+OSM ``ref:crs`` tag, while a longer term is matched against station names.
+Regression test for https://github.com/NerdySoftPaw/openpublictransport/issues/39
+"""
+
+import pytest
+
+from openpublictransport.providers.national_rail import NationalRailProvider
+
+
+class _FakeResponse:
+    def __init__(self, payload):
+        self._payload = payload
+        self.status = 200
+
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, *exc):
+        return False
+
+    async def json(self, content_type=None):
+        return self._payload
+
+
+class _FakeSession:
+    """Records the Overpass query and returns a canned payload."""
+
+    def __init__(self, payload):
+        self._payload = payload
+        self.last_query = None
+
+    def post(self, url, data=None, headers=None, timeout=None):
+        # The Overpass query is sent as form data under the "data" key.
+        self.last_query = (data or {}).get("data", "")
+        return _FakeResponse(self._payload)
+
+
+_PAYLOAD = {
+    "elements": [
+        {
+            "type": "node",
+            "tags": {
+                "railway": "station",
+                "ref:crs": "WIN",
+                "name": "Winchester",
+                "operator": "South Western Railway",
+            },
+        }
+    ]
+}
+
+
+async def _search(term):
+    session = _FakeSession(_PAYLOAD)
+    provider = NationalRailProvider(session)
+    results = await provider.search_stops(term)
+    return results, session.last_query
+
+
+async def test_crs_code_search_queries_ref_crs():
+    """A 3-letter code searches ref:crs directly, not the name."""
+    results, query = await _search("WIN")
+
+    assert '["ref:crs"="WIN"]' in query
+    assert '"name"~' not in query
+
+    assert results == [
+        {
+            "id": "WIN",
+            "name": "Winchester",
+            "place": "South Western Railway",
+            "area_type": "stop",
+        }
+    ]
+
+
+async def test_lowercase_code_is_uppercased():
+    """CRS codes are case-insensitive and normalised to uppercase."""
+    _, query = await _search("win")
+    assert '["ref:crs"="WIN"]' in query
+
+
+async def test_name_search_queries_name_tags():
+    """A longer term matches the name tags, not an exact CRS code."""
+    _, query = await _search("Winchester")
+
+    assert '"name"~"Winchester"' in query
+    assert '["ref:crs"="' not in query