r5py 1.0.6__tar.gz → 1.0.7__tar.gz

{r5py-1.0.6/src/r5py.egg-info → r5py-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: r5py
-Version: 1.0.6
+Version: 1.0.7
 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
@@ -164,6 +164,6 @@ your project better.
 [r5-github]: https://github.com/conveyal/r5/
 [r5r-github]: https://github.com/ipeaGIT/r5r/
 [r5r-vignette]: https://ipeagit.github.io/r5r/
-[rtd-quickstart]: https://r5py.readthedocs.io/en/stable/user-guide/user-manual/quickstart.html
-[rtd-installation]: https://r5py.readthedocs.io/en/stable/user-guide/installation/installation.html
+[rtd-quickstart]: https://r5py.readthedocs.io/stable/user-guide/user-manual/quickstart.html
+[rtd-installation]: https://r5py.readthedocs.io/stable/user-guide/installation/installation.html
 [rtd-link]: https://r5py.readthedocs.io/

{r5py-1.0.6 → r5py-1.0.7}/README.md

@@ -101,6 +101,6 @@ your project better.
 [r5-github]: https://github.com/conveyal/r5/
 [r5r-github]: https://github.com/ipeaGIT/r5r/
 [r5r-vignette]: https://ipeagit.github.io/r5r/
-[rtd-quickstart]: https://r5py.readthedocs.io/en/stable/user-guide/user-manual/quickstart.html
-[rtd-installation]: https://r5py.readthedocs.io/en/stable/user-guide/installation/installation.html
+[rtd-quickstart]: https://r5py.readthedocs.io/stable/user-guide/user-manual/quickstart.html
+[rtd-installation]: https://r5py.readthedocs.io/stable/user-guide/installation/installation.html
 [rtd-link]: https://r5py.readthedocs.io/

{r5py-1.0.6 → r5py-1.0.7}/src/r5py/__init__.py

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

{r5py-1.0.6 → r5py-1.0.7}/src/r5py/r5/regional_task.py

@@ -38,9 +38,9 @@ class RegionalTask:
         access_modes=[TransportMode.WALK],
         egress_modes=None,  # default: access_modes
         max_time=datetime.timedelta(hours=2),
-        max_time_walking=datetime.timedelta(hours=2),
-        max_time_cycling=datetime.timedelta(hours=2),
-        max_time_driving=datetime.timedelta(hours=2),
+        max_time_walking=None,
+        max_time_cycling=None,
+        max_time_driving=None,
         speed_walking=3.6,
         speed_cycling=12.0,
         max_public_transport_rides=8,
@@ -90,7 +90,10 @@ class RegionalTask:
         egress_modes : list[r5py.TransportMode]
             Mode of transport from public transport stops. Default: access_modes
         max_time : datetime.timedelta
-            Maximum trip duration. Default: 2 hours
+            Maximum trip duration. If any of ``max_time_walking``,
+            ``max_time_cycling``, or ``max_time_driving`` are set, ``max_time``
+            is increased to the maximum value of those, if it is lower.
+            Default: 2 hours
         max_time_walking : datetime.timedelta
             Maximum time spent walking, potentially including access and egress
             Default: max_time
@@ -128,15 +131,15 @@ class RegionalTask:
         self.percentiles = percentiles
 
         self.max_time = max_time
-        self.max_time_walking = (
-            max_time_walking if max_time_walking is not None else max_time
-        )
         self.max_time_cycling = (
             max_time_cycling if max_time_cycling is not None else max_time
         )
         self.max_time_driving = (
             max_time_driving if max_time_driving is not None else max_time
         )
+        self.max_time_walking = (
+            max_time_walking if max_time_walking is not None else max_time
+        )
 
         self.speed_cycling = speed_cycling
         self.speed_walking = speed_walking
@@ -333,10 +336,29 @@ class RegionalTask:
     @max_time.setter
     def max_time(self, max_time):
         self._max_time = max_time
-        max_time = int(max_time.total_seconds() / 60)
-        self._regional_task.streetTime = max_time
-        self._regional_task.maxTripDurationMinutes = max_time
-        self._regional_task.maxCarTime = max_time
+
+        try:
+            max_time_cycling = self.max_time_cycling
+            if max_time_cycling > max_time:
+                max_time_cycling = max_time
+        except AttributeError:
+            pass
+        try:
+            max_time_driving = self.max_time_driving
+            if max_time_driving > max_time:
+                max_time_driving = max_time
+        except AttributeError:
+            pass
+        try:
+            max_time_walking = self.max_time_walking
+            if max_time_walking > max_time:
+                max_time_walking = max_time
+        except AttributeError:
+            pass
+
+        max_time_sec = int(max_time.total_seconds() / 60)
+        self._regional_task.streetTime = max_time_sec
+        self._regional_task.maxTripDurationMinutes = max_time_sec
 
     @property
     def max_time_cycling(self):
@@ -353,6 +375,9 @@ class RegionalTask:
         self._max_time_cycling = max_time_cycling
         self._regional_task.maxBikeTime = int(max_time_cycling.total_seconds() / 60)
 
+        if self.max_time < max_time_cycling:
+            self.max_time = max_time_cycling
+
     @property
     def max_time_driving(self):
         """Restrict routes to at most this duration of driving (datetime.timedelta)."""
@@ -363,6 +388,9 @@ class RegionalTask:
         self._max_time_driving = max_time_driving
         self._regional_task.maxCarTime = int(max_time_driving.total_seconds() / 60)
 
+        if self.max_time < max_time_driving:
+            self.max_time = max_time_driving
+
     @property
     def max_time_walking(self):
         """
@@ -378,6 +406,9 @@ class RegionalTask:
         self._max_time_walking = max_time_walking
         self._regional_task.maxWalkTime = int(max_time_walking.total_seconds() / 60)
 
+        if self.max_time < max_time_walking:
+            self.max_time = max_time_walking
+
     @property
     def percentiles(self):
         """

{r5py-1.0.6 → r5py-1.0.7/src/r5py.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: r5py
-Version: 1.0.6
+Version: 1.0.7
 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
@@ -164,6 +164,6 @@ your project better.
 [r5-github]: https://github.com/conveyal/r5/
 [r5r-github]: https://github.com/ipeaGIT/r5r/
 [r5r-vignette]: https://ipeagit.github.io/r5r/
-[rtd-quickstart]: https://r5py.readthedocs.io/en/stable/user-guide/user-manual/quickstart.html
-[rtd-installation]: https://r5py.readthedocs.io/en/stable/user-guide/installation/installation.html
+[rtd-quickstart]: https://r5py.readthedocs.io/stable/user-guide/user-manual/quickstart.html
+[rtd-installation]: https://r5py.readthedocs.io/stable/user-guide/installation/installation.html
 [rtd-link]: https://r5py.readthedocs.io/

{r5py-1.0.6 → r5py-1.0.7}/tests/test_regional_task.py

@@ -281,7 +281,6 @@ class TestRegionalTask:
         assert regional_task.max_time == expected
         assert regional_task._regional_task.streetTime == expected_java
         assert regional_task._regional_task.maxTripDurationMinutes == expected_java
-        assert regional_task._regional_task.maxCarTime == expected_java
 
     @pytest.mark.parametrize(
         ["max_time_cycling", "expected", "expected_java"],
@@ -313,6 +312,7 @@ class TestRegionalTask:
         regional_task.max_time_cycling = max_time_cycling
         assert regional_task.max_time_cycling == expected
         assert regional_task._regional_task.maxBikeTime == expected_java
+        assert regional_task.max_time >= regional_task.max_time_cycling
 
     @pytest.mark.parametrize(
         ["max_time_driving", "expected", "expected_java"],
@@ -344,6 +344,7 @@ class TestRegionalTask:
         regional_task.max_time_driving = max_time_driving
         assert regional_task.max_time_driving == expected
         assert regional_task._regional_task.maxCarTime == expected_java
+        assert regional_task.max_time >= regional_task.max_time_driving
 
     @pytest.mark.parametrize(
         ["max_time_walking", "expected", "expected_java"],
@@ -375,6 +376,7 @@ class TestRegionalTask:
         regional_task.max_time_walking = max_time_walking
         assert regional_task.max_time_walking == expected
         assert regional_task._regional_task.maxWalkTime == expected_java
+        assert regional_task.max_time >= regional_task.max_time_walking
 
     @pytest.mark.parametrize(
         ["percentiles"],