r5py 1.0.2__tar.gz → 1.0.3.dev0__tar.gz

{r5py-1.0.2/src/r5py.egg-info → r5py-1.0.3.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: r5py
-Version: 1.0.2
+Version: 1.0.3.dev0
 Summary: Python wrapper for the R5 routing analysis engine
 Author: Christoph Fink, Willem Klumpenhouwer, Marcus Sairava, Rafael Pereira, Henrikki Tenkanen
 License: GPL-3.0-or-later or MIT
@@ -58,6 +58,7 @@ Requires-Dist: pytest-lazy-fixtures; extra == "tests"
 Requires-Dist: r5py.sampledata.helsinki>=0.1.1; extra == "tests"
 Requires-Dist: r5py.sampledata.sao_paulo>=0.1.1; extra == "tests"
 Requires-Dist: typing-extensions; extra == "tests"
+Dynamic: license-file
 
 <img class="r5py_logo" align="right" src="https://github.com/r5py/r5py/raw/main/docs/_static/images/r5py_blue.svg" alt="r5py logo" style="width:180px; max-width:30vW;">
 

{r5py-1.0.2 → r5py-1.0.3.dev0}/src/r5py/__init__.py

@@ -2,7 +2,7 @@
 
 """Python wrapper for the R5 routing analysis engine."""
 
-__version__ = "1.0.2"
+__version__ = "1.0.3.dev0"
 
 
 from .r5 import (

{r5py-1.0.2 → r5py-1.0.3.dev0}/src/r5py/r5/regional_task.py

@@ -194,8 +194,10 @@ class RegionalTask:
         ):
             # fmt: on
             warnings.warn(
-                f"Departure time {departure} is outside of the time range "
-                "covered by currently loaded GTFS data sets.",
+                (
+                    "The currently loaded GTFS data sets do not define "
+                    f"any services on {departure.date()}."
+                ),
                 RuntimeWarning,
             )
 

{r5py-1.0.2 → r5py-1.0.3.dev0}/src/r5py/r5/transit_layer.py

@@ -4,13 +4,12 @@
 """Wraps a com.conveyal.r5.transit.TransitLayer."""
 
 
-import datetime
 import functools
 
 import jpype
 import jpype.types
 
-from ..util import parse_int_date
+import java.time
 
 
 __all__ = ["TransitLayer"]
@@ -32,44 +31,24 @@ class TransitLayer:
         instance._transit_layer = transit_layer
         return instance
 
-    @functools.cached_property
-    def start_date(self):
-        """The earliest date the loaded GTFS data covers."""
-        try:
-            start_date = min(
-                [
-                    parse_int_date(service.calendar.start_date)
-                    for service in self._transit_layer.services
-                ]
-            )
-        except (AttributeError, ValueError) as exception:
-            raise ValueError("No GTFS data set loaded") from exception
-        return start_date
+    def covers(self, date):
+        """
+        Check whether `date` is covered by GTFS data sets.
 
-    @functools.cached_property
-    def end_date(self):
-        """The latest date the loaded GTFS data covers."""
-        try:
-            end_date = max(
-                [
-                    parse_int_date(service.calendar.end_date)
-                    for service in self._transit_layer.services
-                ]
-            )
-            end_date += datetime.timedelta(
-                hours=23, minutes=59, seconds=59
-            )  # *end* of day
-        except (AttributeError, ValueError) as exception:
-            raise ValueError("No GTFS data set loaded") from exception
-        return end_date
-
-    def covers(self, point_in_time):
-        """Check whether `point_in_time` is covered by GTFS data sets."""
-        try:
-            covers = self.start_date <= point_in_time <= self.end_date
-        except ValueError:  # no GTFS data loaded
-            covers = False
-        return covers
+        Arguments:
+        ----------
+        date : datetime.date
+            date for which to check whether a GTFS service exists.
+
+        Returns:
+        --------
+        bool
+            Whether or not any services exist on `date`.
+        """
+        date = java.time.LocalDate.of(date.year, date.month, date.day)
+        return True in set(
+            [service.activeOn(date) for service in self._transit_layer.services]
+        )
 
     def get_street_vertex_for_stop(self, stop):
         """

{r5py-1.0.2 → r5py-1.0.3.dev0}/src/r5py/r5/transport_network.py

@@ -16,6 +16,7 @@ from .street_layer import StreetLayer
 from .transit_layer import TransitLayer
 from .transport_mode import TransportMode
 from ..util import Config, contains_gtfs_data, FileDigest, start_jvm, WorkingCopy
+from ..util.exceptions import GtfsFileError
 
 import com.conveyal.gtfs
 import com.conveyal.osmlib
@@ -35,7 +36,7 @@ start_jvm()
 class TransportNetwork:
     """Wrap a com.conveyal.r5.transit.TransportNetwork."""
 
-    def __init__(self, osm_pbf, gtfs=[]):
+    def __init__(self, osm_pbf, gtfs=[], allow_errors=False):
         """
         Load a transport network.
 
@@ -45,6 +46,9 @@ class TransportNetwork:
             file path of an OpenStreetMap extract in PBF format
         gtfs : str | pathlib.Path | list[str] | list[pathlib.Path]
             path(s) to public transport schedule information in GTFS format
+        allow_errors : bool
+            try to proceed with loading the transport network even if input data
+            contain errors
         """
         osm_pbf = WorkingCopy(osm_pbf)
         if isinstance(gtfs, (str, pathlib.Path)):
@@ -79,9 +83,31 @@ class TransportNetwork:
             transport_network.transitLayer = com.conveyal.r5.transit.TransitLayer()
             transport_network.transitLayer.parentNetwork = transport_network
             for gtfs_file in gtfs:
-                gtfs_feed = com.conveyal.gtfs.GTFSFeed.readOnlyTempFileFromGtfs(
+                gtfs_feed = com.conveyal.gtfs.GTFSFeed.writableTempFileFromGtfs(
                     f"{gtfs_file}"
                 )
+                if gtfs_feed.errors.size() > 0:
+                    errors = [
+                        f"{error.errorType}: {error.getMessageWithContext()}"
+                        for error in gtfs_feed.errors
+                    ]
+                    if allow_errors:
+                        warnings.warn(
+                            (
+                                "R5 reported the following issues with "
+                                f"GTFS file {gtfs_file.name}: \n"
+                                + ("\n- ".join(errors))
+                            ),
+                            RuntimeWarning,
+                        )
+                    else:
+                        raise GtfsFileError(
+                            (
+                                f"Could not load GTFS file {gtfs_file.name}. \n"
+                                + ("\n- ".join(errors))
+                            )
+                        )
+
                 transport_network.transitLayer.loadFromGtfs(gtfs_feed)
                 gtfs_feed.close()
 

{r5py-1.0.2 → r5py-1.0.3.dev0}/src/r5py/util/exceptions.py

@@ -12,6 +12,10 @@ class R5pyError(Exception):
 
 
 # more specific exceptions
+class GtfsFileError(R5pyError):
+    """GTFS file contained errors."""
+
+
 class ChecksumFailed(requests.RequestException, R5pyError):
     """Requested resource did not pass checksum test."""
 

{r5py-1.0.2 → r5py-1.0.3.dev0/src/r5py.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: r5py
-Version: 1.0.2
+Version: 1.0.3.dev0
 Summary: Python wrapper for the R5 routing analysis engine
 Author: Christoph Fink, Willem Klumpenhouwer, Marcus Sairava, Rafael Pereira, Henrikki Tenkanen
 License: GPL-3.0-or-later or MIT
@@ -58,6 +58,7 @@ Requires-Dist: pytest-lazy-fixtures; extra == "tests"
 Requires-Dist: r5py.sampledata.helsinki>=0.1.1; extra == "tests"
 Requires-Dist: r5py.sampledata.sao_paulo>=0.1.1; extra == "tests"
 Requires-Dist: typing-extensions; extra == "tests"
+Dynamic: license-file
 
 <img class="r5py_logo" align="right" src="https://github.com/r5py/r5py/raw/main/docs/_static/images/r5py_blue.svg" alt="r5py logo" style="width:180px; max-width:30vW;">
 

{r5py-1.0.2 → r5py-1.0.3.dev0}/src/r5py.egg-info/SOURCES.txt

@@ -90,6 +90,7 @@ tests/conftest_d/routing_results.py
 tests/conftest_d/sample_data.py
 tests/conftest_d/transport_network.py
 tests/conftest_d/upstream_r5.py
+tests/data/test_broken_gtfs.zip
 tests/data/test_detailed_itineraries_bicycle.gpkg.zip
 tests/data/test_detailed_itineraries_car.gpkg.zip
 tests/data/test_detailed_itineraries_transit.gpkg.zip

{r5py-1.0.2 → r5py-1.0.3.dev0}/tests/conftest_d/__init__.py

@@ -73,10 +73,12 @@ from .sample_data import (
 )
 
 from .transport_network import (
+    broken_gtfs_file_path,
     gtfs_file_path,
     gtfs_timezone_helsinki,
+    helsinki_osm_pbf_file_path,
     not_a_gtfs_file,
-    osm_pbf_file_path,
+    sao_paulo_osm_pbf_file_path,
     transport_network,
     transport_network_files_tuple,
     transport_network_from_test_directory,
@@ -89,46 +91,48 @@ from .upstream_r5 import (
 )
 
 __all__ = [
+    "broken_gtfs_file_path",
     "can_compute_detailed_route_geometries",
     "departure_datetime",
     "detailed_itineraries_bicycle",
     "detailed_itineraries_car",
     "detailed_itineraries_transit",
     "detailed_itineraries_walk",
-    "file_digest_test_file_as_pathlib_path",
-    "file_digest_test_file_as_str",
-    "file_digest_sha256",
     "file_digest_blake2b",
     "file_digest_blake2s",
-    "java_garbage_collection",
+    "file_digest_sha256",
+    "file_digest_test_file_as_pathlib_path",
+    "file_digest_test_file_as_str",
     "gtfs_file_path",
     "gtfs_timezone_helsinki",
-    "isochrones_from_multiple_origins",
+    "helsinki_osm_pbf_file_path",
     "isochrones_bicycle",
     "isochrones_car",
+    "isochrones_from_multiple_origins",
     "isochrones_transit",
     "isochrones_walk",
+    "java_garbage_collection",
     "multiple_origins",
     "not_a_gtfs_file",
     "origin_point",
     "origins_invalid_duplicate_ids",
     "origins_invalid_no_id",
     "origins_valid_ids",
-    "osm_pbf_file_path",
     "population_grid",
     "population_grid_points",
     "population_grid_points_first_three",
     "population_grid_points_four",
     "population_grid_points_second_three",
-    "regional_task",
     "r5_jar_cached",
     "r5_jar_cached_invalid",
     "r5_jar_sha256",
     "r5_jar_sha256_github_error_message_when_posting",
     "r5_jar_sha256_invalid",
     "r5_jar_url",
+    "regional_task",
     "sample_data_set_sha256",
     "sample_data_set_url",
+    "sao_paulo_osm_pbf_file_path",
     "snapped_population_grid_points",
     "transport_network",
     "transport_network_files_tuple",

{r5py-1.0.2 → r5py-1.0.3.dev0}/tests/conftest_d/file_digest.py

@@ -9,12 +9,12 @@ import pytest
 from .routing_results import ISOCHRONES_WALK
 
 
-ISOCHRONES_WALK_BLAKE2B = "5e91181cfdff18a3ebcf289eba1955b61b27260fa40d1cd669bb2f754c31b23b59ecd74ee9d3a31f2d51c9de32aff0781ff5c948eb4ea220b622525d94e6a625"
+ISOCHRONES_WALK_BLAKE2B = "163f6b2bc985e7eb347020320392a151ba1c156a09e82f87c0149273de2714516a098984e581bf99742c075232e18d69f5171370589cb5ec64d70f42f539f76c"
 ISOCHRONES_WALK_BLAKE2S = (
-    "da098b9fcf440e7252b2b213160dd810392c03ee07c58ababfddf7d4c5d8d502"
+    "9f0af2c9946982b2e7d17a0b2205b596cbef01b1037874f5ad72348407ad381e"
 )
 ISOCHRONES_WALK_SHA256 = (
-    "2a444c35ef676928d2a70914c64e34c569b10a6473ee6d61c74d9740351d80cc"
+    "b632d148ca5d9875482197461809f25fe790d71827e821983cefe2394841b417"
 )
 
 

{r5py-1.0.2 → r5py-1.0.3.dev0}/tests/conftest_d/transport_network.py

@@ -6,6 +6,11 @@
 
 import pytest
 
+from .data_directory import DATA_DIRECTORY
+
+
+BROKEN_GTFS_FILE = DATA_DIRECTORY / "test_broken_gtfs.zip"
+
 
 @pytest.fixture
 def not_a_gtfs_file():
@@ -15,6 +20,12 @@ def not_a_gtfs_file():
     yield r5py.sampledata.helsinki.osm_pbf
 
 
+@pytest.fixture
+def broken_gtfs_file_path():
+    """Return a file path of a broken GTFS file."""
+    yield BROKEN_GTFS_FILE
+
+
 @pytest.fixture
 def gtfs_file_path():
     """Return the file path of a GTFS sample data set."""
@@ -30,13 +41,21 @@ def gtfs_timezone_helsinki():
 
 
 @pytest.fixture
-def osm_pbf_file_path():
-    """Return the path of the OSM sample data set."""
+def helsinki_osm_pbf_file_path():
+    """Return the path of the OSM sample data set covering Helsinki."""
     import r5py.sampledata.helsinki
 
     yield r5py.sampledata.helsinki.osm_pbf
 
 
+@pytest.fixture
+def sao_paulo_osm_pbf_file_path():
+    """Return the path of the OSM sample data set covering São Paulo."""
+    import r5py.sampledata.sao_paulo
+
+    yield r5py.sampledata.sao_paulo.osm_pbf
+
+
 @pytest.fixture
 def transport_network_files_tuple():
     """Return a tuple of transport network input test data file paths."""

{r5py-1.0.2 → r5py-1.0.3.dev0}/tests/test_detailed_itineraries.py

@@ -284,8 +284,8 @@ class TestDetailedItineraries:
             pytest.warns(
                 RuntimeWarning,
                 match=(
-                    "Departure time .* is outside of the time range covered by "
-                    "currently loaded GTFS data sets."
+                    "The currently loaded GTFS data sets do not define "
+                    "any services on .*"
                 ),
             ),
             self._expectations,
@@ -309,8 +309,8 @@ class TestDetailedItineraries:
             pytest.warns(
                 RuntimeWarning,
                 match=(
-                    "Departure time .* is outside of the time range covered by "
-                    "currently loaded GTFS data sets."
+                    "The currently loaded GTFS data sets do not define "
+                    "any services on .*"
                 ),
             ),
             self._expectations,

{r5py-1.0.2 → r5py-1.0.3.dev0}/tests/test_isochrones.py

@@ -80,6 +80,8 @@ class TestIsochrones:
             lambda t: round(t.total_seconds() / 60)
         )
 
+        isochrones["geometry"] = isochrones["geometry"].set_precision(0.0001)
+
         geopandas.testing.assert_geodataframe_equal(
             isochrones,
             isochrones_from_multiple_origins,
@@ -131,6 +133,8 @@ class TestIsochrones:
             lambda t: round(t.total_seconds() / 60)
         )
 
+        isochrones["geometry"] = isochrones["geometry"].set_precision(0.0001)
+
         geopandas.testing.assert_geodataframe_equal(
             isochrones,
             expected_isochrones,

r5py-1.0.3.dev0/tests/test_transit_layer.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+
+
+class TestTransitLayer:
+    pass

{r5py-1.0.2 → r5py-1.0.3.dev0}/tests/test_transport_network.py

@@ -149,15 +149,44 @@ class Test_TransportNetwork:
     )
     def test_argument_types(
         self,
-        osm_pbf_file_path,
+        helsinki_osm_pbf_file_path,
         gtfs_file_path,
         osm_pbf_type,
         gtfs_type,
         gtfs_is_list,
     ):
-        osm_pbf = osm_pbf_type(osm_pbf_file_path)
+        osm_pbf = osm_pbf_type(helsinki_osm_pbf_file_path)
         gtfs = gtfs_type(gtfs_file_path)
         if gtfs_is_list:
             gtfs = [gtfs]
         transport_network = r5py.TransportNetwork(osm_pbf, gtfs)
         del transport_network
+
+    def test_broken_gtfs_file(
+        self,
+        helsinki_osm_pbf_file_path,
+        broken_gtfs_file_path,
+    ):
+        with pytest.raises(
+            r5py.util.exceptions.GtfsFileError,
+            match="Could not load GTFS file.*",
+        ):
+            _ = r5py.TransportNetwork(
+                helsinki_osm_pbf_file_path,
+                [broken_gtfs_file_path],
+            )
+
+    def test_broken_gtfs_file_allow_errors(
+        self,
+        sao_paulo_osm_pbf_file_path,
+        broken_gtfs_file_path,
+    ):
+        with pytest.warns(
+            RuntimeWarning,
+            match=".*issues with GTFS file.*",
+        ):
+            _ = r5py.TransportNetwork(
+                sao_paulo_osm_pbf_file_path,
+                [broken_gtfs_file_path],
+                allow_errors=True,
+            )

{r5py-1.0.2 → r5py-1.0.3.dev0}/tests/test_travel_time_matrix.py

@@ -291,7 +291,13 @@ class TestTravelTimeMatrix:
         origin_point,
         departure_datetime,
     ):
-        with pytest.warns(RuntimeWarning, match="Departure time"):
+        with pytest.warns(
+            RuntimeWarning,
+            match=(
+                "The currently loaded GTFS data sets do not define "
+                "any services on .*"
+            ),
+        ):
             _ = r5py.TravelTimeMatrix(
                 transport_network,
                 origins=origin_point,
@@ -307,7 +313,13 @@ class TestTravelTimeMatrix:
         origin_point,
         departure_datetime,
     ):
-        with pytest.warns(RuntimeWarning, match="Departure"):
+        with pytest.warns(
+            RuntimeWarning,
+            match=(
+                "The currently loaded GTFS data sets do not define "
+                "any services on .*"
+            ),
+        ):
             _ = r5py.TravelTimeMatrix(
                 transport_network_from_test_files_without_gtfs,
                 origins=origin_point,

r5py-1.0.2/tests/test_transit_layer.py

@@ -1,18 +0,0 @@
-#!/usr/bin/env python3
-
-
-import pytest
-
-from r5py.r5.transit_layer import TransitLayer
-
-
-class TestTransitLayer:
-    def test_uninitialised_transit_layer_start_date(self):
-        transit_layer = TransitLayer()
-        with pytest.raises((AttributeError, ValueError)):
-            assert transit_layer.start_date < transit_layer.end_date
-
-    def test_uninitialised_transit_layer_end_date(self):
-        transit_layer = TransitLayer()
-        with pytest.raises((AttributeError, ValueError)):
-            assert transit_layer.end_date > transit_layer.start_date