Merge branch 'master' into EPIAP

NeTEx-CEN · Apr 15, 2024 · d73dc4a · d73dc4a
2 parents 77fb8e2 + d847bb7
commit d73dc4a
Show file tree

Hide file tree

Showing 39 changed files with 2,438 additions and 3,076 deletions.
diff --git a/README.md b/README.md
diff --git a/change_log.md b/change_log.md
diff --git a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
@@ -12,7 +12,7 @@ Data is (C) Copyright Transport for Lonond  2017-2019
 (C) CEN & Crown Copyright 2018, 2019 
 Free to use under a Creative Commons license.
 
-v1.1 Revised & corrected to use Tariff and simpler ids
+v1.1 Revised & corrected to use Tariff and simpler ids 
 
 ===================================================
 
@@ -5170,7 +5170,7 @@ You can only get these as paper tickets, not on an Oyster card, and they must be
 						<DistributionChannel version="any" id="tfl:Visitor_Centres">
 							<Name>Visitor centres</Name>
 							<PaymentMethods>debitCard creditCard companyCheque cash</PaymentMethods>
-							<DistributionGroupRef version="any" ref="nr:Visitor_Centres"/>
+							<DistributionGroupRef version="any" ref="tfl:Visitor_Centres"/>
 						</DistributionChannel>
 						<DistributionChannel version="any" id="tfl:OverseasAgents">
 							<Name>Overseas Agents centres</Name>
@@ -5196,7 +5196,7 @@ You can't
 	Buy paper tickets (cash single tickets and Day Travelcards)</Description>
 							<!-- TO DO -->
 							<PaymentMethods>debitCard creditCard   cash</PaymentMethods>
-							<DistributionGroupRef ref="nr:OysterTicketShops"/>
+							<DistributionGroupRef version="any" ref="nr:OysterTicketShops"/>
 						</DistributionChannel>
 						<DistributionChannel version="any" id="tfl:Oyster_Online">
 							<Name>Oyster Online</Name>
@@ -15583,6 +15583,13 @@ For more information on National Rail services see the
 								<!--  etc etc -->
 							</members>
 						</GeneralGroupOfEntities>
+						<GeneralGroupOfEntities version="any" id="nr:OysterTicketShops" nameOfMemberClass="OtherOrganisation">
+							<Name>List of registered universties</Name>
+							<members>
+								<OtherOrganisationRef ref="tfl:University_of_London"/>
+								<!--  etc etc -->
+							</members>
+						</GeneralGroupOfEntities>
 					</groupsOfEntities>
 				</ResourceFrame>
 			</frames>

diff --git a/examples/functions/newModes/NewModes-CarClubExample.xml b/examples/functions/newModes/NewModes-CarClubExample.xml
@@ -1074,6 +1074,7 @@ This Shows  sample Purchases
 										<SalesTransaction version="any" id="mct:Cust444@trans005@purchase_single_session">
 											<Name>Book and pay for  1-day use of a car</Name>
 											<Date>2021-10-01T10:10:00</Date>
+											<IsValid>true</IsValid>
 											<TypeOfFareContractEntryRef versionRef="EXTERNAL" ref="fxc:product_purchase"/>
 											<Amount>103.50</Amount>
 											<ruleStepResults>
@@ -1086,6 +1087,7 @@ This Shows  sample Purchases
 												</RuleStepResult>
 											</ruleStepResults>
 											<PaymentMethod>creditCard</PaymentMethod>
+											<CardNumber>1231 0000 0000 0000 0000</CardNumber>
 											<travelSpecifications>
 												<OfferedTravelSpecification version="any" id="mct:Cust444@trans005@purchase_single_session">
 													<Date>2021-10-08T11:15:00</Date>

diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml
@@ -262,6 +262,8 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held
 								</Quay>
 							</quays>
 						</StopPlace>
+					</stopPlaces>
+					<taxiRanks>
 						<TaxiRank version="any" id="alphaville_hdv_taxi">
 							<Name>Taxi Rank at Alphaville Hotel de Ville</Name>
 							<adjacentSites>
@@ -276,7 +278,7 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held
 								</TaxiStand>
 							</taxiStands>
 						</TaxiRank>
