From ae1194d3c1c986f90f9f5df121781de7d0ca2801 Mon Sep 17 00:00:00 2001
From: Kristian Syversen <kristian.syversen@entur.org>
Date: Fri, 30 Oct 2020 10:08:20 +0100
Subject: [PATCH 1/2] Add choice of embbed DistanceMatrixElement (in addition
 to DistanceMatrixElementRef) to GenericParameterAssignment

---
 .../part3_fares/netex_accessRightParameter_version.xsd       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
index 962c688a4..b670e3e89 100644
--- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
@@ -250,7 +250,10 @@ Rail transport, Roads and Road transport
 			<xsd:element ref="TariffRef" minOccurs="0"/>
 			<xsd:element ref="FareStructureElementRef" minOccurs="0"/>
 			<xsd:element ref="FareElementInSequenceRef" minOccurs="0"/>
-			<xsd:element ref="DistanceMatrixElementRef" minOccurs="0"/>
+			<xsd:choice  minOccurs="0">
+				<xsd:element ref="DistanceMatrixElementRef"/>
+				<xsd:element ref="DistanceMatrixElement"/>
+			</xsd:choice>
 			<xsd:element ref="DistanceMatrixElementInverseRef" minOccurs="0"/>
 			<xsd:element ref="DistanceMatrixElementView" minOccurs="0"/>
 			<xsd:element ref="SalesOfferPackageRef" minOccurs="0"/>

From e8a84d60bc661809179f3ab2c2b28f118659db7f Mon Sep 17 00:00:00 2001
From: Kristian Syversen <kristian.syversen@entur.org>
Date: Fri, 30 Oct 2020 10:08:20 +0100
Subject: [PATCH 2/2] Add choice of embbed DistanceMatrixElement (in addition
 to DistanceMatrixElementRef) for ParameterAssignment

---
 .../part3_fares/netex_accessRightParameter_version.xsd       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
index 962c688a4..b670e3e89 100644
--- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
@@ -250,7 +250,10 @@ Rail transport, Roads and Road transport
 			<xsd:element ref="TariffRef" minOccurs="0"/>
 			<xsd:element ref="FareStructureElementRef" minOccurs="0"/>
 			<xsd:element ref="FareElementInSequenceRef" minOccurs="0"/>
-			<xsd:element ref="DistanceMatrixElementRef" minOccurs="0"/>
+			<xsd:choice  minOccurs="0">
+				<xsd:element ref="DistanceMatrixElementRef"/>
+				<xsd:element ref="DistanceMatrixElement"/>
+			</xsd:choice>
 			<xsd:element ref="DistanceMatrixElementInverseRef" minOccurs="0"/>
 			<xsd:element ref="DistanceMatrixElementView" minOccurs="0"/>
 			<xsd:element ref="SalesOfferPackageRef" minOccurs="0"/>