Corrections to NeTEx examples for casing and refs VVS, Normal, etc (#745

) * Corrections to examples Upper case values retained as deprecated * Update netex_responsibility_support.xsd * Update netex_responsibility_support.xsd * Lint and update documentation tables --------- Co-authored-by: Matthias Günter <[email protected]> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
NeTEx-CEN · Jul 26, 2024 · c532097 · c532097
1 parent c00ccdd
commit c532097
Show file tree

Hide file tree

Showing 26 changed files with 96 additions and 70 deletions.
diff --git a/examples/functions/fares/rail/Netex_era_crossborder_de.xml b/examples/functions/fares/rail/Netex_era_crossborder_de.xml
@@ -1573,7 +1573,7 @@ issued to DB ticket vending machines.</Description>
 							<Name>Trilex Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="tlx:products@TLX">
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="db:TLX" version="any"/>
 									<ResponsibleAreaRef ref="tlx:de" versionRef="TODO"/>
 								</ResponsibilityRoleAssignment>
@@ -1583,7 +1583,7 @@ issued to DB ticket vending machines.</Description>
 							<Name>Trilex Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="tlx-t:sales@TLX">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="db:TLX" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
@@ -1796,7 +1796,7 @@ The ZVON bicycle day pass and monthly pass is valid in conjunction with the ZVON
 							<Name>Trilex Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="vvo:products@VVO">
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="db:VVO" version="any"/>
 									<ResponsibleAreaRef ref="vvo:de" versionRef="TODO"/>
 								</ResponsibilityRoleAssignment>
@@ -1950,7 +1950,7 @@ Example: If you are traveling with the trilex from Hainewalde to Zittau and tran
 							<Name>Trilex Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="zvo:products@ZVON">
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="db:ZVON" version="any"/>
 									<ResponsibleAreaRef ref="zvo:de" versionRef="TODO"/>
 								</ResponsibilityRoleAssignment>
@@ -3104,7 +3104,7 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in
 							<Name>National Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="db:products@DB">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:0080" version="any"/>
 									<ResponsibleAreaRef ref="dbn:de" versionRef="TODO"/>
 								</ResponsibilityRoleAssignment>
@@ -3114,7 +3114,7 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in
 							<Name>National Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="dbn:network@DB">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:0080" version="any"/>
 									<ResponsibleAreaRef ref="dbn:de" versionRef="TODO"/>
 								</ResponsibilityRoleAssignment>
@@ -3271,7 +3271,7 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in
 							<Name>National Rail Stations</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="uic:Station_Management@0080">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:Station_Management@0080" version="any"/>
 									<ResponsibleAreaRef ref="dbn:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -3282,7 +3282,7 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="eura:code_sets@EURA">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>DataRegistrar</StakeholderRoleType>
+									<StakeholderRoleType>dataRegistrar</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="eura:EURA" version="any"/>
 									<ResponsibleAreaRef ref="eura:Europe">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>

diff --git a/examples/functions/fares/rail/Netex_era_distance_ro.xml b/examples/functions/fares/rail/Netex_era_distance_ro.xml
@@ -7652,7 +7652,7 @@ State Secretariat for Revolutionary Issues in December 1989: : 12 free roun
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="tfc:tfc_products:TFC">
 									<DataRoleType>creates aggregates distributes</DataRoleType>
-									<StakeholderRoleType>FareManagement</StakeholderRoleType>
+									<StakeholderRoleType>fareManagement</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:3181" version="any"/>
 									<ResponsibleAreaRef ref="tfc_region">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -7663,7 +7663,7 @@ State Secretariat for Revolutionary Issues in December 1989: : 12 free roun
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="tfc_t:tfc_sales">
 									<DataRoleType>creates aggregates distributes</DataRoleType>
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:3181" version="any"/>
 									<ResponsibleAreaRef ref="tfc_region">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -8300,7 +8300,7 @@ c
 							<Name>National Rail Stations</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="uic_station_management:0070">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic_station_management:0070" version="any"/>
 									<ResponsibleAreaRef ref="atoc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -8311,7 +8311,7 @@ c
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="eura:code_sets">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>DataRegistrar</StakeholderRoleType>
+									<StakeholderRoleType>dataRegistrar</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="eura:EURA" version="any"/>
 									<ResponsibleAreaRef ref="eura:Europe">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>