-					</stopPlaces>
+					</taxiRanks>
 					<pointsOfInterest>
 						<PointOfInterest version="any" id="alphaville_hdv">
 							<Name>ALphaville Hotel de Ville</Name>

diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
@@ -397,6 +397,8 @@
 								</Quay>
 							</quays>
 						</StopPlace>
+					</stopPlaces>
+					<taxiRanks>
 						<TaxiRank version="any" id="alphaville_hdv_taxi">
 							<Name>Taxi Rank at Alphaville Hotel de Ville</Name>
 							<adjacentSites>
@@ -409,7 +411,7 @@
 								</TaxiStand>
 							</taxiStands>
 						</TaxiRank>
-					</stopPlaces>
+					</taxiRanks>
 					<pointsOfInterest>
 						<PointOfInterest version="any" id="alphaville_hdv">
 							<Name>Alphaville Hotel de Ville</Name>

diff --git a/.../standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml b/.../standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml
@@ -2327,7 +2327,7 @@ BS5 0DZ or email your details to ticketssww@firstgroup</Description>
 </Description>
 							<Url>https://www.firstgroup.com/bristol-bath-and-west/tickets/where-buy</Url>
 							<OperatorRef version="1.0" ref="noc:FBRI">First Somerset &amp; Avon Ltd nocn:136361</OperatorRef>
-							<DistributionGroupRef version="1.0" ref="frst:Travel_shops"/>
+							<DistributionGroupRef version="1.0" ref="frst:travel_shops"/>
 						</DistributionChannel>
 					</distributionChannels>
 					<typesOfTravelDocuments>

diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml
@@ -7380,7 +7380,7 @@ BS5 0DZ or email your details to ticketssww@firstgroup</Description>
 </Description>
 							<Url>https://www.firstgroup.com/bristol-bath-and-west/tickets/where-buy</Url>
 							<OperatorRef version="1.0" ref="noc:FBRI">First Somerset &amp; Avon Ltd nocn:136361</OperatorRef>
-							<DistributionGroupRef version="1.0" ref="frst:Travel_shops"/>
+							<DistributionGroupRef version="1.0" ref="frst:WoE@travel_shops"/>
 						</DistributionChannel>
 					</distributionChannels>
 					<typesOfTravelDocuments>

diff --git a/examples/standards/norway/network/FlexibleLine863-with-connection.xml b/examples/standards/norway/network/FlexibleLine863-with-connection.xml
@@ -359,17 +359,17 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
 							<ScheduledStopPointRef version="any" ref="RUT:ScheduledStopPoint:ID-HANABORG_ST-NORD"/>
 							<FlexibleStopPlaceRef version="any" ref="NHR:FlexibleStopPlace:ID-HANABORG-NORD"/>
 						</FlexibleStopAssignment>
-						<PassengerStopAssignment version="any" order="0" id="RUT:PassengerStopAssignment:ID-HANABORG">
+						<PassengerStopAssignment version="any" order="1" id="RUT:PassengerStopAssignment:ID-HANABORG">
 							<ScheduledStopPointRef version="any" ref="RUT:ScheduledStopPoint:ID-HANABORG_ST"/>
 							<StopPlaceRef version="any" ref="NHR:StopPlace:ID-HANABORG_ST"/>
 							<QuayRef version="any" ref="NHR:Quay:ID-HANABORG_ST-QUAY"/>
 						</PassengerStopAssignment>
-						<PassengerStopAssignment version="any" order="0" id="RUT:PassengerStopAssignment:ID-LORENSKOG">
+						<PassengerStopAssignment version="any" order="1" id="RUT:PassengerStopAssignment:ID-LORENSKOG">
 							<ScheduledStopPointRef ref="RUT:ScheduledStopPoint:ID-LORENSKOG"/>
 							<StopPlaceRef version="any" ref="NHR:StopPlace:ID-LORENSKOGSENTRUM"/>
 							<QuayRef version="any" ref="NHR:Quay:ID-LORENSKOGSENTRUM-QUAY"/>
 						</PassengerStopAssignment>
