TransmodelEcosystem · skinkie · Aug 12, 2021 · Jun 21, 2020 · Jun 21, 2020 · Jun 21, 2020
diff --git a/README.md b/README.md
@@ -3,6 +3,29 @@
 
 ## Core, Part 1 (Network),  Part 2 (Timetables), Part3 (Fares) Schemas
 
+Version 1.20 - Base version plus  further minor fixes comprising##
+
+
+FIX -  FareClassEnumeration #100
+### 2020.07.28   FIX  Issue #100*FRAMEWORK*:Corect the substitution group on OrganisationUnit
+	* netex_framework/netex_genericFramework/netex_organisation_version.xsd
+
+FIX -  FareClassEnumeration #75
+### 2020.06.21   FIX  Issue #75*FRAMEWORK*:Remove space from end of secondClass enumeration value
+	* netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd
+
+FIX -  Recursive includes #73
+### 2020.06.21 PARTIAL  FIX  Issue #73*PART2*:Recursive includes: NJSK  Remove cyclic inclusion dependency  
+	* netex_flexibleService Journey.xml  
+
+### 2020.06.21 FIX  Issue #78 *PART2*:Journey Coupling: NJSK  __JourneyCouple__ / __MainPartRef__ should be of type  __JourneyPartRef__
+  * _Updates to xml schema_:  
+	* netex_coupledJourney.xml  
+
+### 2020.06.21 FIX  Issue #92 *FRAMEWORK*:LinkProjection NJSK Expose the missing __EntityInVersion__ elements on the __LinkProjection__ derivation
+  * _Updates to xml schema_:  
+	* netex_projectionVersion.xml  
+
 Version 1.10 - Base version plus minor fixes comprising
   * Norway contributions,  
   * The approved 1.1 CRs 1-50
@@ -26,7 +49,7 @@ The individual  XML files  are arranged hierarchically in folders, in a similar
 ## Getting Started
 There are two main root schemas:
   - **netex_publication** : Embeds NeTEx XML model elements in a bulk output file format for use in asynchronous publication. The intended content scope can be indicated by a filter object.
-  - **netex_siri.xsd** : Embeds NeTEx XML model elements in the SIRI protocol  for dynamic exchange of elements between servers. Both Request/response or publish / subscribe is supported
+  - **netex_siri.xsd** : Embeds NeTEx XML model elements in the SIRI protocol for dynamic exchange of elements between servers. Both Request/response or publish / subscribe is supported
 
 In addition:
 
@@ -38,12 +61,12 @@ There are **XML examples** of the use of both protocols, see */examples* subdire
 There is an _Altova XMLSpy_ project file in the root directory  that provides an organised view  of the schema and examples:
   - NeTEx.spp
 
-There is also an _Oxygen_  project file:
+There is also an _Oxygen_ project file:
   - NeTEx.xpr
 ----
 # Change Log
 
-### 2019.05.17 FIX  *PART3:FARES*: NJSK  __FarePointInPattern__Fix case on __isFareStage__ and __isForbidden__  
+### 2019.05.17 FIX  *PART3:FARES*: NJSK  __FarePointInPattern__  Fix case on __isFareStage__ and __isForbidden__  
   * _Updates to xml schema_:  
 	* netex_production.xml  
 
@@ -118,7 +141,7 @@ There is also an _Oxygen_  project file:
 	* netex_accessRightParameter_version.xml  
 	* netex_travelSpecificationSummary_version.xml
 
-### 2019.04.18 FIX  *Parts1,2,3*: NJSK  FIx Tdy up Designators.
+### 2019.04.18 FIX  *Parts1,2,3*: NJSK  Fix: Tidy up Designators.
   * __AccessRightParameter: Add __AddressRef__,  __TopoographicPlaceRef__ and __PlaceUseEnum__.
   * Modularise __ServiceDesignator__ and __JourneyDesignator__ (no functional change).
   * Add __JourneyDesignator__ to __InterchangeRule__ and __GroupOfServiceJourneysMember__.
@@ -241,7 +264,7 @@ There is also an _Oxygen_  project file:
 	* netex_interchange_version.xsd
   * _Documentation Changes_:  [uml_diagram: ok], [doc-ok]
 
