r5py 0.1.2__tar.gz → 1.0.0.dev1__tar.gz

{r5py-0.1.2/src/r5py.egg-info → r5py-1.0.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: r5py
-Version: 0.1.2
+Version: 1.0.0.dev1
 Summary: Python wrapper for the R5 routing analysis engine
 Author: Willem Klumpenhouwer, Marcus Sairava, Rafael Pereira, Henrikki Tenkanen
 Author-email: Christoph Fink <christoph.fink@helsinki.fi>
@@ -21,7 +21,6 @@ Requires-Dist: ConfigArgParse
 Requires-Dist: filelock
 Requires-Dist: fiona
 Requires-Dist: geopandas
-Requires-Dist: importlib_resources
 Requires-Dist: joblib
 Requires-Dist: jpype1
 Requires-Dist: numpy
@@ -52,11 +51,11 @@ Requires-Dist: sphinxcontrib-images; extra == "docs"
 Provides-Extra: tests
 Requires-Dist: pyarrow; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
-Requires-Dist: pytest-asyncio; 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.sao_paulo>=0.1.1; extra == "tests"
+Requires-Dist: typing-extensions; extra == "tests"
 
 <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-0.1.2 → r5py-1.0.0.dev1}/pyproject.toml

@@ -20,7 +20,6 @@ dependencies = [
     "filelock",
     "fiona",
     "geopandas",
-    "importlib_resources",
     "joblib",
     "jpype1",
     "numpy",
@@ -49,9 +48,9 @@ docs = ["contextily", "folium", "GitPython", "h3>=4.0.0b2", "jupyterlab_myst",
         "r5py.sampledata.helsinki>=0.1.1", "r5py.sampledata.sao_paulo>=0.1.1",
         "shapely", "sphinx", "sphinx-book-theme", "sphinx-design",
         "sphinxcontrib-bibtex", "sphinxcontrib-images"]
-tests = ["pyarrow", "pytest", "pytest-asyncio", "pytest-cov",
-         "pytest-lazy-fixtures", "r5py.sampledata.helsinki>=0.1.1",
-         "r5py.sampledata.sao_paulo>=0.1.1"]
+tests = ["pyarrow", "pytest", "pytest-cov", "pytest-lazy-fixtures",
+         "r5py.sampledata.helsinki>=0.1.1", "r5py.sampledata.sao_paulo>=0.1.1",
+         "typing-extensions"]
 
 
 [project.urls]
@@ -60,22 +59,27 @@ Repository = "https://github.com/r5py/r5py.git"
 "Change log" = "https://github.com/r5py/r5py/blob/main/CHANGELOG.md"
 "Bug tracker" = "https://github.com/r5py/r5py/issues"
 
-[tool.coverage.run]
-omit = ["tests/*", ".virtualenv/**/*"]
+[tool.coverage.paths]
+equivalent_sources = [
+    "src/r5py/",
+    ".virtualenv/lib/python*/site-packages/r5py/",
+    "/opt/hostedtoolcache/Python/*/x64/lib/python*/site-packages/r5py/",
+    "/Library/Frameworks/Python.framework/Versions/*/lib/python*/site-packages/r5py/",
+    "C:/hostedtoolcache/windows/Python/*/x64/Lib/site-packages/r5py/"
+]
 
 [tool.jupytext.formats]
 "docs/notebooks/" = "ipynb"
 "docs/md/" = "md"
 
 [tool.pytest.ini_options]
-addopts = "-p no:faulthandler --cov --cov-report term-missing --cov-report xml"
+addopts = "-p no:faulthandler --cov=r5py --cov-report term-missing --cov-report xml --import-mode=importlib"
 filterwarnings = [
     "error",
     "ignore:Could not find R5 jar, trying to download it from upstream",
     "ignore:Successfully downloaded r5-"
 ]
 testpaths = ["tests"]
-asyncio_mode = "auto"
 
 [tool.setuptools.dynamic]
 version = {attr = "r5py.__version__"}

{r5py-0.1.2 → r5py-1.0.0.dev1}/src/r5py/__init__.py

@@ -2,22 +2,26 @@
 
 """Python wrapper for the R5 routing analysis engine."""
 
-__version__ = "0.1.2"
+__version__ = "1.0.0.dev1"
 
 
 from .r5 import (
+    DetailedItineraries,
     DetailedItinerariesComputer,
     RegionalTask,
     TransportMode,
     TransportNetwork,
+    TravelTimeMatrix,
     TravelTimeMatrixComputer,
 )
 
 __all__ = [
+    "DetailedItineraries",
     "DetailedItinerariesComputer",
     "RegionalTask",
     "TransportMode",
     "TransportNetwork",
+    "TravelTimeMatrix",
     "TravelTimeMatrixComputer",
     "__version__",
 ]

{r5py-0.1.2 → r5py-1.0.0.dev1}/src/r5py/r5/__init__.py

@@ -4,7 +4,7 @@
 
 from .access_leg import AccessLeg
 from .breakdown_stat import BreakdownStat
-from .detailed_itineraries_computer import DetailedItinerariesComputer
+from .detailed_itineraries import DetailedItineraries, DetailedItinerariesComputer
 from .direct_leg import DirectLeg
 from .egress_leg import EgressLeg
 from .regional_task import RegionalTask
@@ -14,13 +14,14 @@ from .transfer_leg import TransferLeg
 from .transit_leg import TransitLeg
 from .transport_mode import TransportMode
 from .transport_network import TransportNetwork
-from .travel_time_matrix_computer import TravelTimeMatrixComputer
+from .travel_time_matrix import TravelTimeMatrix, TravelTimeMatrixComputer
 from .trip import Trip
 from .trip_planner import TripPlanner
 
 __all__ = [
     "AccessLeg",
     "BreakdownStat",
+    "DetailedItineraries",
     "DetailedItinerariesComputer",
     "DirectLeg",
     "EgressLeg",
@@ -32,6 +33,7 @@ __all__ = [
     "TransitLeg",
     "TransportMode",
     "TransportNetwork",
+    "TravelTimeMatrix",
     "TravelTimeMatrixComputer",
     "Trip",
     "TripPlanner",

r5py-0.1.2/src/r5py/r5/base_travel_time_matrix_computer.py → r5py-1.0.0.dev1/src/r5py/r5/base_travel_time_matrix.py

@@ -6,6 +6,7 @@ import math
 import multiprocessing
 import warnings
 
+import geopandas
 import numpy
 import shapely
 
@@ -14,7 +15,7 @@ from .regional_task import RegionalTask
 from .transport_network import TransportNetwork
 
 
-__all__ = ["BaseTravelTimeMatrixComputer"]
+__all__ = ["BaseTravelTimeMatrix"]
 
 
 # R5 fills cut-off (NULL) values with MAX_INT32
@@ -26,13 +27,26 @@ MAX_INT32 = (2**31) - 1
 NUM_THREADS = math.ceil(multiprocessing.cpu_count() * 0.5)
 
 
-class BaseTravelTimeMatrixComputer:
+class BaseTravelTimeMatrix(geopandas.GeoDataFrame):
     """Base class for travel time computers between many origins and destinations."""
 
     MAX_INT32 = MAX_INT32
 
     NUM_THREADS = NUM_THREADS
 
+    _r5py_attributes = [
+        "_destinations",
+        "_destinations_crs",
+        "_origins",
+        "_origins_crs",
+        "destinations",
+        "origins",
+        "request",
+        "snap_to_network",
+        "transport_network",
+        "verbose",
+    ]
+
     def __init__(
         self,
         transport_network,
@@ -71,6 +85,8 @@ class BaseTravelTimeMatrixComputer:
             ``max_time_cycling``, ``max_time_driving``, ``speed_cycling``, ``speed_walking``,
             ``max_public_transport_rides``, ``max_bicycle_traffic_stress``
         """
+        geopandas.GeoDataFrame.__init__(self)
+
         if not isinstance(transport_network, TransportNetwork):
             transport_network = TransportNetwork(*transport_network)
         self.transport_network = transport_network
@@ -89,6 +105,13 @@ class BaseTravelTimeMatrixComputer:
 
         self.verbose = Config().arguments.verbose
 
+    def __setattr__(self, attr, val):
+        """Catch our own attributes here so we don’t mess with (geo)pandas columns."""
+        if attr in self._r5py_attributes:
+            object.__setattr__(self, attr, val)
+        else:
+            super().__setattr__(attr, val)
+
     @property
     def destinations(self):
         """The destinations of this travel time matrix (`geopandas.GeoDataFrame`)."""
@@ -159,8 +182,6 @@ class BaseTravelTimeMatrixComputer:
 
                 setattr(self, f"_{which_end}", points.copy())
 
-            self.snap_to_network = False  # prevent repeated snapping on same point sets
-
     @property
     def origins(self):
         """The origins of this travel time matrix (`geopandas.GeoDataFrame`)."""

r5py-0.1.2/src/r5py/r5/detailed_itineraries_computer.py → r5py-1.0.0.dev1/src/r5py/r5/detailed_itineraries.py

@@ -7,23 +7,33 @@
 import copy
 import warnings
 
+try:
+    from warnings import deprecated
+except ImportError:  # Python<=3.12
+    from typing_extensions import deprecated
+
 import geopandas
 import joblib
 import pandas
 
-from .base_travel_time_matrix_computer import BaseTravelTimeMatrixComputer
+from .base_travel_time_matrix import BaseTravelTimeMatrix
 from .trip import Trip
 from .trip_planner import ACCURATE_GEOMETRIES, TripPlanner
 
 
-__all__ = ["DetailedItinerariesComputer"]
+__all__ = ["DetailedItineraries", "DetailedItinerariesComputer"]
 
 
-class DetailedItinerariesComputer(BaseTravelTimeMatrixComputer):
+class DetailedItineraries(BaseTravelTimeMatrix):
     """Compute detailed itineraries between many origins and destinations."""
 
     COLUMNS = ["from_id", "to_id", "option"] + Trip.COLUMNS
 
+    _r5py_attributes = BaseTravelTimeMatrix._r5py_attributes + [
+        "all_to_all",
+        "od_pairs",
+    ]
+
     def __init__(
         self,
         transport_network,
@@ -36,6 +46,10 @@ class DetailedItinerariesComputer(BaseTravelTimeMatrixComputer):
         """
         Compute travel times between many origins and destinations.
 
+        ``r5py.DetailedItineraries`` are child classes of
+        ``geopandas.GeoDataFrame`` and support all of their methods and
+        properties, see https://geopandas.org/en/stable/docs.html
+
         Arguments
         ---------
         transport_network : r5py.TransportNetwork | tuple(str, list(str), dict)
@@ -58,10 +72,10 @@ class DetailedItinerariesComputer(BaseTravelTimeMatrixComputer):
             if `int`, use `snap_to_network` meters as the search radius.
         force_all_to_all : bool, default False
             If ``origins`` and ``destinations`` have the same length, by
-            default, ``DetailedItinerariesComputer`` finds routes between pairs
+            default, ``DetailedItineraries`` finds routes between pairs
             of origins and destinations, i.e., it routes from origin #1 to
             destination #1, origin #2 to destination #2, ... .
-            Set ``all_to_all=True`` to route from each origin to all
+            Set ``force_all_to_all=True`` to route from each origin to all
             destinations (this is the default, if ``origins`` and ``destinations``
             have different lengths, or if ``destinations`` is omitted)
         **kwargs : mixed
@@ -106,7 +120,14 @@ class DetailedItinerariesComputer(BaseTravelTimeMatrixComputer):
         else:
             self.all_to_all = force_all_to_all
 
-    def compute_travel_details(self):
+        data = self._compute()
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", category=FutureWarning)
+            for column in data.columns:
+                self[column] = data[column]
+            self.set_geometry("geometry")
+
+    def _compute(self):
         """
         Compute travel times from all origins to all destinations.
 
@@ -114,15 +135,20 @@ class DetailedItinerariesComputer(BaseTravelTimeMatrixComputer):
         -------
         geopandas.GeoDataFrame
             The resulting detailed routes. For each origin/destination pair,
+            multiple route alternatives (‘options’) might be reported that each
+            consist of one or more segments. Each segment represents one row.
             multiple route alternatives (‘options’) might be reported that each consist of
             one or more segments. Each segment represents one row.
+
             The data frame comprises of the following columns: `from_id`,
             `to_id`, `option` (`int`), `segment` (`int`), `transport_mode`
             (`r5py.TransportMode`), `departure_time` (`datetime.datetime`),
             `distance` (`float`, metres), `travel_time` (`datetime.timedelta`),
-            `wait_time` (`datetime.timedelta`), `route` (`str`, public transport
-            route number or name), `geometry` (`shapely.LineString`)
-            TODO: Add description of output data frame columns and format
+            `wait_time` (`datetime.timedelta`), `feed` (`str`, the feed name
+            used), `agency_id` (`str` the public transport agency identifier),
+            `route_id` (`str`, public transport route ID), `start_stop_id`
+            (`str`, the GTFS stop_id for boarding), `end_stop_id` (`str`, the
+            GTFS stop_id for alighting), `geometry` (`shapely.LineString`)
         """
         self._prepare_origins_destinations()
 
@@ -204,3 +230,34 @@ class DetailedItinerariesComputer(BaseTravelTimeMatrixComputer):
         # fmt: on
 
         return pandas.DataFrame(trips, columns=self.COLUMNS)
+
+
+@deprecated(
+    "Use `DetailedItineraries` instead, `DetailedItinerariesComputer will be deprecated in a future release."
+)
+class DetailedItinerariesComputer:
+    """Compute detailed itineraries between many origins and destinations."""
+
+    def __init__(self, *args, **kwargs):
+        """Compute detailed itineraries between many origins and destinations."""
+        self._detailed_itineraries = DetailedItineraries(*args, **kwargs)
+
+    def compute_travel_details(self):
+        """
+        Compute travel times from all origins to all destinations.
+
+        Returns
+        -------
+        geopandas.GeoDataFrame
+            The resulting detailed routes. For each origin/destination pair,
+            multiple route alternatives (‘options’) might be reported that each consist of
+            one or more segments. Each segment represents one row.
+            The data frame comprises of the following columns: `from_id`,
+            `to_id`, `option` (`int`), `segment` (`int`), `transport_mode`
+            (`r5py.TransportMode`), `departure_time` (`datetime.datetime`),
+            `distance` (`float`, metres), `travel_time` (`datetime.timedelta`),
+            `wait_time` (`datetime.timedelta`), `route` (`str`, public transport
+            route number or name), `geometry` (`shapely.LineString`)
+            TODO: Add description of output data frame columns and format
+        """
+        return self._detailed_itineraries

{r5py-0.1.2 → r5py-1.0.0.dev1}/src/r5py/r5/regional_task.py

@@ -53,11 +53,11 @@ class RegionalTask:
         A RegionalTask wraps a `com.conveyal.r5.analyst.cluster.RegionalTask`,
         which is used to specify the details of a requested computation.
         RegionalTasks underlie virtually all major computations carried out,
-        such as, e.g., `TravelTimeMatrixComputer` or `AccessibilityEstimator`.
+        such as, e.g., `TravelTimeMatrix` or `AccessibilityEstimator`.
 
         In **r5py**, there is usually no need to explicitely create a
         `RegionalTask`. Rather, the constructors to the computation classes
-        (`TravelTimeMatrixComputer`, `AccessibilityEstimator`, ...) accept the
+        (`TravelTimeMatrix`, `AccessibilityEstimator`, ...) accept the
         arguments, and pass them through to an internally handled
         `RegionalTask`.
 

{r5py-0.1.2 → r5py-1.0.0.dev1}/src/r5py/r5/transit_layer.py

@@ -98,6 +98,10 @@ class TransitLayer:
         """Return a list of GTFS trip patterns."""
         return list(self._transit_layer.tripPatterns)
 
+    def get_stop_id_from_index(self, stop_index):
+        """Get the GTFS stop id for the `stop_index`-th stop of this transit layer."""
+        return self._transit_layer.stopIdForIndex[stop_index]
+
 
 @jpype._jcustomizer.JConversion(
     "com.conveyal.r5.transit.TransitLayer", exact=TransitLayer

r5py-0.1.2/src/r5py/r5/travel_time_matrix_computer.py → r5py-1.0.0.dev1/src/r5py/r5/travel_time_matrix.py

@@ -4,24 +4,82 @@
 
 import copy
 
+try:
+    from warnings import deprecated
+except ImportError:  # Python<=3.12
+    from typing_extensions import deprecated
+
 import pandas
 
-from .base_travel_time_matrix_computer import BaseTravelTimeMatrixComputer
+from .base_travel_time_matrix import BaseTravelTimeMatrix
 from ..util import start_jvm
 
 import com.conveyal.r5
 
 
-__all__ = ["TravelTimeMatrixComputer"]
+__all__ = ["TravelTimeMatrix", "TravelTimeMatrixComputer"]
 
 
 start_jvm()
 
 
-class TravelTimeMatrixComputer(BaseTravelTimeMatrixComputer):
+class TravelTimeMatrix(BaseTravelTimeMatrix):
     """Compute travel times between many origins and destinations."""
 
-    def compute_travel_times(self):
+    def __init__(
+        self,
+        transport_network,
+        origins=None,
+        destinations=None,
+        snap_to_network=False,
+        **kwargs,
+    ):
+        """
+        Compute travel times between many origins and destinations.
+
+        ``r5py.TravelTimeMatrix`` are child classes of ``pandas.DataFrame`` and
+        support all of their methods and properties,
+        see https://pandas.pydata.org/docs/
+
+        Arguments
+        ---------
+        transport_network : r5py.TransportNetwork | tuple(str, list(str), dict)
+            The transport network to route on. This can either be a readily
+            initialised r5py.TransportNetwork or a tuple of the parameters
+            passed to ``TransportNetwork.__init__()``: the path to an OpenStreetMap
+            extract in PBF format, a list of zero of more paths to GTFS transport
+            schedule files, and a dict with ``build_config`` options.
+        origins : geopandas.GeoDataFrame
+            Places to find a route _from_
+            Has to have a point geometry, and at least an `id` column
+        destinations : geopandas.GeoDataFrame (optional)
+            Places to find a route _to_
+            Has to have a point geometry, and at least an `id` column
+            If omitted, use same data set as for origins
+        snap_to_network : bool or int, default False
+            Should origin an destination points be snapped to the street network
+            before routing? If `True`, the default search radius (defined in
+            `com.conveyal.r5.streets.StreetLayer.LINK_RADIUS_METERS`) is used,
+            if `int`, use `snap_to_network` meters as the search radius.
+        **kwargs : mixed
+            Any arguments than can be passed to r5py.RegionalTask:
+            ``departure``, ``departure_time_window``, ``percentiles``, ``transport_modes``,
+            ``access_modes``, ``egress_modes``, ``max_time``, ``max_time_walking``,
+            ``max_time_cycling``, ``max_time_driving``, ``speed_cycling``, ``speed_walking``,
+            ``max_public_transport_rides``, ``max_bicycle_traffic_stress``
+        """
+        super().__init__(
+            transport_network,
+            origins,
+            destinations,
+            snap_to_network,
+            **kwargs,
+        )
+        data = self._compute()
+        for column in data.columns:
+            self[column] = data[column]
+
+    def _compute(self):
         """
         Compute travel times from all origins to all destinations.
 
@@ -76,17 +134,16 @@ class TravelTimeMatrixComputer(BaseTravelTimeMatrixComputer):
             travel time.
         """
         # First, create an empty DataFrame (this forces column types)
-        travel_time_columns = {
-            "from_id": pandas.Series(dtype=str),
-            "to_id": pandas.Series(dtype=str),
-        }
-        travel_time_columns.update(
+        od_matrix = pandas.DataFrame(
             {
+                "from_id": pandas.Series(dtype=str),
+                "to_id": pandas.Series(dtype=str),
+            }
+            | {
                 f"travel_time_p{percentile:d}": pandas.Series(dtype=float)
                 for percentile in self.request.percentiles
             }
         )
-        od_matrix = pandas.DataFrame(travel_time_columns)
 
         # first assign columns with correct length (`to_id`),
         # only then fill `from_id` (it’s a scalar)
@@ -121,3 +178,31 @@ class TravelTimeMatrixComputer(BaseTravelTimeMatrixComputer):
         od_matrix = self._parse_results(from_id, results)
 
         return od_matrix
+
+
+@deprecated(
+    "Use `TravelTimeMatrix` instead, `TravelTimeMatrixComputer will be deprecated in a future release."
+)
+class TravelTimeMatrixComputer:
+    """Compute travel times between many origins and destinations."""
+
+    def __init__(self, *args, **kwargs):
+        """Compute travel times between many origins and destinations."""
+        self._ttm = TravelTimeMatrix(*args, **kwargs)
+
+    def compute_travel_times(self):
+        """
+        Compute travel times from all origins to all destinations.
+
+        Returns
+        -------
+        pandas.DataFrame
+            A data frame containing the columns ``from_id``, ``to_id``, and
+            ``travel_time``, where ``travel_time`` is the median calculated
+            travel time between ``from_id`` and ``to_id`` or ``numpy.nan``
+            if no connection with the given parameters was found.
+            If non-default ``percentiles`` were requested: one or more columns
+            ``travel_time_p{:02d}`` representing the particular percentile of
+            travel time.
+        """
+        return self._ttm

{r5py-0.1.2 → r5py-1.0.0.dev1}/src/r5py/r5/trip.py

@@ -54,8 +54,9 @@ class Trip:
         Returns
         =======
         list : detailed information about this trip and its legs (segments):
-        ``segment``, ``transport_mode``, ``departure_time``, ``distance``,
-        ``travel_time``, ``wait_time``, ``route``, ``geometry``
+            ``segment``, ``transport_mode``, ``departure_time``, ``distance``,
+            ``travel_time``, ``wait_time``, ``feed``, ``agency_id``, ``route_id``,
+            ``start_stop_id``, ``end_stop_id``, ``geometry``
         """
         return [[segment] + leg.as_table_row() for segment, leg in enumerate(self.legs)]
 
@@ -76,9 +77,9 @@ class Trip:
         )
 
     @property
-    def routes(self):
+    def route_ids(self):
         """The public transport route(s) used on this trip."""
-        return [leg.route for leg in self.legs]
+        return [leg.route_id for leg in self.legs]
 
     @property
     def transport_modes(self):

{r5py-0.1.2 → r5py-1.0.0.dev1}/src/r5py/r5/trip_leg.py

@@ -26,7 +26,11 @@ class TripLeg:
         "distance",
         "travel_time",
         "wait_time",
-        "route",
+        "feed",
+        "agency_id",
+        "route_id",
+        "start_stop_id",
+        "end_stop_id",
         "geometry",
     ]
 
@@ -37,28 +41,41 @@ class TripLeg:
         distance=None,
         travel_time=datetime.timedelta(seconds=0),
         wait_time=datetime.timedelta(seconds=0),
-        route=None,
+        feed=None,
+        agency_id=None,
+        route_id=None,
+        start_stop_id=None,
+        end_stop_id=None,
         geometry=shapely.LineString(),
     ):
         """
         Represent one leg of a trip.
 
-        This is a base class, use one the specific classes,
-        e.g., TransitLeg, or DirectLeg
+        This is a base class, use one of the more specific classes, e.g.,
+        TransitLeg, or DirectLeg
 
         Arguments
         =========
         transport_mode : r5py.TransportMode
             mode of transport this trip leg was travelled
-        departure_time : datetime.datetime,
+        departure_time : datetime.datetime
+            departure time of this trip leg
         distance : float
             distance covered by this trip leg, in metres
         travel_time : datetime.timedelta
             time spent travelling on this trip leg
         wait_time : datetime.timedelta
             time spent waiting for a connection on this trip leg
-        route : str
-            public transport route used for this trip leg
+        feed : str
+            the GTFS feed identifier used for this trip leg
+        agency_id : str
+            the GTFS id the agency used for this trip leg
+        route_id : str
+            the GTFS id of the public transport route used for this trip leg
+        start_stop_id : str
+            the GTFS stop_id of the boarding stop used for this trip leg
+        end_stop_id : str
+            the GTFS stop_id of the aligning stop used for this trip leg
         geometry : shapely.LineString
             spatial representation of this trip leg
         """
@@ -67,7 +84,11 @@ class TripLeg:
         self.distance = distance
         self.travel_time = travel_time
         self.wait_time = wait_time
-        self.route = route
+        self.feed = feed
+        self.agency_id = agency_id
+        self.route_id = route_id
+        self.start_stop_id = start_stop_id
+        self.end_stop_id = end_stop_id
         self.geometry = geometry
 
     def __add__(self, other):
@@ -177,7 +198,8 @@ class TripLeg:
         Returns
         =======
         list : detailed information about this trip leg: ``transport_mode``,
-        ``departure_time``, ``distance``, ``travel_time``, ``wait_time``,
-        ``route``, ``geometry``
+            ``departure_time``, ``distance``, ``travel_time``, ``wait_time``,
+            ``feed``, ``agency_id`` ``route_id``, ``start_stop_id``,
+            ``end_stop_id``, ``geometry``
         """
         return [getattr(self, column) for column in self.COLUMNS]