diff --git a/examples/functions/fares/rail/Netex_era_toc_uk.xml b/examples/functions/fares/rail/Netex_era_toc_uk.xml
@@ -7193,7 +7193,7 @@ A: Yes. You will, however, need to complete a new mature student application for
 							<Name>Greater Anglia products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="abga:products:LT">
-									<StakeholderRoleType>FareManagement</StakeholderRoleType>
+									<StakeholderRoleType>fareManagement</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="atc:LT" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -7203,7 +7203,7 @@ A: Yes. You will, however, need to complete a new mature student application for
 							<Name>Greater Anglia sales data</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="abga:sales:LT">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="atc:LT" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -8830,17 +8830,17 @@ Short Term (1/4/18-1/6/18): £135.00	Short term (1/4-1/6): £230.00d with this g
 							<Name>Plus Bus Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="jsp:products">
-									<StakeholderRoleType>FareManagement</StakeholderRoleType>
+									<StakeholderRoleType>fareManagement</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="jsp:JSP" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
 							</roles>
 						</ResponsibilitySet>
 						<ResponsibilitySet version="any" id="nptg:tariff_zones">
-							<Name>Plus Bus Tarff Zones</Name>
+							<Name>Plus Bus Tariff Zones</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="nptg:tariff_zones">
-									<StakeholderRoleType>FareManagement</StakeholderRoleType>
+									<StakeholderRoleType>fareManagement</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="nptg:DfT" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -11451,7 +11451,7 @@ http://www.nationalrail.co.uk/stations_destinations/44863.aspx
 							<Name>National Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="atc:products:NRE">
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="atc:Consortium:NRE" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -11930,7 +11930,7 @@ West Midlands Railway
 							<Name>National Rail Stations</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="uic:Station_Management@0070">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:Station_Management@0070" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -11941,7 +11941,7 @@ West Midlands Railway
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="eura:code_sets:EURA">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>DataRegistrar</StakeholderRoleType>
+									<StakeholderRoleType>dataRegistrar</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="eura:EURA" version="any"/>
 									<ResponsibleAreaRef ref="eura:Europe">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>

diff --git a/examples/standards/efp/VVS_Fares_V1-nk1.xml b/examples/standards/efp/VVS_Fares_V1-nk1.xml
@@ -865,11 +865,11 @@ Zones		Price	HandyTicket	Price	HandyTicket
 							<PrivateCode>SVE</PrivateCode>
 							<roles>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:1" version="any">
-									<StakeholderRoleType>EntityLegalOwnership</StakeholderRoleType>
+									<StakeholderRoleType>entityLegalOwnership</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:2" version="any">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>

diff --git a/examples/standards/efp/VVS_Fares_V1-nk2.xml b/examples/standards/efp/VVS_Fares_V1-nk2.xml
@@ -534,11 +534,11 @@ tariff zone plan). The VVS conditions of carriage and tariff regulations apply.
 							<PrivateCode>SVE</PrivateCode>
 							<roles>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:1" version="any">
-									<StakeholderRoleType>EntityLegalOwnership</StakeholderRoleType>
+									<StakeholderRoleType>entityLegalOwnership</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:2" version="any">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>

diff --git a/examples/standards/efp/VVS_Fares_V1.xml b/examples/standards/efp/VVS_Fares_V1.xml
@@ -385,11 +385,11 @@ There are some other exceptions:
 							<PrivateCode>SVE</PrivateCode>
 							<roles>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:1" version="any">
-									<StakeholderRoleType>EntityLegalOwnership</StakeholderRoleType>
+									<StakeholderRoleType>entityLegalOwnership</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:2" version="any">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>

diff --git a/examples/standards/norway/network/FlexibleLine863-with-connection.xml b/examples/standards/norway/network/FlexibleLine863-with-connection.xml
@@ -355,7 +355,7 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
 						</Connection>
 					</connections>
 					<stopAssignments>