-						<PassengerStopAssignment version="any" order="0" id="RUT:PassengerStopAssignment:ID-TRIADEN">
+						<PassengerStopAssignment version="any" order="1" id="RUT:PassengerStopAssignment:ID-TRIADEN">
 							<ScheduledStopPointRef version="any" ref="RUT:ScheduledStopPoint:ID-TRIADEN"/>
 							<StopPlaceRef version="any" ref="NHR:StopPlace:ID-TRIADEN-ENTRANCE"/>
 							<QuayRef version="any" ref="NHR:Quay:ID-TRIADEN-ENTRANCE-QUAY"/>
@@ -444,16 +444,16 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
 						</Notice>
 					</notices>
 					<noticeAssignments>
-						<NoticeAssignment version="any" id="RUT:NoticeAssignment:863" order="0">
+						<NoticeAssignment version="any" id="RUT:NoticeAssignment:863" order="1">
 							<NoticeRef ref="RUT:Notice:863"/>
 							<NoticedObjectRef version="any" ref="RUT:StopPointInJourneyPattern:ID-TRIADEN-fraLorenskog"/>
 							<!--NoticedObjectRef ref="RUT:FlexibleLine:863"/-->
 						</NoticeAssignment>
-						<NoticeAssignment version="any" id="RUT:NoticeAssignment:863-TilLorenskog" order="0">
+						<NoticeAssignment version="any" id="RUT:NoticeAssignment:863-TilLorenskog" order="1">
 							<NoticeRef ref="RUT:Notice:863-Henting"/>
 							<NoticedObjectRef ref="RUT:Route:863-TilLorenskog"/>
 						</NoticeAssignment>
-						<NoticeAssignment version="any" id="RUT:NoticeAssignment:863-FraLorenskog" order="0">
+						<NoticeAssignment version="any" id="RUT:NoticeAssignment:863-FraLorenskog" order="1">
 							<NoticeRef ref="RUT:Notice:863-Levering"/>
 							<NoticedObjectRef ref="RUT:Route:863-FraLorenskog"/>
 						</NoticeAssignment>

diff --git a/examples/standards/txc/uk_nap_extract1_minimal.xml b/examples/standards/txc/uk_nap_extract1_minimal.xml
@@ -158,7 +158,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 					</stopAreas>
 					<!--  ======= NaPTAn Stop Data  ======   -->
 					<stopAssignments>
-						<PassengerStopAssignment version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgAdminArea:060" id="naptStop:260010966" order="0">
+						<PassengerStopAssignment version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgAdminArea:060" id="naptStop:260010966" order="1">
 							<ScheduledStopPoint version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgAdminArea:060" id="naptStop:260010966">
 								<Name>Netherley Road</Name>
 								<TimingPointStatus>timingPoint</TimingPointStatus>
@@ -193,7 +193,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 								</quays>
 							</StopPlace>
 						</PassengerStopAssignment>
-						<PassengerStopAssignment version="any" responsibilitySetRef="nptgAdminArea:086" id="naptStop:2400100348" order="0">
+						<PassengerStopAssignment version="any" responsibilitySetRef="nptgAdminArea:086" id="naptStop:2400100348" order="1">
 							<ScheduledStopPoint responsibilitySetRef="nptgAdminArea:086" created="2008-03-10T15:20:00" changed="2008-12-09T15:29:00" modification="revise" version="1" status="active" id="naptStop:2400100348">
 								<Name>White Deer Park Nursing Home</Name>
 								<TimingPointStatus>notTimingPoint</TimingPointStatus>
@@ -235,7 +235,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 							</StopPlace>
 						</PassengerStopAssignment>
 						<!-- ====   -->
-						<PassengerStopAssignment responsibilitySetRef="nptgAdminArea:110" version="1" id="naptStop:9100ABDARE" order="0">
+						<PassengerStopAssignment responsibilitySetRef="nptgAdminArea:110" version="1" id="naptStop:9100ABDARE" order="1">
 							<ScheduledStopPoint responsibilitySetRef="nptgAdminArea:110" created="2006-09-08T14:30:00" changed="2007-09-26T13:00:00" modification="revise" version="1" status="active" id="naptStop:9100ABDARE">
 								<Name>Aberdare Rail Station</Name>
 								<stopAreas>
@@ -324,7 +324,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 								</quays>
 							</StopPlace>
 						</PassengerStopAssignment>
