chore: Update netex repo

netex/models/__init__.py

@@ -494,7 +494,6 @@
 from .call import Call
 from .call_abstract import CallAbstract
 from .call_versioned_child_structure import CallVersionedChildStructure
-from .call_z import CallZ
 from .calls_rel_structure import CallsRelStructure
 from .cancelling import Cancelling
 from .cancelling_ref import CancellingRef
@@ -1154,7 +1153,6 @@
 from .dated_call_versioned_child_structure import (
     DatedCallVersionedChildStructure,
 )
-from .dated_call_z import DatedCallZ
 from .dated_calls_rel_structure import DatedCallsRelStructure
 from .dated_passing_time import DatedPassingTime
 from .dated_passing_time_versioned_child_structure import (
@@ -3891,6 +3889,7 @@
 from .property_of_day import PropertyOfDay
 from .property_of_day_structure import PropertyOfDayStructure
 from .propulsion_type_enumeration import PropulsionTypeEnumeration
+from .psychosensory_need_enumeration import PsychosensoryNeedEnumeration
 from .public_use_enumeration import PublicUseEnumeration
 from .publication_delivery import PublicationDelivery
 from .publication_delivery_structure import PublicationDeliveryStructure
@@ -3929,7 +3928,6 @@
 from .purposes_of_grouping_in_frame_rel_structure import (
     PurposesOfGroupingInFrameRelStructure,
 )
-from .pyschosensory_need_enumeration import PyschosensoryNeedEnumeration
 from .quality_structure_factor import QualityStructureFactor
 from .quality_structure_factor_abstract import QualityStructureFactorAbstract
 from .quality_structure_factor_price import QualityStructureFactorPrice
@@ -5066,6 +5064,7 @@
 from .taxi_rank_ref_structure import TaxiRankRefStructure
 from .taxi_rank_refs_rel_structure import TaxiRankRefsRelStructure
 from .taxi_rank_version_structure import TaxiRankVersionStructure
+from .taxi_ranks_in_frame_rel_structure import TaxiRanksInFrameRelStructure
 from .taxi_service import TaxiService
 from .taxi_service_place_assignment import TaxiServicePlaceAssignment
 from .taxi_service_place_assignment_ref import TaxiServicePlaceAssignmentRef
@@ -5723,7 +5722,7 @@
 from .type_of_frame_ref import TypeOfFrameRef
 from .type_of_frame_ref_structure import TypeOfFrameRefStructure
 from .type_of_frame_refs_rel_structure import TypeOfFrameRefsRelStructure
-from .type_of_infolink_enumeration import TypeOfInfolinkEnumeration
+from .type_of_info_link_enumeration import TypeOfInfoLinkEnumeration
 from .type_of_journey_pattern import TypeOfJourneyPattern
 from .type_of_journey_pattern_ref import TypeOfJourneyPatternRef
 from .type_of_journey_pattern_ref_structure import (
@@ -7097,7 +7096,6 @@
     "Call",
     "CallAbstract",
     "CallVersionedChildStructure",
-    "CallZ",
     "CallsRelStructure",
     "Cancelling",
     "CancellingRef",
@@ -7515,7 +7513,6 @@
     "DataSupplyRequestStructure",
     "DatedCall",
     "DatedCallVersionedChildStructure",
-    "DatedCallZ",
     "DatedCallsRelStructure",
     "DatedPassingTime",
     "DatedPassingTimeVersionedChildStructure",
@@ -9310,6 +9307,7 @@
     "PropertyOfDay",
     "PropertyOfDayStructure",
     "PropulsionTypeEnumeration",
+    "PsychosensoryNeedEnumeration",
     "PublicUseEnumeration",
     "PublicationDelivery",
     "PublicationDeliveryStructure",
@@ -9336,7 +9334,6 @@
     "PurposeOfJourneyPartitionRefStructure",
     "PurposeOfJourneyPartitionValueStructure",
     "PurposesOfGroupingInFrameRelStructure",
-    "PyschosensoryNeedEnumeration",
     "QualityStructureFactor",
     "QualityStructureFactorAbstract",
     "QualityStructureFactorPrice",
@@ -10113,6 +10110,7 @@
     "TaxiRankRefStructure",
     "TaxiRankRefsRelStructure",
     "TaxiRankVersionStructure",
+    "TaxiRanksInFrameRelStructure",
     "TaxiService",
     "TaxiServicePlaceAssignment",
     "TaxiServicePlaceAssignmentRef",
@@ -10528,7 +10526,7 @@
     "TypeOfFrameRef",
     "TypeOfFrameRefStructure",
     "TypeOfFrameRefsRelStructure",
-    "TypeOfInfolinkEnumeration",
+    "TypeOfInfoLinkEnumeration",
     "TypeOfJourneyPattern",
     "TypeOfJourneyPatternRef",
     "TypeOfJourneyPatternRefStructure",

netex/models/calls_rel_structure.py

@@ -2,9 +2,7 @@
 from typing import List, Union
 
 from .call import Call
-from .call_z import CallZ
 from .dated_call import DatedCall
-from .dated_call_z import DatedCallZ
 from .strict_containment_aggregation_structure import (
     StrictContainmentAggregationStructure,
 )
@@ -17,26 +15,16 @@ class CallsRelStructure(StrictContainmentAggregationStructure):
     class Meta:
         name = "calls_RelStructure"
 
-    call: List[Union[DatedCallZ, DatedCall, CallZ, Call]] = field(
+    call: List[Union[DatedCall, Call]] = field(
         default_factory=list,
         metadata={
             "type": "Elements",
             "choices": (
-                {
-                    "name": "DatedCall-Z",
-                    "type": DatedCallZ,
-                    "namespace": "http://www.netex.org.uk/netex",
-                },
                 {
                     "name": "DatedCall",
                     "type": DatedCall,
                     "namespace": "http://www.netex.org.uk/netex",
                 },
-                {
-                    "name": "Call-Z",
-                    "type": CallZ,
-                    "namespace": "http://www.netex.org.uk/netex",
-                },
                 {
                     "name": "Call",
                     "type": Call,

netex/models/info_link_structure.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 from typing import List, Optional
 
-from .type_of_infolink_enumeration import TypeOfInfolinkEnumeration
+from .type_of_info_link_enumeration import TypeOfInfoLinkEnumeration
 
 __NAMESPACE__ = "http://www.netex.org.uk/netex"
 
@@ -14,7 +14,7 @@ class InfoLinkStructure:
             "required": True,
         },
     )
-    type_of_info_link: List[TypeOfInfolinkEnumeration] = field(
+    type_of_info_link: List[TypeOfInfoLinkEnumeration] = field(
         default_factory=list,
         metadata={
             "name": "typeOfInfoLink",

netex/models/journey_patterns_in_frame_rel_structure.py

@@ -3,7 +3,6 @@
 
 from .containment_aggregation_structure import ContainmentAggregationStructure
 from .dead_run_journey_pattern import DeadRunJourneyPattern
-from .journey_pattern_view import JourneyPatternView
 from .sections_in_sequence_rel_structure import JourneyPattern
 from .service_journey_pattern import ServiceJourneyPattern
 
@@ -15,13 +14,8 @@ class JourneyPatternsInFrameRelStructure(ContainmentAggregationStructure):
     class Meta:
         name = "journeyPatternsInFrame_RelStructure"
 
-    choice: List[
-        Union[
-            ServiceJourneyPattern,
-            DeadRunJourneyPattern,
-            JourneyPattern,
-            JourneyPatternView,
-        ]
+    journey_pattern: List[
+        Union[ServiceJourneyPattern, DeadRunJourneyPattern, JourneyPattern]
     ] = field(
         default_factory=list,
         metadata={
@@ -42,11 +36,6 @@ class Meta:
                     "type": JourneyPattern,
                     "namespace": "http://www.netex.org.uk/netex",
                 },
-                {
-                    "name": "JourneyPatternView",
-                    "type": JourneyPatternView,
-                    "namespace": "http://www.netex.org.uk/netex",
-                },
             ),
         },
     )

netex/models/line_version_structure.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional, Union
+from typing import List, Optional
 
 from .accessibility_assessment import AccessibilityAssessment
 from .all_vehicle_modes_of_transport_enumeration import (
@@ -118,24 +118,20 @@ class Meta:
             "namespace": "http://www.netex.org.uk/netex",
         },
     )
-    authority_ref_or_operator_ref: Optional[
-        Union[AuthorityRef, OperatorRef]
-    ] = field(
+    authority_ref: Optional[AuthorityRef] = field(
         default=None,
         metadata={
-            "type": "Elements",
-            "choices": (
-                {
-                    "name": "AuthorityRef",
-                    "type": AuthorityRef,
-                    "namespace": "http://www.netex.org.uk/netex",
-                },
-                {
-                    "name": "OperatorRef",
-                    "type": OperatorRef,
-                    "namespace": "http://www.netex.org.uk/netex",
-                },
-            ),
+            "name": "AuthorityRef",
+            "type": "Element",
+            "namespace": "http://www.netex.org.uk/netex",
+        },
+    )
+    operator_ref: Optional[OperatorRef] = field(
+        default=None,
+        metadata={
+            "name": "OperatorRef",
+            "type": "Element",
+            "namespace": "http://www.netex.org.uk/netex",
         },
     )
     additional_operators: Optional[TransportOrganisationRefsRelStructure] = (

netex/models/pyschosensory_need_enumeration.py → netex/models/psychosensory_need_enumeration.py

@@ -3,7 +3,7 @@
 __NAMESPACE__ = "http://www.netex.org.uk/netex"
 
 
-class PyschosensoryNeedEnumeration(Enum):
+class PsychosensoryNeedEnumeration(Enum):
     VISUAL_IMPAIRMENT = "visualImpairment"
     AUDITORY_IMPAIRMENT = "auditoryImpairment"
     COGNITIVE_INPUT_IMPAIRMENT = "cognitiveInputImpairment"

netex/models/service_patterns_in_frame_rel_structure.py

@@ -1,8 +1,7 @@
 from dataclasses import dataclass, field
-from typing import List, Union
+from typing import List
 
 from .containment_aggregation_structure import ContainmentAggregationStructure
-from .journey_pattern_view import JourneyPatternView
 from .service_pattern import ServicePattern
 
 __NAMESPACE__ = "http://www.netex.org.uk/netex"
@@ -13,23 +12,12 @@ class ServicePatternsInFrameRelStructure(ContainmentAggregationStructure):
     class Meta:
         name = "servicePatternsInFrame_RelStructure"
 
-    service_pattern_or_journey_pattern_view: List[
-        Union[ServicePattern, JourneyPatternView]
-    ] = field(
+    service_pattern: List[ServicePattern] = field(
         default_factory=list,
         metadata={
-            "type": "Elements",
-            "choices": (
-                {
-                    "name": "ServicePattern",
-                    "type": ServicePattern,
-                    "namespace": "http://www.netex.org.uk/netex",
-                },
-                {
-                    "name": "JourneyPatternView",
-                    "type": JourneyPatternView,
-                    "namespace": "http://www.netex.org.uk/netex",
-                },
-            ),
+            "name": "ServicePattern",
+            "type": "Element",
+            "namespace": "http://www.netex.org.uk/netex",
+            "min_occurs": 1,
         },
     )

netex/models/site_version_frame_structure.py

@@ -42,6 +42,7 @@
 )
 from .stop_places_in_frame_rel_structure import StopPlacesInFrameRelStructure
 from .tariff_zones_in_frame_rel_structure import TariffZonesInFrameRelStructure
+from .taxi_ranks_in_frame_rel_structure import TaxiRanksInFrameRelStructure
 from .topographic_places_in_frame_rel_structure import (
     TopographicPlacesInFrameRelStructure,
 )
@@ -111,6 +112,14 @@ class Meta:
             },
         )
     )
+    taxi_ranks: Optional[TaxiRanksInFrameRelStructure] = field(
+        default=None,
+        metadata={
+            "name": "taxiRanks",
+            "type": "Element",
+            "namespace": "http://www.netex.org.uk/netex",
+        },
+    )
     points_of_interest: Optional[PointsOfInterestInFrameRelStructure] = field(
         default=None,
         metadata={

netex/models/stop_places_in_frame_rel_structure.py

@@ -1,9 +1,8 @@
 from dataclasses import dataclass, field
-from typing import List, Union
+from typing import List
 
 from .containment_aggregation_structure import ContainmentAggregationStructure
 from .stop_place import StopPlace
-from .taxi_rank import TaxiRank
 
 __NAMESPACE__ = "http://www.netex.org.uk/netex"
 
@@ -13,21 +12,12 @@ class StopPlacesInFrameRelStructure(ContainmentAggregationStructure):
     class Meta:
         name = "stopPlacesInFrame_RelStructure"
 
-    stop_place: List[Union[TaxiRank, StopPlace]] = field(
+    stop_place: List[StopPlace] = field(
         default_factory=list,
         metadata={
-            "type": "Elements",
-            "choices": (
-                {
-                    "name": "TaxiRank",
-                    "type": TaxiRank,
-                    "namespace": "http://www.netex.org.uk/netex",
-                },
-                {
-                    "name": "StopPlace",
-                    "type": StopPlace,
-                    "namespace": "http://www.netex.org.uk/netex",
-                },
-            ),
+            "name": "StopPlace",
+            "type": "Element",
+            "namespace": "http://www.netex.org.uk/netex",
+            "min_occurs": 1,
         },
     )

netex/models/taxi_ranks_in_frame_rel_structure.py

@@ -0,0 +1,23 @@
+from dataclasses import dataclass, field
+from typing import List
+
+from .containment_aggregation_structure import ContainmentAggregationStructure
+from .taxi_rank import TaxiRank
+
+__NAMESPACE__ = "http://www.netex.org.uk/netex"
+
+
+@dataclass
+class TaxiRanksInFrameRelStructure(ContainmentAggregationStructure):
+    class Meta:
+        name = "taxiRanksInFrame_RelStructure"
+
+    taxi_rank: List[TaxiRank] = field(
+        default_factory=list,
+        metadata={
+            "name": "TaxiRank",
+            "type": "Element",
+            "namespace": "http://www.netex.org.uk/netex",
+            "min_occurs": 1,
+        },
+    )