Skip to content

Default nameOfRefClass #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
skinkie wants to merge 8 commits into from
Closed

Default nameOfRefClass #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
622c1bd
Fix formatting
skinkie Apr 21, 2025
f9eabcd
Change the nameOfRefClass to a base type
skinkie Apr 21, 2025
4077137
Revert type change
skinkie Apr 21, 2025
13e1f96
First proposal
skinkie Apr 21, 2025
20487d0
Fix or disable broken examples
skinkie Apr 21, 2025
9df99b1
Lint and update documentation tables
github-actions[bot] Apr 21, 2025
6ef8f71
Merge branch 'next' of github.com:NeTEx-CEN/NeTEx into default_nameof…
skinkie Apr 22, 2025
54e3c0e
Lint and update documentation tables
github-actions[bot] Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/validate-and-lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PARSING_ERROR=0
# Iterate all XML and XSD files
while IFS= read -r -d $'\0' filename; do
# Prettify the file using xmllint and save the result to ${filename}.pretty
if XMLLINT_INDENT=$'\t' xmllint --encode UTF-8 --pretty 1 "${filename}" >"${filename}.pretty"; then
if XMLLINT_INDENT=$'\t' xmllint --encode UTF-8 --format --pretty 1 "${filename}" >"${filename}.pretty"; then
# Remove lines containing the term "xmlspy" to get rid of advertising this and save the result as ${filename}
grep -i -v "xmlspy" "${filename}.pretty" >"${filename}"
else
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/patterns/Netex_KBIC_ParisNetwork_with_bookingArrangements.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ Includes the following:
<RouteRef version="004" ref="spq:Rt001o"/>
<bookingArrangements>
<BookingArrangementRef ref="standard:24h_prior:except_holidays"/>
</bookingArrangements>
</bookingArrangements>
<pointsInSequence>
<StopPointInJourneyPattern version="any" id="ssp:SvPip_001o_01">
<ScheduledStopPointRef version="001" ref="ssp:SSP1"/>
Expand Down
12 changes: 6 additions & 6 deletions examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,26 +455,26 @@ The Calendar is shown coded as
<TimingLink version="any" id="mybus:SSP_001+SSP_001_t1">
<Name>After Alpha t1</Name>
<FromPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_001"/>
<ToPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_001_t1"/>
<ToPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_001_t1"/>
</TimingLink>
<TimingLink version="any" id="mybus:SSP_001_t1+SSP_001_t2">
<Name>After Alpha t1 to After Alpha t2</Name>
<FromPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_001_t1"/>
<ToPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_002_t3"/>
<FromPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_001_t1"/>
<ToPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_002_t3"/>
</TimingLink>
<TimingLink version="any" id="mybus:SSP_001_t2+SSP_002">
<Name>After Alpha t2 to Bravo</Name>
<FromPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_001_t2"/>
<FromPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_001_t2"/>
<ToPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_002"/>
</TimingLink>
<TimingLink version="any" id="mybus:SSP_002+SSP_002_t3">
<Name>Bravo to After Bravo t1</Name>
<FromPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_002"/>
<ToPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_002_t3"/>
<ToPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_002_t3"/>
</TimingLink>
<TimingLink version="any" id="mybus:SSP_002_t3+SSP_077">
<Name>After Bravo t1 to Charley</Name>
<FromPointRef version="any" nameOfRefClass="TimingPointRef" ref="mybus:SSP_002_t3"/>
<FromPointRef version="any" nameOfRefClass="TimingPoint" ref="mybus:SSP_002_t3"/>
<ToPointRef version="any" nameOfRefClass="ScheduledStopPoint" ref="mybus:SSP_077"/>
</TimingLink>
</timingLinks>
Expand Down
2 changes: 2 additions & 0 deletions examples/functions/timetable/Netex_21_Rail_NetworkTimetable_eurostar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3796,6 +3796,7 @@ Q.4. Public holiday - Services do not run on a christams day -
</To>
</Connection>
<!-- ==== ACCESS LINKs === -->
<!-- INVALID!
<Access version="any" id="frnapt:Access:STP_08_fr_MarneLV">
<Description>Marne to Disneyland</Description>
<TransferDuration>
Expand All @@ -3809,6 +3810,7 @@ Q.4. Public holiday - Services do not run on a christams day -
<PlaceRef nameOfRefClass="PointOfInterest" ref="eos:POI_fr_01_Disneyland"/>
</To>
</Access>
-->
<!-- ==== DEFAULT TRANSFER TIMES=== -->
<DefaultConnection version="any" id="eos:DT_SC01_001">
<Description>Allow 30 Minutes to catch Eurostar</Description>
Expand Down
5 changes: 5 additions & 0 deletions xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Reference to a COMPOSITE FRAME.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:simpleType name="NameOfRefClassForCompositeFrameRefStructure">
<xsd:restriction base="NameOfClass">
<xsd:enumeration value="CompositeFrame"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:complexType name="CompositeFrameRefStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>Type for a reference to a COMPOSITE FRAME.</xsd:documentation>
Expand Down
10 changes: 10 additions & 0 deletions xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Reference to a GENERAL FRAME.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:simpleType name="NameOfRefClassForGeneralFrameRefStructure">
<xsd:restriction base="NameOfClass">
<xsd:enumeration value="GeneralFrame"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:complexType name="GeneralFrameRefStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>Type for a reference to a GENERAL FRAME.</xsd:documentation>
Expand Down Expand Up @@ -207,6 +212,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Reference to a GENERAL FRAME MEMBER.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:simpleType name="NameOfRefClassForGeneralFrameMemberRefStructure">
<xsd:restriction base="NameOfClass">
<xsd:enumeration value="GeneralFrameMember"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:complexType name="GeneralFrameMemberRefStructure">
<xsd:annotation>
<xsd:documentation>Type for a reference to a GENERAL FRAME MEMBER.</xsd:documentation>
Expand Down
5 changes: 5 additions & 0 deletions xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ Rail transport, Roads and Road transport
<xsd:documentation> Reference to a RESOURCE FRAME.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:simpleType name="NameOfRefClassForResourceFrameRefStructure">
<xsd:restriction base="NameOfClass">
<xsd:enumeration value="ResourceFrame"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:complexType name="ResourceFrameRefStructure" abstract="false">
<xsd:annotation>
<xsd:documentation>Type for a reference to a RESOURCE FRAME.</xsd:documentation>
Expand Down
5 changes: 5 additions & 0 deletions xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ Rail transport, Roads and Road transport
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:simpleType name="NameOfRefClassForServiceCalendarFrameRefStructure">
<xsd:restriction base="NameOfClass">
<xsd:enumeration value="ServiceCalendarFrame"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:complexType name="ServiceCalendarFrameRefStructure">
<xsd:annotation>
<xsd:documentation>Type for a reference to a SERVICE CALENDAR FRAME.</xsd:documentation>
Expand Down
10 changes: 10 additions & 0 deletions xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Reference to an ACCESSIBILITY ASSESSMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:simpleType name="NameOfRefClassForAccessibilityAssessmentRefStructure">
<xsd:restriction base="NameOfClass">
<xsd:enumeration value="AccessibilityAssessment"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:complexType name="AccessibilityAssessmentRefStructure">
<xsd:annotation>
<xsd:documentation>Type for reference to an ACCESSIBILITY ASSESSMENT.</xsd:documentation>
Expand All @@ -98,6 +103,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="nameOfRefClass" use="optional" type="NameOfRefClassForAccessibilityAssessmentRefStructure" fixed="AccessibilityAssessment">
<xsd:annotation>
<xsd:documentation>The natural class for AccessibilityAssessmentRefStructure, automatically updated.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
Expand Down
13 changes: 9 additions & 4 deletions xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,25 @@ Rail transport, Roads and Road transport
<xsd:documentation>Reference to an ALTERNATIVE NAME.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:simpleType name="NameOfRefClassForAlternativeNameRefStructure">
<xsd:restriction base="NameOfClass">
<xsd:enumeration value="AlternativeName"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:complexType name="AlternativeNameRefStructure">
<xsd:annotation>
<xsd:documentation>Type for a reference to an ALTERNATIVE NAME.</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="VersionOfObjectRefStructure">
<xsd:attribute name="nameOfRefClass" type="NameOfClass" use="optional">
<xsd:attribute name="ref" type="AlternativeNameIdType" use="required">
<xsd:annotation>
<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each ENTITY type.</xsd:documentation>
<xsd:documentation>Identifier of an ALTERNATIVE NAME.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="ref" type="AlternativeNameIdType" use="required">
<xsd:attribute name="nameOfRefClass" use="optional" type="NameOfRefClassForAlternativeNameRefStructure" fixed="AlternativeName">
<xsd:annotation>
<xsd:documentation>Identifier of an ALTERNATIVE NAME.</xsd:documentation>
<xsd:documentation>The natural class for AlternativeNameRefStructure, automatically updated.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
Expand Down
53 changes: 53 additions & 0 deletions xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,54 @@ Rail transport, Roads and Road transport
<xsd:documentation>Reference to a ASSIGNMENT.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:simpleType name="NameOfRefClassForAssignmentRefStructure">
<xsd:restriction base="NameOfClass">
<xsd:enumeration value="AccessRightParameterAssignment"/>
<xsd:enumeration value="ActivationAssignment"/>
<xsd:enumeration value="Assignment"/>
<xsd:enumeration value="CheckConstraint"/>
<xsd:enumeration value="CheckConstraintDelay"/>
<xsd:enumeration value="CheckConstraintThroughput"/>
<xsd:enumeration value="CustomerPurchaseParameterAssignment"/>
<xsd:enumeration value="DayTypeAssignment"/>
<xsd:enumeration value="DeckPlanAssignment"/>
<xsd:enumeration value="DisplayAssignment"/>
<xsd:enumeration value="DistributionAssignment"/>
<xsd:enumeration value="DynamicStopAssignment"/>
<xsd:enumeration value="DynamicVehicleMeetingPointAssignment"/>
<xsd:enumeration value="GenericParameterAssignment"/>
<xsd:enumeration value="InfrastructureLinkRestriction"/>
<xsd:enumeration value="JourneyAccounting"/>
<xsd:enumeration value="MeetingRestriction"/>
<xsd:enumeration value="NetworkRestriction"/>
<xsd:enumeration value="NoticeAssignment"/>
<xsd:enumeration value="OvertakingPossibility"/>
<xsd:enumeration value="PassengerBoardingPositionAssignment"/>
<xsd:enumeration value="PassengerStopAssignment"/>
<xsd:enumeration value="RechargingPointAssignment"/>
<xsd:enumeration value="RestrictedManoeuvre"/>
<xsd:enumeration value="SalesNoticeAssignment"/>
<xsd:enumeration value="SalesOfferPackageSubstitution"/>
<xsd:enumeration value="ServiceExclusion"/>
<xsd:enumeration value="SpecificParameterAssignment"/>
<xsd:enumeration value="StopAssignment"/>
<xsd:enumeration value="TaxiServicePlaceAssignment"/>
<xsd:enumeration value="TimeDemandTypeAssignment"/>
<xsd:enumeration value="TrainComponentLabelAssignment"/>
<xsd:enumeration value="TrainComponentStopAssignment"/>
<xsd:enumeration value="TrainStopAssignment"/>
<xsd:enumeration value="TransferRestriction"/>
<xsd:enumeration value="ValidityParameterAssignment"/>
<xsd:enumeration value="VehicleAccessCredentialsAssignment"/>
<xsd:enumeration value="VehicleJourneyStopAssignment"/>
<xsd:enumeration value="VehicleMeetingPointAssignment"/>
<xsd:enumeration value="VehiclePoolingPlaceAssignment"/>
<xsd:enumeration value="VehicleServicePlaceAssignment"/>
<xsd:enumeration value="VehicleSharingPlaceAssignment"/>
<xsd:enumeration value="VehicleTypeAtPoint"/>
<xsd:enumeration value="VehicleTypeStopAssignment"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:complexType name="AssignmentRefStructure">
<xsd:annotation>
<xsd:documentation>Type for a versioned reference to a NeTEx Object.</xsd:documentation>
Expand All @@ -74,6 +122,11 @@ Rail transport, Roads and Road transport
<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="nameOfRefClass" use="optional" type="NameOfRefClassForAssignmentRefStructure" default="Assignment">
<xsd:annotation>
<xsd:documentation>The natural class for AssignmentRefStructure and alternative options, automatically updated. Must be provided when referencing an other class.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
Expand Down
Loading