-						<PassengerStopAssignment responsibilitySetRef="nptgAdminArea:110" version="1" id="naptStop:9100ABDO" order="0">
+						<PassengerStopAssignment responsibilitySetRef="nptgAdminArea:110" version="1" id="naptStop:9100ABDO" order="1">
 							<ScheduledStopPoint responsibilitySetRef="nptgAdminArea:110" created="2006-09-08T14:30:00" changed="2007-09-26T13:00:00" modification="revise" version="1" status="active" id="naptStop:9100ABDO">
 								<Name>Aberdour Rail Station</Name>
 								<stopAreas>

diff --git a/examples/standards/txc/uk_nap_naptan_stops_extract1.xml b/examples/standards/txc/uk_nap_naptan_stops_extract1.xml
@@ -213,7 +213,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 					</stopAreas>
 					<!--  ======= NaPTAn Stop Data  ======   -->
 					<stopAssignments>
-						<PassengerStopAssignment version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgUkAdministrativeArea:060" id="naptStop:260010966" order="0">
+						<PassengerStopAssignment version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgUkAdministrativeArea:060" id="naptStop:260010966" order="1">
 							<ScheduledStopPoint version="any" created="2004-06-09T14:20:00-05:00" responsibilitySetRef="nptgUkAdministrativeArea:060" id="naptStop:260010966">
 								<!-- NaPTAN StopPoint.AdministrativeAreaRef>060  -->
 								<Name>Netherley Road</Name>
@@ -259,7 +259,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 								</quays>
 							</StopPlace>
 						</PassengerStopAssignment>
-						<PassengerStopAssignment version="any" responsibilitySetRef="nptgUkAdministrativeArea:086" id="naptStop:2400100348" order="0">
+						<PassengerStopAssignment version="any" responsibilitySetRef="nptgUkAdministrativeArea:086" id="naptStop:2400100348" order="1">
 							<ScheduledStopPoint responsibilitySetRef="nptgUkAdministrativeArea:086" created="2008-03-10T15:20:00" changed="2008-12-09T15:29:00" modification="revise" version="1" status="active" id="naptStop:2400100348">
 								<!-- NAPT_</AtcoCode> -->
 								<!--  NAPT_ <AdministrativeAreaRef> -->
@@ -314,7 +314,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 							</StopPlace>
 						</PassengerStopAssignment>
 						<!-- ====   -->
-						<PassengerStopAssignment responsibilitySetRef="nptgUkAdministrativeArea:110" version="1" id="naptStop:9100ABDARE" order="0">
+						<PassengerStopAssignment responsibilitySetRef="nptgUkAdministrativeArea:110" version="1" id="naptStop:9100ABDARE" order="1">
 							<!-- 
 <StopPoint CreationDateTime="2006-09-08T14:30:00" ModificationDateTime="2007-09-26T13:00:00" Modification="revise" RevisionNumber="1" Status="active">
 			<AtcoCode>9100ABDARE</AtcoCode>
@@ -456,7 +456,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 								</quays>
 							</StopPlace>
 						</PassengerStopAssignment>
-						<PassengerStopAssignment responsibilitySetRef="nptgUkAdministrativeArea:110" version="1" id="naptStop:9100ABDO" order="0">
+						<PassengerStopAssignment responsibilitySetRef="nptgUkAdministrativeArea:110" version="1" id="naptStop:9100ABDO" order="1">
 							<!--
 <StopPoint CreationDateTime="2006-09-08T14:30:00" ModificationDateTime="2007-09-26T13:00:00" Modification="revise" RevisionNumber="1" Status="active">
 			<AtcoCode>9100ABDO</AtcoCode>

diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
@@ -876,12 +876,12 @@ Correct COnstraints for PointOnRoute
 		</xsd:unique>
 		<!-- =====GeneralGroupOfEntities Key ========================== -->
 		<xsd:keyref name="GeneralGroupOfEntities_AnyKeyRef" refer="netex:GeneralGroupOfEntities_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef | DistributionGroupRef"/>