-						<FlexibleStopAssignment version="any" id="RUT:PassengerStopAssignment:ID-HANABORG">
+						<FlexibleStopAssignment version="any" id="RUT:PassengerStopAssignment:ID-HANABORG" order="1">
 							<ScheduledStopPointRef version="any" ref="RUT:ScheduledStopPoint:ID-HANABORG_ST-NORD"/>
 							<FlexibleStopPlaceRef version="any" ref="NHR:FlexibleStopPlace:ID-HANABORG-NORD"/>
 						</FlexibleStopAssignment>
@@ -508,19 +508,19 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
 							<JourneyPatternRef ref="RUT:JourneyPattern:863-TilLorenskog"/>
 							<FlexibleLineRef ref="RUT:FlexibleLine:863"/>
 							<passingTimes>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-TilLorenskog_1">
 									<!-- Flexi-sone (sted og tid avtales ved bestilling) -->
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-HANABORG-NORD-tilLorenskog" version="any"/>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-TilLorenskog_2">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-HANABORG_ST-tilLorenskog" version="any"/>
 									<ArrivalTime>10:15:00</ArrivalTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-TilLorenskog_3">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-LORENSKOG-tilLorenskog" version="any"/>
 									<ArrivalTime>10:20:00</ArrivalTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-TilLorenskog_4">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-TRIADEN-tilLorenskog" version="any"/>
 									<ArrivalTime>10:25:00</ArrivalTime>
 								</TimetabledPassingTime>
@@ -533,19 +533,19 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
 							<JourneyPatternRef ref="RUT:JourneyPattern:863-FraLorenskog"/>
 							<FlexibleLineRef ref="RUT:FlexibleLine:863"/>
 							<passingTimes>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-FraLorenskog_01">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-TRIADEN-fraLorenskog" version="any"/>
 									<DepartureTime>12:25:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-FraLorenskog_02">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-LORENSKOG-fraLorenskog" version="any"/>
 									<DepartureTime>12:30:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-FraLorenskog_03">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-HANABORG_ST-fraLorenskog" version="any"/>
 									<DepartureTime>12:35:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-FraLorenskog_04">
 									<!-- Flexi-sone (leveringssted avtales ved bestilling) -->
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-HANABORG-NORD-fraLorenskog" version="any"/>
 								</TimetabledPassingTime>

diff --git a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml
@@ -366,7 +366,7 @@ attribution002,0,1,Transdev,12345
 							<Name>Transport For Ireland</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="attribution001">
-									<StakeholderRoleType>Planning</StakeholderRoleType>
+									<StakeholderRoleType>planning</StakeholderRoleType>
 									<ResponsibleOrganisationRef version="any" ref="noc:10000"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
@@ -375,7 +375,7 @@ attribution002,0,1,Transdev,12345
 							<Name>Transdev</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="attribution002">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef version="any" ref="noc:12345"/>
 								</ResponsibilityRoleAssignment>
 							</roles>

diff --git a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml
@@ -369,7 +369,7 @@ attribution002,0,1,Transdev,12345
 							<Name>Transport For Ireland</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="attribution001">
-									<StakeholderRoleType>Planning</StakeholderRoleType>
+									<StakeholderRoleType>planning</StakeholderRoleType>
 									<ResponsibleOrganisationRef version="any" ref="noc:10000"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
@@ -378,7 +378,7 @@ attribution002,0,1,Transdev,12345
 							<Name>Transdev</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="attribution002">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef version="any" ref="noc:12345"/>
 								</ResponsibilityRoleAssignment>
 							</roles>

diff --git a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml
@@ -67,7 +67,7 @@
 							<roles>
 								<ResponsibilityRoleAssignment version="op:1.04" id="op:Operator_stop_data">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="noc:01" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>

diff --git a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml
@@ -74,7 +74,7 @@ This Example shows an extract of  encoding a single  Operator  data     encoded
 							<roles>
 								<ResponsibilityRoleAssignment version="op:1.04" id="op:Operator_stop_data">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="noc:01" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>