Merge pull request #7 from anguskbell/feature/updates-for-post-pub-ch…

…ecks-2

Misc changes to support post publishing checks

pyproject.toml

@@ -14,7 +14,6 @@ pyproj = "^3.3.0"
 python-dateutil = "^2.8.2"
 requests = "^2.27.1"
 shapely-geojson = "^0.0.1"
-ordered-enum = "^0.0.6"
 
 [tool.poetry.dev-dependencies]
 Sphinx = "^4.4.0"

pytxc/elements.py

@@ -19,7 +19,7 @@ def __repr__(self):
         class_name = self.__class__.__name__
         attrs = []
         if self.text:
-            attrs.append("text={self.text!r}")
+            attrs.append(f"text={self.text!r}")
         attrs += [f"{key}={value!r}" for key, value in self.attributes.items()]
         attrs_str = ", ".join(attrs)
         return f"{class_name}({attrs_str})"
@@ -75,6 +75,10 @@ def get_children(self) -> List["Element"]:
     def get_root(self) -> "Element":
         return Element(self._element.getroottree().getroot())
 
+    @property
+    def line_number(self) -> Optional[int]:
+        return self._element.sourceline     # type: ignore
+
 
 E = TypeVar("E", bound=Element)
 

pytxc/services.py

@@ -58,6 +58,22 @@ class DayOfWeek(Enum):
     saturday = "Saturday"
     sunday = "Sunday"
 
+    @classmethod
+    def from_weekday_int(cls, weekday: int) -> "DayOfWeek":
+        """Create DayOfWeek object from zero-based integer, compatible with
+        library method date.weekday()
+        """
+        map = {
+            0: cls.monday,
+            1: cls.tuesday,
+            2: cls.wednesday,
+            3: cls.thursday,
+            4: cls.friday,
+            5: cls.saturday,
+            6: cls.sunday
+        }
+        return map[weekday]
+
 
 class OperatingProfile(Element):
     def __repr__(self) -> str:

pytxc/vehicles.py

@@ -4,7 +4,7 @@
 from .elements import Element
 from .journeys import JourneyPatternRef, JourneyPatternTimingLinkRef
 from .operators import OperatorRef
-from .services import LineRef, ServiceRef
+from .services import LineRef, OperatingProfile, ServiceRef
 
 
 class Block(Element):
@@ -110,3 +110,11 @@ def departure_time(self) -> Optional[time]:
     def timing_links(self) -> List[VehicleJourneyTimingLink]:
         path = "VehicleJourneyTimingLink"
         return [VehicleJourneyTimingLink(element) for element in self.find_all(path)]
+
+    @property
+    def operating_profile(self) -> Optional[OperatingProfile]:
+        path = "OperatingProfile"
+        element = self.find(path)
+        if element is not None:
+            return OperatingProfile(element)
+        return None

tests/test_elements.py

@@ -25,3 +25,9 @@ def test_text_none():
     element = etree.fromstring(element_str)
     element.text = None
     assert Element(element).text is None
+
+
+def test_line_number(txc_file):
+    timetable = Timetable.from_file(txc_file)
+    first_stop_point = timetable.stop_points[0]
+    assert first_stop_point.line_number == 5

tests/test_journeys.py

@@ -110,6 +110,10 @@ def test_vehicle_journeys(txc_file):
     block = operational.block
     assert block is None
 
+    operating_profile = journey.operating_profile
+    assert operating_profile is not None
+    assert operating_profile.holidays_only
+
 
 def test_journey_pattern_timing_link_none():
     jp_timing_link_str = """
@@ -164,3 +168,19 @@ def test_vehicle_journey_none_children():
 
     assert vehicle_journey.operational is None
     assert vehicle_journey.departure_time is None
+
+
+def test_operating_profile_none():
+    vehicle_journey_str = """
+    <VehicleJourney xmlns="http://www.transxchange.org.uk/">
+        <OperatingProphet>
+            <RegularDayType>
+              <HolidaysOnly/>
+            </RegularDayType>
+        </OperatingProphet>
+    </VehicleJourney>
+    """
+    element = etree.fromstring(vehicle_journey_str)
+    vehicle_journey = VehicleJourney(element)
+    operating_profile = vehicle_journey.operating_profile
+    assert operating_profile is None

tests/test_services.py

@@ -121,3 +121,10 @@ def test_operating_profile_week_days():
     assert DayOfWeek.thursday in days_of_week
     assert DayOfWeek.friday in days_of_week
     assert operating_profile.holidays_only is False
+
+
+def test_day_of_week_from_int():
+    day = DayOfWeek.from_weekday_int(0)
+    assert day == DayOfWeek.monday
+    day = DayOfWeek.from_weekday_int(6)
+    assert day == DayOfWeek.sunday