+			<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef | .//netex:DistributionGroupRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="GeneralGroupOfEntities_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GeneralGroupOfEntities"/>
+			<xsd:selector xpath=".//netex:GeneralGroupOfEntities | .//netex:GroupOfPlaces"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -1200,7 +1200,7 @@ Correct COnstraints for PointOnRoute
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="LinkSequence_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Route | .//netex:JourneyPattern | .//netex:TimingPattern | .//netex:ServicePattern | .//netex:ServiceJourneyPattern | .//netex:DeadRunServicePattern | .//netex:NavigationPath"/>
+			<xsd:selector xpath=".//netex:Route | .//netex:JourneyPattern | .//netex:TimingPattern | .//netex:ServicePattern | .//netex:ServiceJourneyPattern | .//netex:NavigationPath"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -6737,18 +6737,18 @@ Correct COnstraints for PointOnRoute
 			<xsd:annotation>
 				<xsd:documentation>Every [ServicePattern Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:ServicePattern | .//netex:DeadRunPattern"/>
+			<xsd:selector xpath=".//netex:ServicePattern"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
 		<!-- =====ServicePattern Key ========================== -->
 		<xsd:keyref name="ServicePattern_KeyRef" refer="netex:ServicePattern_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServicePatternRef | .//netex:DeadRunServicePatternRef"/>
+			<xsd:selector xpath=".//netex:ServicePatternRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="ServicePattern_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServicePattern | .//netex:DeadRunPattern"/>
+			<xsd:selector xpath=".//netex:ServicePattern"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>

diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd
@@ -748,12 +748,12 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 		</xsd:unique>
 		<!-- =====GeneralGroupOfEntities Key ========================== -->
 		<xsd:keyref name="GeneralGroupOfEntities_AnyKeyRef" refer="netex:GeneralGroupOfEntities_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef   | DistributionGroupRef"/>
+			<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef | .//netex:DistributionGroupRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="GeneralGroupOfEntities_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GeneralGroupOfEntities"/>
+			<xsd:selector xpath=".//netex:GeneralGroupOfEntities | .//netex:GroupOfPlaces"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -1080,7 +1080,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="LinkSequence_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Route | .//netex:JourneyPattern | .//netex:TimingPattern | .//netex:ServicePattern | .//netex:ServiceJourneyPattern | .//netex:DeadRunServicePattern | .//netex:NavigationPath"/>
+			<xsd:selector xpath=".//netex:Route | .//netex:JourneyPattern | .//netex:TimingPattern | .//netex:ServicePattern | .//netex:ServiceJourneyPattern | .//netex:NavigationPath"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -5371,18 +5371,18 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:annotation>
 				<xsd:documentation>Every [ServicePattern Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:ServicePattern |.//netex:DeadRunPattern"/>
+			<xsd:selector xpath=".//netex:ServicePattern"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
 		<!-- =====ServicePattern Key ========================== -->
 		<xsd:keyref name="ServicePattern_KeyRef" refer="netex:ServicePattern_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServicePatternRef | .//netex:DeadRunServicePatternRef"/>
+			<xsd:selector xpath=".//netex:ServicePatternRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="ServicePattern_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServicePattern |.//netex:DeadRunPattern"/>
+			<xsd:selector xpath=".//netex:ServicePattern"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>

diff --git a/...tex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd b/...tex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd
@@ -163,9 +163,9 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>A specific USER NEED, i.e. a constraint of a passenger as regards his mobility, e.g. wheelchair, assisted wheelchair, etc.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="PsychosensoryNeed" type="PyschosensoryNeedEnumeration">
+			<xsd:element name="PsychosensoryNeed" type="PsychosensoryNeedEnumeration">
 				<xsd:annotation>
-					<xsd:documentation>Passenger pyschosensory need for which a  suitability specified.</xsd:documentation>
+					<xsd:documentation>Passenger psychosensory need for which a suitability specified.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="MedicalNeed">
@@ -206,7 +206,7 @@ Rail transport, Roads and Road transport
 			<xsd:enumeration value="normal"/>
 		</xsd:restriction>
 	</xsd:simpleType>
-	<xsd:simpleType name="PyschosensoryNeedEnumeration">
+	<xsd:simpleType name="PsychosensoryNeedEnumeration">
 		<xsd:annotation>
 			<xsd:documentation>Allowed values for specific psychosensory needs.</xsd:documentation>
 		</xsd:annotation>