r5py 1.0.6__py3-none-any.whl → 1.0.7__py3-none-any.whl

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/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.dist-info → r5py-1.0.7.dist-info}/METADATA

@@ -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.dist-info → r5py-1.0.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-r5py/__init__.py,sha256=qeqQUMPw-CQHhU25NZaepM2Uhv2Asax2RgViuupk-G4,602
+r5py/__init__.py,sha256=rykXr06acCvGQoCu5z10gCyf29zl7zS3YdASyUJ7HK0,602
 r5py/__main__.py,sha256=Wvn0ChD7E-dCSZ8b8k_HhHG0KMOk0qMNFkijGuSH3-0,81
 r5py/r5/__init__.py,sha256=ZvzhfO9jHbBsRon6cLjWg_gJWvC4L0rkJtmH5mIUlIg,1149
 r5py/r5/access_leg.py,sha256=W3GfPEpqmWD1c4xipd6UcVIaBC-yb6srGCZV30E2dPY,293
@@ -10,7 +10,7 @@ r5py/r5/elevation_cost_function.py,sha256=NXkwPRKZiotVugXQeOYLIgouQmKNx3juSAUi8G
 r5py/r5/elevation_model.py,sha256=tGXNzIlRt5fZvteCZ1XQYNby8RLxjzONzSp8k9q3GHs,2745
 r5py/r5/file_storage.py,sha256=wujo-IQyhJYsN7uxTemxNCKzt-pnL5zZgfyn7dZYaLY,1986
 r5py/r5/isochrones.py,sha256=NNpV3Df4NeLdDksGERkb2Eos33ziMBGEeaWyCKPt5P8,12974
-r5py/r5/regional_task.py,sha256=jpOoskx7Y-j-c4E-56uvJXiiuPYK3w28_FJsoGQLSbE,22062
+r5py/r5/regional_task.py,sha256=OtPFI9wkDTh38MYY-tgOk_0YSPysgnGduEaymp0T_H0,23032
 r5py/r5/scenario.py,sha256=nUNAlN3cO7E_b4sMpNqdL0FD7WQaQ49iIvh-k8l4YRM,763
 r5py/r5/street_layer.py,sha256=2AWhIE0-aTNGQenX6bF1xv5bmhR_LV0CgqM4BKgVYfk,2329
 r5py/r5/street_segment.py,sha256=0O0QV8Eyfss-xHJShKGSQV1IusZfTrrxzu_AWl3KACo,1109
@@ -42,8 +42,8 @@ r5py/util/spatially_clustered_geodataframe.py,sha256=FxG8V3SSeK-PuCep565p1b3TNcl
 r5py/util/validating_requests_session.py,sha256=sH5FgpS9eGax5DG2qA2GrGuiwgTJgh8tKsZ9OiXKmvk,1807
 r5py/util/warnings.py,sha256=CvxKWKlNO_p3riB4SkNqbU5AGPsaY_3-OzqaBObE3B8,139
 r5py/util/working_copy.py,sha256=sbLbRCi39LtC-0tXxvh2y7ZN2D15chbhleCZXzHAFSc,1432
-r5py-1.0.6.dist-info/licenses/LICENSE,sha256=VAnuGDX1TPylSN9G2xLa-urDpj_SQwn-qqs068dx4tk,51
-r5py-1.0.6.dist-info/METADATA,sha256=qfdHxzD_lUHsf9HZ_XxZWIioP_fBtHf8muOZpiGMVJk,10006
-r5py-1.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-r5py-1.0.6.dist-info/top_level.txt,sha256=fOH1R85dkNDOI7jkg-lIsl5CQIO4fE5X868K9dTqs9U,5
-r5py-1.0.6.dist-info/RECORD,,
+r5py-1.0.7.dist-info/licenses/LICENSE,sha256=VAnuGDX1TPylSN9G2xLa-urDpj_SQwn-qqs068dx4tk,51
+r5py-1.0.7.dist-info/METADATA,sha256=vM03dnxpr9q75eiBHPtLcDrRwtX8tlJrhGrIaXPWQ3A,10000
+r5py-1.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+r5py-1.0.7.dist-info/top_level.txt,sha256=fOH1R85dkNDOI7jkg-lIsl5CQIO4fE5X868K9dTqs9U,5
+r5py-1.0.7.dist-info/RECORD,,