r5py 1.0.3__tar.gz → 1.0.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: r5py
-Version: 1.0.3
+Version: 1.0.4
 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
@@ -26,6 +26,7 @@ Requires-Dist: numpy
 Requires-Dist: pandas>=2.1.0
 Requires-Dist: psutil
 Requires-Dist: pyproj
+Requires-Dist: rasterio
 Requires-Dist: requests
 Requires-Dist: scikit-learn
 Requires-Dist: shapely>=2.0
@@ -55,7 +56,7 @@ Requires-Dist: pyarrow; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-lazy-fixtures; extra == "tests"
-Requires-Dist: r5py.sampledata.helsinki>=0.1.1; extra == "tests"
+Requires-Dist: r5py.sampledata.helsinki>=1.0.3; extra == "tests"
 Requires-Dist: r5py.sampledata.sao_paulo>=0.1.1; extra == "tests"
 Requires-Dist: typing-extensions; extra == "tests"
 Dynamic: license-file

{r5py-1.0.3 → r5py-1.0.4}/pyproject.toml

@@ -26,6 +26,7 @@ dependencies = [
     "pandas>=2.1.0",
     "psutil",
     "pyproj",
+    "rasterio",
     "requests",
     "scikit-learn",
     "shapely>=2.0",
@@ -52,7 +53,7 @@ docs = ["contextily", "folium", "GitPython", "h3>=4.0.0b2", "jupyterlab_myst",
         "shapely", "sphinx", "sphinx-book-theme", "sphinx-design",
         "sphinxcontrib-bibtex", "sphinxcontrib-images"]
 tests = ["pyarrow", "pytest", "pytest-cov", "pytest-lazy-fixtures",
-         "r5py.sampledata.helsinki>=0.1.1", "r5py.sampledata.sao_paulo>=0.1.1",
+         "r5py.sampledata.helsinki>=1.0.3", "r5py.sampledata.sao_paulo>=0.1.1",
          "typing-extensions"]
 
 

{r5py-1.0.3 → r5py-1.0.4}/src/r5py/__init__.py

@@ -2,12 +2,13 @@
 
 """Python wrapper for the R5 routing analysis engine."""
 
-__version__ = "1.0.3"
+__version__ = "1.0.4"
 
 
 from .r5 import (
     DetailedItineraries,
     DetailedItinerariesComputer,
+    ElevationCostFunction,
     Isochrones,
     RegionalTask,
     TransportMode,
@@ -19,6 +20,7 @@ from .r5 import (
 __all__ = [
     "DetailedItineraries",
     "DetailedItinerariesComputer",
+    "ElevationCostFunction",
     "Isochrones",
     "RegionalTask",
     "TransportMode",

{r5py-1.0.3 → r5py-1.0.4}/src/r5py/r5/__init__.py

@@ -6,6 +6,7 @@ from .access_leg import AccessLeg
 from .detailed_itineraries import DetailedItineraries, DetailedItinerariesComputer
 from .direct_leg import DirectLeg
 from .egress_leg import EgressLeg
+from .elevation_cost_function import ElevationCostFunction
 from .isochrones import Isochrones
 from .regional_task import RegionalTask
 from .scenario import Scenario
@@ -24,6 +25,7 @@ __all__ = [
     "DetailedItinerariesComputer",
     "DirectLeg",
     "EgressLeg",
+    "ElevationCostFunction",
     "Isochrones",
     "RegionalTask",
     "Scenario",

r5py-1.0.4/src/r5py/r5/elevation_cost_function.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+
+
+"""The elevation cost functions supported by R5 (Tobler, Minetti)."""
+
+
+import enum
+
+import jpype
+
+from ..util import start_jvm
+
+import com.conveyal.r5
+
+
+__all__ = ["ElevationCostFunction"]
+
+
+start_jvm()
+
+
+class ElevationCostFunction(enum.Enum):
+    """
+    Elevation cost functions.
+
+    TOBLER: Waldo Tobler’s hiking function, cf. https://en.wikipedia.org/wiki/Tobler%27s_hiking_function
+    MINETTI: Minetti et al.’s perceived effort/energy consumption, cf.
+    https://doi.org/10.1152/japplphysiol.01177.2001
+    """
+
+    @classmethod
+    def _missing_(cls, value):
+        value = str(value).upper()
+        for member in cls:
+            if value == member.value:
+                return member
+        return None
+
+    TOBLER = "TOBLER"
+    MINETTI = "MINETTI"
+
+
+@jpype._jcustomizer.JConversion(
+    "com.conveyal.r5.analyst.scenario.RasterCost.CostFunction",
+    exact=ElevationCostFunction,
+)
+def _cast_LegMode(java_class, object_):
+    return com.conveyal.r5.analyst.scenario.RasterCost.CostFunction.valueOf(
+        object_.name
+    )

r5py-1.0.4/src/r5py/r5/elevation_model.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+
+
+"""Load a digital elevation model and apply it to an r5py.TransportNetwork."""
+
+
+import rasterio
+
+from .elevation_cost_function import ElevationCostFunction
+from .file_storage import FileStorage
+from ..util import WorkingCopy
+
+import com.conveyal.analysis
+import com.conveyal.r5
+
+
+__all__ = ["ElevationModel"]
+
+
+class ElevationModel:
+    """Load a digital elevation model and apply it to an r5py.TransportNetwork."""
+
+    def __init__(
+        self,
+        elevation_model,
+        elevation_cost_function=ElevationCostFunction.TOBLER,
+    ):
+        """
+        Load an elevation model.
+
+        Arguments
+        ---------
+        elevation_model : str | pathlib.Path
+            file path to a digital elevation model in TIF format,
+            single-band, the value of which is the elevation in metres
+        elevation_cost_function : r5py.ElevationCostFunction
+            which algorithm to use to compute the added effort and travel time
+            of slopes
+        """
+        elevation_model = WorkingCopy(elevation_model)
+        elevation_model = self._convert_tiff_to_format_readable_by_r5(elevation_model)
+
+        # instantiate an com.conveyal.file.FileStorage singleton
+        com.conveyal.analysis.components.WorkerComponents.fileStorage = FileStorage()
+
+        self._elevation_model = com.conveyal.r5.analyst.scenario.RasterCost()
+        self._elevation_model.dataSourceId = f"{elevation_model.with_suffix('')}"
+        self._elevation_model.costFunction = elevation_cost_function
+
+    def apply_to(self, transport_network):
+        """
+        Add the costs associated with elevation traversal to a transport network.
+
+        Arguments
+        ---------
+        transport_network : r5py.TransportNetwork
+            The transport network to which to add slope costs
+        """
+        self._elevation_model.resolve(transport_network)
+        self._elevation_model.apply(transport_network)
+
+    @staticmethod
+    def _convert_tiff_to_format_readable_by_r5(tiff):
+        # javax.imagio does not allow all compression/predictor
+        # combinations of TIFFs
+        # to work around it, convert the input to a format known to work.
+
+        input_tiff = tiff.with_stem(f".{tiff.stem}")
+        output_tiff = tiff.with_suffix(".tif")
+        tiff.rename(input_tiff)
+
+        with rasterio.open(input_tiff) as source:
+            metadata = source.profile
+            metadata.update(
+                {
+                    "compress": "LZW",
+                    "predictor": "2",
+                }
+            )
+            with rasterio.open(output_tiff, "w", **metadata) as destination:
+                destination.write(source.read())
+        input_tiff.unlink()
+
+        return output_tiff

r5py-1.0.4/src/r5py/r5/file_storage.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+
+
+"""A thin layer around com.conveyal.r5.file.FileStorage."""
+
+
+import jpype
+
+from ..util import start_jvm
+
+import com.conveyal.file
+import java.io.File
+
+
+__all__ = ["FileStorage"]
+
+
+start_jvm()
+
+
+@jpype.JImplements(com.conveyal.file.FileStorage)
+class FileStorage:
+    """A thin layer around com.conveyal.r5.file.FileStorage."""
+
+    @jpype.JOverride
+    def moveIntoStorage(self, *args):
+        """Not implemented."""
+        pass
+
+    @jpype.JOverride
+    def getFile(self, file_storage_key):
+        """
+        Return a java.io.File for the file identified by file_storage_key.
+
+        Arguments
+        ---------
+        file_storage_key : com.conveyal.r5.file.FileStorageKey
+            An R5 object referencing a certain file
+
+        Returns
+        -------
+        java.io.File
+            The file identified by file_storage_key
+        """
+        return java.io.File(file_storage_key.path)
+
+    @jpype.JOverride
+    def getURL(self, file_storage_key):
+        """
+        Return an URL for the file identified by file_storage_key.
+
+        Arguments
+        ---------
+        file_storage_key : com.conveyal.r5.file.FileStorageKey
+            An R5 object referencing a certain file
+
+        Returns
+        -------
+        str
+            An imaginary URL pointing to the file identified by file_storage_key
+        """
+        return f"file://{file_storage_key.path}"
+
+    @jpype.JOverride
+    def delete(self, *args):
+        """Not implemented."""
+        pass
+
+    @jpype.JOverride
+    def exists(self, file_storage_key):
+        """
+        Check whether the file identified by file_storage_key exists.
+
+        Arguments
+        ---------
+        file_storage_key : com.conveyal.r5.file.FileStorageKey
+            An R5 object referencing a certain file
+
+        Returns
+        -------
+        bool
+            Whether or not the file identified by file_storage_key exists
+        """
+        return self.getFile(file_storage_key).exists()

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

@@ -12,12 +12,15 @@ import warnings
 import jpype
 import jpype.types
 
+from .elevation_cost_function import ElevationCostFunction
+from .elevation_model import ElevationModel
 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.analysis
 import com.conveyal.gtfs
 import com.conveyal.osmlib
 import com.conveyal.r5
@@ -36,7 +39,14 @@ start_jvm()
 class TransportNetwork:
     """Wrap a com.conveyal.r5.transit.TransportNetwork."""
 
-    def __init__(self, osm_pbf, gtfs=[], allow_errors=False):
+    def __init__(
+        self,
+        osm_pbf,
+        gtfs=[],
+        elevation_model=None,
+        elevation_cost_function=ElevationCostFunction.TOBLER,
+        allow_errors=False,
+    ):
         """
         Load a transport network.
 
@@ -46,6 +56,12 @@ 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
+        elevation_model : str | pathlib.Path
+            file path to a digital elevation model in TIF format,
+            single-band, the value of which is the elevation in metres
+        elevation_cost_function : r5py.ElevationCostFunction
+            which algorithm to use to compute the added effort and travel time
+            of slopes
         allow_errors : bool
             try to proceed with loading the transport network even if input data
             contain errors
@@ -57,16 +73,18 @@ class TransportNetwork:
 
         # a hash representing all input files
         digest = hashlib.sha256(
-            "".join([FileDigest(osm_pbf)] + [FileDigest(path) for path in gtfs]).encode(
-                "utf-8"
-            )
+            "".join(
+                [FileDigest(osm_pbf)]
+                + [FileDigest(path) for path in gtfs]
+                + [FileDigest(elevation_model) if elevation_model is not None else ""]
+            ).encode("utf-8")
         ).hexdigest()
 
         try:
             transport_network = self._load_pickled_transport_network(
                 Config().CACHE_DIR / f"{digest}.transport_network"
             )
-        except FileNotFoundError:
+        except (FileNotFoundError, java.io.IOError, java.lang.RuntimeException):
             transport_network = com.conveyal.r5.transit.TransportNetwork()
             transport_network.scenarioId = PACKAGE
 
@@ -122,6 +140,12 @@ class TransportNetwork:
 
             transport_network.transitLayer.buildDistanceTables(None)
 
+            if elevation_model is not None:
+                ElevationModel(
+                    elevation_model,
+                    elevation_cost_function,
+                ).apply_to(transport_network)
+
             osm_file.close()  # not needed after here?
 
             self._save_pickled_transport_network(

{r5py-1.0.3 → r5py-1.0.4}/src/r5py/util/classpath.py

@@ -18,9 +18,9 @@ from .warnings import R5pyWarning
 
 # update these to use a newer R5 version if no R5 available locally
 R5_JAR_URL = (
-    "https://github.com/r5py/r5/releases/download/v7.3-r5py/r5-v7.3-r5py-all.jar"
+    "https://github.com/r5py/r5/releases/download/v7.4-r5py/r5-v7.4-r5py-all.jar"
 )
-R5_JAR_SHA256 = "cb1ccad370757ba229cf17f1bedc9549ff5d77fdbb44b7a3058104fe1f243f53"
+R5_JAR_SHA256 = "c51b566671165d113add84e10e60fb9273014ca4a2e2a52591446954f68e7340"
 # ---
 
 

{r5py-1.0.3 → r5py-1.0.4}/src/r5py/util/config.py

@@ -92,7 +92,13 @@ class Config:
                 FileNotFoundError,  # broken symlink
                 PermissionError,
             ):
-                cached_file.unlink()
+                try:
+                    cached_file.unlink()
+                except (
+                    IsADirectoryError,  # only available on Linux kernels
+                    PermissionError,  # what’s raised instead on Win and MacOs
+                ):
+                    pass
 
         return cache_dir
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: r5py
-Version: 1.0.3
+Version: 1.0.4
 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
@@ -26,6 +26,7 @@ Requires-Dist: numpy
 Requires-Dist: pandas>=2.1.0
 Requires-Dist: psutil
 Requires-Dist: pyproj
+Requires-Dist: rasterio
 Requires-Dist: requests
 Requires-Dist: scikit-learn
 Requires-Dist: shapely>=2.0
@@ -55,7 +56,7 @@ Requires-Dist: pyarrow; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-lazy-fixtures; extra == "tests"
-Requires-Dist: r5py.sampledata.helsinki>=0.1.1; extra == "tests"
+Requires-Dist: r5py.sampledata.helsinki>=1.0.3; extra == "tests"
 Requires-Dist: r5py.sampledata.sao_paulo>=0.1.1; extra == "tests"
 Requires-Dist: typing-extensions; extra == "tests"
 Dynamic: license-file

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

@@ -15,6 +15,9 @@ src/r5py/r5/base_travel_time_matrix.py
 src/r5py/r5/detailed_itineraries.py
 src/r5py/r5/direct_leg.py
 src/r5py/r5/egress_leg.py
+src/r5py/r5/elevation_cost_function.py
+src/r5py/r5/elevation_model.py
+src/r5py/r5/file_storage.py
 src/r5py/r5/isochrones.py
 src/r5py/r5/regional_task.py
 src/r5py/r5/scenario.py
@@ -58,7 +61,9 @@ tests/test_contains_gtfs_data.py
 tests/test_data_validation.py
 tests/test_detailed_itineraries.py
 tests/test_deterministic_behaviour.py
+tests/test_elevation_cost_function.py
 tests/test_file_digest.py
+tests/test_file_storage.py
 tests/test_good_enough_equidistant_crs.py
 tests/test_isochrones.py
 tests/test_java_casting.py

{r5py-1.0.3 → r5py-1.0.4}/src/r5py.egg-info/requires.txt

@@ -8,6 +8,7 @@ numpy
 pandas>=2.1.0
 psutil
 pyproj
+rasterio
 requests
 scikit-learn
 shapely>=2.0
@@ -41,6 +42,6 @@ pyarrow
 pytest
 pytest-cov
 pytest-lazy-fixtures
-r5py.sampledata.helsinki>=0.1.1
+r5py.sampledata.helsinki>=1.0.3
 r5py.sampledata.sao_paulo>=0.1.1
 typing-extensions

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

@@ -3,6 +3,18 @@
 
 """Fixtures to be used in r5py tests."""
 
+# geopandas 1.0.1 imports shapely.geos which raises
+# a Deprecation warning in Shapely 2.1.0
+import warnings
+
+with warnings.catch_warnings():
+    warnings.filterwarnings(
+        "ignore",
+        category=DeprecationWarning,
+        message=".*shapely.geos.*deprecated.*",
+    )
+    import geopandas  # noqa: F401
+
 
 from .destinations import (
     population_grid,
@@ -74,12 +86,15 @@ from .sample_data import (
 
 from .transport_network import (
     broken_gtfs_file_path,
+    cache_directory,
+    elevation_model_file_path,
     gtfs_file_path,
     gtfs_timezone_helsinki,
     helsinki_osm_pbf_file_path,
     not_a_gtfs_file,
     sao_paulo_osm_pbf_file_path,
     transport_network,
+    transport_network_checksum,
     transport_network_files_tuple,
     transport_network_from_test_directory,
     transport_network_from_test_files,
@@ -92,12 +107,14 @@ from .upstream_r5 import (
 
 __all__ = [
     "broken_gtfs_file_path",
+    "cache_directory",
     "can_compute_detailed_route_geometries",
     "departure_datetime",
     "detailed_itineraries_bicycle",
     "detailed_itineraries_car",
     "detailed_itineraries_transit",
     "detailed_itineraries_walk",
+    "elevation_model_file_path",
     "file_digest_blake2b",
     "file_digest_blake2s",
     "file_digest_sha256",
@@ -135,6 +152,7 @@ __all__ = [
     "sao_paulo_osm_pbf_file_path",
     "snapped_population_grid_points",
     "transport_network",
+    "transport_network_checksum",
     "transport_network_files_tuple",
     "transport_network_from_test_directory",
     "transport_network_from_test_files",

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

@@ -9,12 +9,12 @@ import pytest
 from .routing_results import ISOCHRONES_WALK
 
 
-ISOCHRONES_WALK_BLAKE2B = "163f6b2bc985e7eb347020320392a151ba1c156a09e82f87c0149273de2714516a098984e581bf99742c075232e18d69f5171370589cb5ec64d70f42f539f76c"
+ISOCHRONES_WALK_BLAKE2B = "e5c0fe9d34b512363c876eec81439b2708a1171272dd721a40aefe502c6e0dc73811aab0f109a45ab83645b88dea38051112ede7fc4b99a1231d92e3b4492e11"
 ISOCHRONES_WALK_BLAKE2S = (
-    "9f0af2c9946982b2e7d17a0b2205b596cbef01b1037874f5ad72348407ad381e"
+    "3d46b490841df409cbb962e25d4201bda0eea5b825fc1181cb0babfddf457299"
 )
 ISOCHRONES_WALK_SHA256 = (
-    "b632d148ca5d9875482197461809f25fe790d71827e821983cefe2394841b417"
+    "1d899da67faed2f49a0dd870b1dc33b4c7bd695b18eafc08640a662b442e935c"
 )
 
 

{r5py-1.0.3 → r5py-1.0.4}/tests/conftest_d/r5_jar.py

@@ -10,9 +10,9 @@ import pytest
 
 
 R5_JAR_URL = (
-    "https://github.com/r5py/r5/releases/download/v7.3-r5py/r5-v7.3-r5py-all.jar"
+    "https://github.com/r5py/r5/releases/download/v7.4-r5py/r5-v7.4-r5py-all.jar"
 )
-R5_JAR_SHA256 = "cb1ccad370757ba229cf17f1bedc9549ff5d77fdbb44b7a3058104fe1f243f53"
+R5_JAR_SHA256 = "c51b566671165d113add84e10e60fb9273014ca4a2e2a52591446954f68e7340"
 R5_JAR_SHA256_INVALID = "adfadsfadsfadsfasdfasdf"
 R5_JAR_SHA256_GITHUB_ERROR_MESSAGE_WHEN_POSTING = (
     "14aa2347be79c280e4d0fd3a137fb8f5bf2863261a1e48e1a122df1a52a0f453"

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

@@ -26,6 +26,14 @@ def broken_gtfs_file_path():
     yield BROKEN_GTFS_FILE
 
 
+@pytest.fixture
+def elevation_model_file_path():
+    """Return the file path of a GTFS sample data set."""
+    import r5py.sampledata.helsinki
+
+    yield r5py.sampledata.helsinki.elevation_model
+
+
 @pytest.fixture
 def gtfs_file_path():
     """Return the file path of a GTFS sample data set."""
@@ -64,6 +72,20 @@ def transport_network_files_tuple():
     yield r5py.sampledata.helsinki.osm_pbf, [r5py.sampledata.helsinki.gtfs]
 
 
+@pytest.fixture
+def transport_network_checksum():
+    """Return the checksum of the default transport network (from files tuple)."""
+    yield "43bb097531f722016b26293d9e1cd11878d91e07e89846e1f5ba85c43a4b243c"
+
+
+@pytest.fixture
+def cache_directory():
+    """Return a pathlib.Path pointing to r5py’s cache directory."""
+    from r5py.util.config import Config
+
+    yield Config().CACHE_DIR
+
+
 @pytest.fixture
 def transport_network(transport_network_from_test_files):
     """Return an `r5py.TransportNetwork`."""

{r5py-1.0.3 → r5py-1.0.4}/tests/test_config.py

@@ -46,3 +46,23 @@ class TestConfig:
         _ = config.CACHE_DIR  # re-evaluate cache dir contents
 
         assert not expired_file.exists()
+
+    def test_cache_clearing_skip_directory(self):
+        config = r5py.util.config.Config()
+
+        past_best_by_date = (
+            datetime.datetime.now() - CACHE_MAX_AGE - datetime.timedelta(seconds=1)
+        ).timestamp()
+
+        expired_directory = pathlib.Path(config.CACHE_DIR / "expired-dir")
+        expired_directory.mkdir()
+        os.utime(expired_directory, (past_best_by_date, past_best_by_date))
+
+        config.__dict__.pop("CACHE_DIR", None)  # clear functools.cached_property
+        _ = config.CACHE_DIR  # re-evaluate cache dir contents
+
+        assert expired_directory.exists()
+        try:
+            expired_directory.rmdir()
+        except PermissionError:
+            pass  # Windows ...

r5py-1.0.4/tests/test_elevation_cost_function.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+
+
+import pytest
+
+import r5py
+
+
+class TestElevationCostFunction:
+    def test_some_weird_combinations(self):
+        # not as a parametrized test as pytest has troubles with
+        # functions as parametrized fixtures (tries to evaluate?)
+        assert r5py.ElevationCostFunction("tobler") == r5py.ElevationCostFunction.TOBLER
+        assert r5py.ElevationCostFunction("Tobler") == r5py.ElevationCostFunction.TOBLER
+        assert r5py.ElevationCostFunction("tObLeR") == r5py.ElevationCostFunction.TOBLER
+        assert r5py.ElevationCostFunction("TOBLER") == r5py.ElevationCostFunction.TOBLER
+        assert (
+            r5py.ElevationCostFunction("minetti") == r5py.ElevationCostFunction.MINETTI
+        )
+        assert (
+            r5py.ElevationCostFunction("Minetti") == r5py.ElevationCostFunction.MINETTI
+        )
+        assert (
+            r5py.ElevationCostFunction("mInEtTi") == r5py.ElevationCostFunction.MINETTI
+        )
+        assert (
+            r5py.ElevationCostFunction("MINETTI") == r5py.ElevationCostFunction.MINETTI
+        )
+
+        with pytest.raises(ValueError):
+            _ = r5py.ElevationCostFunction("FooBarInvalidCostFunction")

r5py-1.0.4/tests/test_file_storage.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+
+
+import pathlib
+
+import r5py
+
+import com.conveyal.file
+import java.io
+
+
+class TestFileStorage:
+    def test_void_methods(self):
+        file_storage = r5py.r5.file_storage.FileStorage()
+        assert file_storage.moveIntoStorage() is None
+        assert file_storage.delete() is None
+
+    def test_get_file(self):
+        file_storage = r5py.r5.file_storage.FileStorage()
+        fake_file_path = pathlib.Path("/home/foo/bar.txt")
+        gotten_file = file_storage.getFile(
+            com.conveyal.file.FileStorageKey(
+                com.conveyal.file.FileCategory.DATASOURCES,
+                f"{fake_file_path.with_suffix('')}",
+            )
+        )
+        assert isinstance(gotten_file, java.io.File)
+        assert str(gotten_file) == f"{fake_file_path.with_suffix('')}"
+
+    def test_get_url(self):
+        file_storage = r5py.r5.file_storage.FileStorage()
+        fake_file_path = pathlib.Path("/home/foo/bar.txt")
+        gotten_url = file_storage.getURL(
+            com.conveyal.file.FileStorageKey(
+                com.conveyal.file.FileCategory.DATASOURCES,
+                f"{fake_file_path.with_suffix('')}",
+            )
+        )
+        assert isinstance(gotten_url, str)
+        assert gotten_url == f"file://{fake_file_path.with_suffix('')}"
+
+    def test_exists(self):
+        file_storage = r5py.r5.file_storage.FileStorage()
+        fake_file_path = pathlib.Path("/home/foo/bar.txt")
+        exists = file_storage.exists(
+            com.conveyal.file.FileStorageKey(
+                com.conveyal.file.FileCategory.DATASOURCES,
+                f"{fake_file_path.with_suffix('')}",
+            )
+        )
+        assert not exists

{r5py-1.0.3 → r5py-1.0.4}/tests/test_java_casting.py

@@ -28,6 +28,14 @@ class TestJavaCasting:
             (r5py.TransportMode.WALK, com.conveyal.r5.api.util.LegMode),
             (r5py.TransportMode.BICYCLE_RENT, com.conveyal.r5.api.util.LegMode),
             (r5py.TransportMode.CAR_PARK, com.conveyal.r5.api.util.LegMode),
+            (
+                r5py.ElevationCostFunction.TOBLER,
+                com.conveyal.r5.analyst.scenario.RasterCost.CostFunction,
+            ),
+            (
+                r5py.ElevationCostFunction.MINETTI,
+                com.conveyal.r5.analyst.scenario.RasterCost.CostFunction,
+            ),
         ],
     )
     def test_transport_modes_cast(self, python_object, java_class):

{r5py-1.0.3 → r5py-1.0.4}/tests/test_transport_network.py

@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
 
 import pathlib
+import random
 import shutil
+import string
 
 import geopandas
 import pytest
@@ -190,3 +192,55 @@ class Test_TransportNetwork:
                 [broken_gtfs_file_path],
                 allow_errors=True,
             )
+
+    def test_transport_network_with_elevation_model_tobler(
+        self,
+        helsinki_osm_pbf_file_path,
+        gtfs_file_path,
+        elevation_model_file_path,
+    ):
+        _ = r5py.TransportNetwork(
+            osm_pbf=helsinki_osm_pbf_file_path,
+            gtfs=[gtfs_file_path],
+            elevation_model=elevation_model_file_path,
+            elevation_cost_function=r5py.ElevationCostFunction.TOBLER,
+        )
+
+    def test_transport_network_with_elevation_model_minetti(
+        self,
+        helsinki_osm_pbf_file_path,
+        gtfs_file_path,
+        elevation_model_file_path,
+    ):
+        _ = r5py.TransportNetwork(
+            osm_pbf=helsinki_osm_pbf_file_path,
+            gtfs=[gtfs_file_path],
+            elevation_model=elevation_model_file_path,
+            elevation_cost_function=r5py.ElevationCostFunction.MINETTI,
+        )
+
+    def test_invalid_cache(
+        self,
+        transport_network_files_tuple,
+        cache_directory,
+        transport_network_checksum,
+    ):
+        _ = r5py.TransportNetwork(*transport_network_files_tuple)
+        del _
+
+        (
+            cache_directory / f"{transport_network_checksum}.transport_network"
+        ).write_text("".join(random.choices(string.printable, k=64)))
+
+        _ = r5py.TransportNetwork(*transport_network_files_tuple)
+
+    def test_cache_exists(
+        self,
+        transport_network,
+        cache_directory,
+        transport_network_checksum,
+    ):
+        del transport_network
+        assert (
+            cache_directory / f"{transport_network_checksum}.transport_network"
+        ).exists()