-### 2019.04.04  __FIXDoc__  *Part3-FARES-AR*: NJSK Fi Further tidy ups arising from doc.
+### 2019.04.04  __FIXDoc__  *Part3-FARES-AR*: NJSK Further tidy ups arising from doc.
   * Add new value to __PreassignedFareProduct / Product__ enumeration;  _shortTrip_.
   * Add new value to __AmountOfPriceUnit / ProductType__ numeration; _storedValue_.
   * Add new  attribute __ProductType__ to  __UsageDiscountRight__ with values _mileagePoints, usageRebate, other_.

diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_organisation_version">
 	<xsd:include schemaLocation="../netex_utility/netex_utility_contact.xsd"/>
 	<xsd:include schemaLocation="../netex_responsibility/netex_responsibilitySet_version.xsd"/>
@@ -19,6 +18,10 @@
 				<Date>
 					<Modified>2011-02-05</Modified>
 				</Date>
+				<Date>
+					<Modified>2020-07-12</Modified>Fix for Issue OrganisationalUnit #100
+					 Correct the Susbtitution group on OrganisationUnit to be OrganizationPart_
+				</Date>
 				<Date>
 					<Modified>2017-03-28 CR0031  Organisation  and OrganisationalPart Add  OwnResponsibilitySets and delegatedResponsibilitySets </Modified>
 					<Modified>2017-03-28 CR0032   Add Codespace range and TypeOf Assignment Value .   add PrivateCode to AdministrativeZone.  Add Subzones</Modified>
@@ -480,7 +483,7 @@ Rail transport, Roads and Road transport
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<xsd:element name="OrganisationalUnit" abstract="false" substitutionGroup="DataManagedObject">
+	<xsd:element name="OrganisationalUnit" abstract="false" substitutionGroup="OrganisationPart_">
 		<xsd:annotation>
 			<xsd:documentation>OrganisationalUnit of an ORGANISATION.</xsd:documentation>
 		</xsd:annotation>

diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
@@ -209,6 +209,9 @@ Rail transport, Roads and Road transport
 			<xsd:complexContent>
 				<xsd:restriction base="LinkProjection_VersionStructure">
 					<xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
+						</xsd:sequence>
 						<xsd:sequence>
 							<xsd:group ref="DataManagedObjectGroup"/>
 						</xsd:sequence>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd
@@ -33,6 +33,10 @@
 					Rename netex_travel_rights to netext_serviceRestrictions so as to align with TM6,
 					Fx SuvsriptionOnly and checkin values on PurchaseMoment
 				</Date>
+
+				<Date>
+					<Modified>2020-06-21</Modified>FIX: Issue #75 FareClassEnumeration    Remove space from end of secondClass enum value
+	 			</Date>
 				<Description>
 					<p>NeTEx - Network Exchange. This subschema defines  NetEX:TRAVEL RIGHTS identifier  types.</p>
 				</Description>
@@ -116,7 +120,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>pti23_6</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
-			<xsd:enumeration value="secondClass ">
+			<xsd:enumeration value="secondClass">
 				<xsd:annotation>
 					<xsd:documentation>pti23_7</xsd:documentation>
 				</xsd:annotation>

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
@@ -33,6 +33,9 @@
 				<Date>
 					<Modified>2017-11-1  CR044 Journey Part - Add  day offset to Journey Part Couple  </Modified>
 				</Date>
+				<Date>
+					<Modified>2020-06-21  Issue JourneyPart #78 -NJSK:  MainJourneyPartRef should be a JourneyPartRef, not a  JourneyPartCoupleRef  </Modified>
+				</Date>
 				<Description>
 					<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
 					<p>This sub-schema describes the COUPLED JOURNEY types.</p>
@@ -207,7 +210,7 @@ of the corresponding VEHICLE TYPE. true for forward.</xsd:documentation>
 			<xsd:documentation>Reference Elements for JOURNEY PART.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="MainPartRef" type="JourneyPartCoupleRefStructure">
+			<xsd:element name="MainPartRef" type="JourneyPartRefStructure">
 				<xsd:annotation>
 					<xsd:documentation>Main JOURNEY PART for journey.</xsd:documentation>
 				</xsd:annotation>

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd
@@ -4,7 +4,8 @@
 	<xsd:include schemaLocation="netex_flexibleService_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -24,6 +25,9 @@
 				<Date>
 					<Modified>2019-04-25</Modified>FIX - add reference to the journey for whiuch these are the properties !
 				</Date>
+				<Date>
+					<Modified>2020-06-21</Modified>FIX - Issue #73 Recursive inclusion  NJSK Remove cycle dependency in includes  
+				</Date>
 				<Description>
 					<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
 					<p>This sub-schema describes the FLEXIBLE SERVICE types.</p>